fix: close all autocloseables using try-with-resource statements

citrusframework · Oct 2, 2024 · 389fcf8 · 389fcf8
1 parent 453436c
commit 389fcf8
Show file tree

Hide file tree

Showing 32 changed files with 402 additions and 345 deletions.
diff --git a/...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java b/...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
@@ -16,21 +16,20 @@
 
 package org.citrusframework.docker.command;
 
-import java.util.stream.Stream;
-
-import org.citrusframework.context.TestContext;
-import org.citrusframework.docker.actions.DockerExecuteAction;
-import org.citrusframework.docker.client.DockerClient;
-import org.citrusframework.docker.message.DockerMessageHeaders;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerCmd;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Capability;
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.Ports;
 import com.github.dockerjava.api.model.Volume;
+import org.citrusframework.context.TestContext;
+import org.citrusframework.docker.actions.DockerExecuteAction;
+import org.citrusframework.docker.client.DockerClient;
+import org.citrusframework.docker.message.DockerMessageHeaders;
+
+import java.util.stream.Stream;
 
 import static com.github.dockerjava.api.model.ExposedPort.tcp;
 import static com.github.dockerjava.api.model.ExposedPort.udp;
@@ -52,77 +51,81 @@ public ContainerCreate() {
     }
 
     @Override
-    public void execute(DockerClient dockerClient, TestContext context) {
-        CreateContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().createContainerCmd(getImageId(context));
+    public void execute(DockerClient dockerClient, TestContext testContext) {
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().createContainerCmd(getImageId(testContext))) {
+            executeDockerCommand(dockerClient, command, testContext);
+        }
+    }
 
+    private void executeDockerCommand(DockerClient dockerClient, CreateContainerCmd command, TestContext testContext) {
         if (hasParameter("name")) {
-            command.withName(getParameter("name", context));
+            command.withName(getParameter("name", testContext));
         }
 
         if (hasParameter("attach-stderr")) {
-            command.withAttachStderr(Boolean.valueOf(getParameter("attach-stderr", context)));
+            command.withAttachStderr(Boolean.valueOf(getParameter("attach-stderr", testContext)));
         }
 
         if (hasParameter("attach-stdin")) {
-            command.withAttachStdin(Boolean.valueOf(getParameter("attach-stdin", context)));
+            command.withAttachStdin(Boolean.valueOf(getParameter("attach-stdin", testContext)));
         }
 
         if (hasParameter("attach-stdout")) {
-            command.withAttachStdout(Boolean.valueOf(getParameter("attach-stdout", context)));
+            command.withAttachStdout(Boolean.valueOf(getParameter("attach-stdout", testContext)));
         }
 
         if (hasParameter("capability-add")) {
             if (getParameters().get("capability-add") instanceof Capability[]) {
                 command.withCapAdd((Capability[]) getParameters().get("capability-add"));
             } else {
-                command.withCapAdd(getCapabilities("capability-add", context));
+                command.withCapAdd(getCapabilities("capability-add", testContext));
             }
         }
 
         if (hasParameter("capability-drop")) {
             if (getParameters().get("capability-drop") instanceof Capability[]) {
                 command.withCapAdd((Capability[]) getParameters().get("capability-drop"));
             } else {
-                command.withCapDrop(getCapabilities("capability-drop", context));
+                command.withCapDrop(getCapabilities("capability-drop", testContext));
             }
         }
 
         if (hasParameter("domain-name")) {
-            command.withDomainName(getParameter("domain-name", context));
+            command.withDomainName(getParameter("domain-name", testContext));
         }
 
         if (hasParameter("cmd")) {
             if (getParameters().get("cmd") instanceof String[]
-            	|| getParameters().get("cmd") instanceof Capability[]) {
+                    || getParameters().get("cmd") instanceof Capability[]) {
                 command.withCmd((String[]) getParameters().get("cmd"));
             } else {
-                command.withCmd(getParameter("cmd", context).split(DELIMITER));
+                command.withCmd(getParameter("cmd", testContext).split(DELIMITER));
             }
         }
 
         if (hasParameter("env")) {
             if (getParameters().get("env") instanceof String[]
-            	|| getParameters().get("env") instanceof Capability[]) {
+                    || getParameters().get("env") instanceof Capability[]) {
                 command.withEnv((String[]) getParameters().get("env"));
             } else {
-                command.withEnv(getParameter("env", context).split(DELIMITER));
+                command.withEnv(getParameter("env", testContext).split(DELIMITER));
             }
         }
 
         if (hasParameter("entrypoint")) {
-            command.withEntrypoint(getParameter("entrypoint", context));
+            command.withEntrypoint(getParameter("entrypoint", testContext));
         }
 
         if (hasParameter("hostname")) {
-            command.withHostName(getParameter("hostname", context));
+            command.withHostName(getParameter("hostname", testContext));
         }
 
         if (hasParameter("port-specs")) {
             if (getParameters().get("port-specs") instanceof String[]
-            	|| getParameters().get("port-specs") instanceof Capability[]) {
+                    || getParameters().get("port-specs") instanceof Capability[]) {
                 command.withPortSpecs((String[]) getParameters().get("port-specs"));
             } else {
-                command.withPortSpecs(getParameter("port-specs", context).split(DELIMITER));
+                command.withPortSpecs(getParameter("port-specs", testContext).split(DELIMITER));
             }
         }
 
@@ -131,7 +134,7 @@ public void execute(DockerClient dockerClient, TestContext context) {
             if (getParameters().get("exposed-ports") instanceof ExposedPort[]) {
                 exposedPorts = (ExposedPort[]) getParameters().get("exposed-ports");
             } else {
-                exposedPorts = getExposedPorts(getParameter("exposed-ports", context), context);
+                exposedPorts = getExposedPorts(getParameter("exposed-ports", testContext), testContext);
             }
             command.withExposedPorts(exposedPorts);
         }
@@ -142,33 +145,34 @@ public void execute(DockerClient dockerClient, TestContext context) {
             } if (getParameters().get("port-bindings") instanceof PortBinding[]) {
                 command.withPortBindings((PortBinding[]) getParameters().get("port-bindings"));
             } else {
-                command.withPortBindings(getPortBindings(getParameter("port-bindings", context), exposedPorts, context));
+                command.withPortBindings(getPortBindings(getParameter("port-bindings", testContext), exposedPorts, testContext));
             }
         } else if (exposedPorts.length > 0) {
-            command.withPortBindings(getPortBindings("", exposedPorts, context));
+            command.withPortBindings(getPortBindings("", exposedPorts, testContext));
         }
 
         if (hasParameter("volumes")) {
             if (getParameters().get("volumes") instanceof Volume[]
-            	|| getParameters().get("volumes") instanceof ExposedPort[]) {
+                    || getParameters().get("volumes") instanceof ExposedPort[]) {
                 command.withVolumes((Volume[]) getParameters().get("volumes"));
             } else {
-                command.withVolumes(getVolumes(context));
+                command.withVolumes(getVolumes(testContext));
             }
         }
 
         if (hasParameter("working-dir")) {
-            command.withWorkingDir(getParameter("working-dir", context));
+            command.withWorkingDir(getParameter("working-dir", testContext));
         }
 
         CreateContainerResponse response = command.exec();
-        context.setVariable(DockerMessageHeaders.CONTAINER_ID, response.getId());
+        testContext.setVariable(DockerMessageHeaders.CONTAINER_ID, response.getId());
         setCommandResult(response);
 
         if (!hasParameter("name")) {
-            InspectContainerCmd inspect = dockerClient.getEndpointConfiguration().getDockerClient().inspectContainerCmd(response.getId());
-            InspectContainerResponse inspectResponse = inspect.exec();
-            context.setVariable(DockerMessageHeaders.CONTAINER_NAME, inspectResponse.getName().substring(1));
+            try (var inspect = dockerClient.getEndpointConfiguration().getDockerClient().inspectContainerCmd(response.getId())) {
+                InspectContainerResponse inspectResponse = inspect.exec();
+                testContext.setVariable(DockerMessageHeaders.CONTAINER_NAME, inspectResponse.getName().substring(1));
+            }
         }
     }
 

diff --git a/...tors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java b/...tors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java
@@ -16,11 +16,10 @@
 
 package org.citrusframework.docker.command;
 
+import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.citrusframework.context.TestContext;
 import org.citrusframework.docker.actions.DockerExecuteAction;
 import org.citrusframework.docker.client.DockerClient;
-import com.github.dockerjava.api.command.InspectContainerCmd;
-import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,12 +41,13 @@ public ContainerInspect() {
 
     @Override
     public void execute(DockerClient dockerClient, TestContext context) {
-        InspectContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().inspectContainerCmd(getContainerId(context));
-        InspectContainerResponse response = command.exec();
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().inspectContainerCmd(getContainerId(context))) {
+            InspectContainerResponse response = command.exec();
 
-        setCommandResult(response);
+            setCommandResult(response);
 
-        logger.debug(response.toString());
+            logger.debug(response.toString());
+        }
     }
 
     /**

diff --git a/...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java b/...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java
@@ -16,10 +16,9 @@
 
 package org.citrusframework.docker.command;
 
+import com.github.dockerjava.api.model.ResponseItem;
 import org.citrusframework.context.TestContext;
 import org.citrusframework.docker.client.DockerClient;
-import com.github.dockerjava.api.command.RemoveContainerCmd;
-import com.github.dockerjava.api.model.ResponseItem;
 
 /**
  * @author Christoph Deppisch
@@ -37,15 +36,15 @@ public ContainerRemove() {
 
     @Override
     public void execute(DockerClient dockerClient, TestContext context) {
-        RemoveContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().removeContainerCmd(getContainerId(context));
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().removeContainerCmd(getContainerId(context))) {
+            if (hasParameter("force")) {
+                command.withForce(Boolean.valueOf(getParameter("force", context)));
+            }
 
-        if (hasParameter("force")) {
-            command.withForce(Boolean.valueOf(getParameter("force", context)));
-        }
+            command.exec();
 
-        command.exec();
-
-        setCommandResult(success());
+            setCommandResult(success());
+        }
     }
 
     /**

diff --git a/...ectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java b/...ectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java
@@ -16,11 +16,10 @@
 
 package org.citrusframework.docker.command;
 
+import com.github.dockerjava.api.model.ResponseItem;
 import org.citrusframework.context.TestContext;
 import org.citrusframework.docker.actions.DockerExecuteAction;
 import org.citrusframework.docker.client.DockerClient;
-import com.github.dockerjava.api.command.StartContainerCmd;
-import com.github.dockerjava.api.model.ResponseItem;
 
 /**
  * @author Christoph Deppisch
@@ -38,10 +37,11 @@ public ContainerStart() {
 
     @Override
     public void execute(DockerClient dockerClient, TestContext context) {
-        StartContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().startContainerCmd(getContainerId(context));
-        command.exec();
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().startContainerCmd(getContainerId(context))) {
+            command.exec();
 
-        setCommandResult(success());
+            setCommandResult(success());
+        }
     }
 
     /**

diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java
@@ -16,11 +16,10 @@
 
 package org.citrusframework.docker.command;
 
+import com.github.dockerjava.api.model.ResponseItem;
 import org.citrusframework.context.TestContext;
 import org.citrusframework.docker.actions.DockerExecuteAction;
 import org.citrusframework.docker.client.DockerClient;
-import com.github.dockerjava.api.command.StopContainerCmd;
-import com.github.dockerjava.api.model.ResponseItem;
 
 /**
  * @author Christoph Deppisch
@@ -38,10 +37,11 @@ public ContainerStop() {
 
     @Override
     public void execute(DockerClient dockerClient, TestContext context) {
-        StopContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().stopContainerCmd(getContainerId(context));
-        command.exec();
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().stopContainerCmd(getContainerId(context))) {
+            command.exec();
 
-        setCommandResult(success());
+            setCommandResult(success());
+        }
     }
 
     /**

diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java
@@ -16,13 +16,12 @@
 
 package org.citrusframework.docker.command;
 
+import com.github.dockerjava.api.command.WaitContainerResultCallback;
+import com.github.dockerjava.api.model.WaitResponse;
 import org.citrusframework.context.TestContext;
 import org.citrusframework.docker.actions.DockerExecuteAction;
 import org.citrusframework.docker.client.DockerClient;
 import org.citrusframework.docker.message.DockerMessageHeaders;
-import com.github.dockerjava.api.command.WaitContainerCmd;
-import com.github.dockerjava.api.command.WaitContainerResultCallback;
-import com.github.dockerjava.api.model.WaitResponse;
 
 /**
  * @author Christoph Deppisch
@@ -39,20 +38,20 @@ public ContainerWait() {
 
     @Override
     public void execute(DockerClient dockerClient, TestContext context) {
-        WaitContainerCmd command = dockerClient.getEndpointConfiguration().getDockerClient().waitContainerCmd(getContainerId(context));
-
-        WaitContainerResultCallback waitResult = new WaitContainerResultCallback() {
-            @Override
-            public void onNext(WaitResponse waitResponse) {
-                super.onNext(waitResponse);
-                setCommandResult(waitResponse);
-            }
-        };
+        try (var command = dockerClient.getEndpointConfiguration().getDockerClient().waitContainerCmd(getContainerId(context))) {
+            WaitContainerResultCallback waitResult = new WaitContainerResultCallback() {
+                @Override
+                public void onNext(WaitResponse waitResponse) {
+                    super.onNext(waitResponse);
+                    setCommandResult(waitResponse);
+                }
+            };
 
-        command.exec(waitResult);
+            command.exec(waitResult);
 
-        Integer statusCode = waitResult.awaitStatusCode();
-        context.setVariable(DockerMessageHeaders.DOCKER_PREFIX + "statusCode", statusCode);
+            Integer statusCode = waitResult.awaitStatusCode();
+            context.setVariable(DockerMessageHeaders.DOCKER_PREFIX + "statusCode", statusCode);
+        }
     }
 
     /**