Skip to content

Commit

Permalink
fix: close all autocloseables using try-with-resource statements
Browse files Browse the repository at this point in the history 
additionally, make sure all task executors are being shutdown properly.
  • Loading branch information
@bbortt
bbortt committed Oct 10, 2024
1 parent 5720ed4 commit f6b9d2b
Show file tree
Hide file tree
Showing 31 changed files with 398 additions and 344 deletions.
72 changes: 38 additions & 34 deletions ...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -51,77 +50,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));
}
}

Expand All @@ -130,7 +133,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);
}
Expand All @@ -141,33 +144,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));
}
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...tors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -41,12 +40,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());
}
}

/**
Expand Down
17 changes: 8 additions & 9 deletions ...ctors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* @since 2.4
Expand All @@ -36,15 +35,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());
}
}

/**
Expand Down
10 changes: 5 additions & 5 deletions ...ectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* @since 2.4
Expand All @@ -37,10 +36,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());
}
}

/**
Expand Down
10 changes: 5 additions & 5 deletions connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* @since 2.4
Expand All @@ -37,10 +36,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());
}
}

/**
Expand Down
29 changes: 14 additions & 15 deletions connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* @since 2.4
Expand All @@ -38,20 +37,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);
}
}

/**
Expand Down
Loading

0 comments on commit f6b9d2b

Please sign in to comment.