Skip to content

Commit 698562c

Browse files
ArtDuArtDu
committed
Fix codestyle and javadoc
1 parent 62218a1 commit 698562c

13 files changed

+157
-159
lines changed

‎src/main/java/org/testcontainers/containers/CartridgeConfigParser.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import org.yaml.snakeyaml.Yaml;
4-
53
import java.io.InputStream;
64
import java.util.Collections;
75
import java.util.List;
@@ -10,6 +8,8 @@
108
import java.util.concurrent.atomic.AtomicReference;
119
import java.util.stream.Collectors;
1210

11+
import org.yaml.snakeyaml.Yaml;
12+
1313
/**
1414
* @author Alexey Kuzin
1515
*/
@@ -20,22 +20,22 @@ class CartridgeConfigParser {
2020
public CartridgeConfigParser(String instanceFileName) {
2121
Yaml yaml = new Yaml();
2222
InputStream inputStream = this.getClass()
23-
.getClassLoader()
24-
.getResourceAsStream(instanceFileName);
23+
.getClassLoader()
24+
.getResourceAsStream(instanceFileName);
2525
instances.set(Collections.unmodifiableMap(yaml.load(inputStream)));
2626
}
2727

2828
public Integer[] getExposablePorts() {
2929
List<Integer> ports = instances.get().values().stream()
30-
.map(Instance::new)
31-
.map(Instance::getBinaryPort)
32-
.filter(Objects::nonNull)
33-
.collect(Collectors.toList());
30+
.map(Instance::new)
31+
.map(Instance::getBinaryPort)
32+
.filter(Objects::nonNull)
33+
.collect(Collectors.toList());
3434
ports.addAll(instances.get().values().stream()
35-
.map(Instance::new)
36-
.map(Instance::getHttpPort)
37-
.filter(Objects::nonNull)
38-
.collect(Collectors.toList()));
35+
.map(Instance::new)
36+
.map(Instance::getHttpPort)
37+
.filter(Objects::nonNull)
38+
.collect(Collectors.toList()));
3939
return ports.toArray(new Integer[]{});
4040
}
4141

@@ -50,8 +50,8 @@ public Instance(Map<String, Object> map) {
5050
this.httpPort = (Integer) map.get("http_port");
5151
this.advertiseUri = (String) map.get("advertise_uri");
5252
this.binaryPort = this.advertiseUri != null ?
53-
Integer.parseInt(this.advertiseUri.substring(this.advertiseUri.indexOf(':') + 1)) :
54-
null;
53+
Integer.parseInt(this.advertiseUri.substring(this.advertiseUri.indexOf(':') + 1)) :
54+
null;
5555
}
5656

5757
public String getWorkdir() {

‎src/main/java/org/testcontainers/containers/SslContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ private SslContext(String keyFile, String certFile) {
1212
this.certFile = certFile;
1313
}
1414

15-
public static SslContext getSslContext(){
15+
public static SslContext getSslContext() {
1616
return new SslContext();
1717
}
1818

19-
public static SslContext getSslContext(String keyFile, String certFile){
19+
public static SslContext getSslContext(String keyFile, String certFile) {
2020
return new SslContext(keyFile, certFile);
2121
}
2222

‎src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package org.testcontainers.containers;
22

3-
import com.github.dockerjava.api.command.InspectContainerResponse;
4-
5-
import org.testcontainers.containers.exceptions.CartridgeTopologyException;
6-
import org.testcontainers.images.builder.ImageFromDockerfile;
7-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
8-
93
import java.net.URL;
104
import java.util.Arrays;
115
import java.util.Collections;
@@ -16,6 +10,10 @@
1610
import java.util.concurrent.TimeoutException;
1711
import java.util.function.Supplier;
1812

13+
import com.github.dockerjava.api.command.InspectContainerResponse;
14+
import org.testcontainers.containers.exceptions.CartridgeTopologyException;
15+
import org.testcontainers.images.builder.ImageFromDockerfile;
16+
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
1917
import static org.testcontainers.containers.PathUtils.normalizePath;
2018

2119
/**
@@ -83,7 +81,6 @@
8381
* @author Alexey Kuzin
8482
* @author Artyom Dubinin
8583
* @author Ivan Dneprov
86-
*
8784
*/
8885
public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartridgeContainer>
8986
implements TarantoolContainerOperations<TarantoolCartridgeContainer> {
@@ -164,7 +161,8 @@ public TarantoolCartridgeContainer(String dockerFile, String instancesFile, Stri
164161
* the result Cartridge container image name, you can cache the image and avoid rebuilding on each test run (the
165162
* image is tagged with the provided name and not deleted after tests finishing).
166163
*
167-
* @param dockerFile URL resource path to a Dockerfile which configures Cartridge and other necessary services
164+
* @param dockerFile URL resource path to a Dockerfile which configures Cartridge and other
165+
* necessary services
168166
* @param buildImageName Specify a stable image name for the test container to prevent rebuilds
169167
* @param instancesFile URL resource path to instances.yml relative in the classpath
170168
* @param topologyConfigurationFile URL resource path to a topology bootstrap script in the classpath
@@ -192,7 +190,8 @@ public TarantoolCartridgeContainer(String dockerFile, String buildImageName, Str
192190
this(buildImage(dockerFile, buildImageName, buildArgs), instancesFile, topologyConfigurationFile, buildArgs);
193191
}
194192

195-
private TarantoolCartridgeContainer(ImageFromDockerfile image, String instancesFile, String topologyConfigurationFile,
193+
private TarantoolCartridgeContainer(ImageFromDockerfile image, String instancesFile,
194+
String topologyConfigurationFile,
196195
Map<String, String> buildArgs) {
197196
super(withBuildArgs(image, buildArgs));
198197

@@ -252,16 +251,16 @@ private static Map<String, String> mergeBuildArguments(Map<String, String> build
252251
}
253252

254253
private static ImageFromDockerfile buildImage(String dockerFile, String buildImageName,
255-
final Map<String, String> buildArgs) {
254+
final Map<String, String> buildArgs) {
256255
ImageFromDockerfile image;
257256
if (buildImageName != null && !buildImageName.isEmpty()) {
258257
image = new ImageFromDockerfile(buildImageName, false);
259258
} else {
260259
image = new ImageFromDockerfile();
261260
}
262261
return image.withFileFromClasspath("Dockerfile", dockerFile)
263-
.withFileFromClasspath("cartridge", buildArgs.get("CARTRIDGE_SRC_DIR") == null ?
264-
"cartridge" : buildArgs.get("CARTRIDGE_SRC_DIR"));
262+
.withFileFromClasspath("cartridge", buildArgs.get("CARTRIDGE_SRC_DIR") == null ?
263+
"cartridge" : buildArgs.get("CARTRIDGE_SRC_DIR"));
265264
}
266265

267266
/**
@@ -504,7 +503,7 @@ private boolean setupTopology() {
504503
"--file=" + replicasetsFileName, "setup", "--bootstrap-vshard");
505504
if (result.getExitCode() != 0) {
506505
throw new CartridgeTopologyException("Failed to change the app topology via cartridge CLI: "
507-
+ result.getStdout());
506+
+ result.getStdout());
508507
}
509508
} catch (Exception e) {
510509
throw new CartridgeTopologyException(e);

‎src/main/java/org/testcontainers/containers/TarantoolContainer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.testcontainers.containers;
22

3-
import com.github.dockerjava.api.command.InspectContainerResponse;
4-
import org.testcontainers.containers.wait.strategy.Wait;
5-
63
import java.net.URL;
74
import java.nio.file.Paths;
85
import java.util.concurrent.Future;
96

7+
import com.github.dockerjava.api.command.InspectContainerResponse;
8+
import org.testcontainers.containers.wait.strategy.Wait;
109
import static org.testcontainers.containers.PathUtils.normalizePath;
1110

1211
/**
@@ -183,6 +182,7 @@ public TarantoolContainer withPassword(String password) {
183182
* Warning! SSL must be set as the default transport in your Tarantool cluster.
184183
* Supported only in Tarantool Enterprise.
185184
*
185+
* @param sslContext {@link SslContext} instance
186186
* @return this container instance
187187
*/
188188
public TarantoolContainer withSslContext(SslContext sslContext) {

‎src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java‎

Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.testcontainers.containers;
22

3-
import org.testcontainers.utility.MountableFile;
4-
import org.yaml.snakeyaml.Yaml;
5-
63
import java.io.IOException;
74
import java.nio.file.Paths;
85
import java.util.concurrent.ExecutionException;
96

7+
import org.testcontainers.utility.MountableFile;
8+
import org.yaml.snakeyaml.Yaml;
109
import static org.testcontainers.containers.PathUtils.normalizePath;
1110

1211
/**
@@ -23,44 +22,46 @@ public final class TarantoolContainerClientHelper {
2322

2423
private final TarantoolContainerOperations<? extends Container<?>> container;
2524
private final String EXECUTE_SCRIPT_ERROR_TEMPLATE =
26-
"Executed script %s with exit code %d, stderr: \"%s\", stdout: \"%s\"";
25+
"Executed script %s with exit code %d, stderr: \"%s\", stdout: \"%s\"";
2726
private static final String EXECUTE_COMMAND_ERROR_TEMPLATE =
28-
"Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
27+
"Executed command \"%s\" with exit code %d, stderr: \"%s\", stdout: \"%s\"";
2928
private static final String MTLS_COMMAND_TEMPLATE =
30-
"echo \" " +
31-
" print(require('yaml').encode( " +
32-
" {require('net.box').connect( " +
33-
" { uri='%s:%d', params = { transport='ssl', ssl_key_file = '%s', ssl_cert_file = '%s' }}, " +
34-
" { user = '%s', password = '%s' } " +
35-
" ):eval('%s')}) " +
36-
" ); " +
37-
" os.exit(); " +
38-
"\" | tarantool";
29+
"echo \" " +
30+
" print(require('yaml').encode( " +
31+
" {require('net.box').connect( " +
32+
" { uri='%s:%d', params = { transport='ssl', ssl_key_file = '%s', ssl_cert_file = '%s'" +
33+
" }}, " +
34+
" { user = '%s', password = '%s' } " +
35+
" ):eval('%s')}) " +
36+
" ); " +
37+
" os.exit(); " +
38+
"\" | tarantool";
3939
private static final String SSL_COMMAND_TEMPLATE =
40-
"echo \" " +
41-
" print(require('yaml').encode( " +
42-
" {require('net.box').connect( " +
43-
" { uri='%s:%d', params = { transport='ssl' }}, " +
40+
"echo \" " +
41+
" print(require('yaml').encode( " +
42+
" {require('net.box').connect( " +
43+
" { uri='%s:%d', params = { transport='ssl' }}, " +
44+
" { user = '%s', password = '%s' } " +
45+
" ):eval('%s')}) " +
46+
" ); " +
47+
" os.exit(); " +
48+
"\" | tarantool";
49+
private static final String COMMAND_TEMPLATE = "echo \" " +
50+
" print(require('yaml').encode( " +
51+
" {require('net.box').connect( " +
52+
" { uri='%s:%d' }, " +
4453
" { user = '%s', password = '%s' } " +
4554
" ):eval('%s')}) " +
46-
" ); " +
47-
" os.exit(); " +
48-
"\" | tarantool";
49-
private static final String COMMAND_TEMPLATE = "echo \" " +
50-
" print(require('yaml').encode( " +
51-
" {require('net.box').connect( " +
52-
" { uri='%s:%d' }, " +
53-
" { user = '%s', password = '%s' } " +
54-
" ):eval('%s')}) " +
55-
" ); " +
56-
" os.exit(); " +
57-
"\" | tarantool";
55+
" ); " +
56+
" os.exit(); " +
57+
"\" | tarantool";
5858

5959
TarantoolContainerClientHelper(TarantoolContainerOperations<? extends Container<?>> container) {
6060
this.container = container;
6161
}
62-
63-
public Container.ExecResult executeScript(String scriptResourcePath, SslContext sslContext) throws IOException, InterruptedException {
62+
63+
public Container.ExecResult executeScript(String scriptResourcePath, SslContext sslContext)
64+
throws IOException, InterruptedException {
6465
if (!container.isRunning()) {
6566
throw new IllegalStateException("Cannot execute scripts in stopped container");
6667
}
@@ -71,27 +72,29 @@ public Container.ExecResult executeScript(String scriptResourcePath, SslContext
7172
return executeCommand(String.format("return dofile('%s')", containerPath), sslContext);
7273
}
7374

74-
public <T> T executeScriptDecoded(String scriptResourcePath, SslContext sslContext) throws IOException, InterruptedException, ExecutionException {
75+
public <T> T executeScriptDecoded(String scriptResourcePath, SslContext sslContext)
76+
throws IOException, InterruptedException, ExecutionException {
7577
Container.ExecResult result = executeScript(scriptResourcePath, sslContext);
7678

7779
if (result.getExitCode() != 0) {
7880

7981
if (result.getExitCode() == 3 || result.getExitCode() == 1) {
8082
throw new ExecutionException(String.format(EXECUTE_SCRIPT_ERROR_TEMPLATE,
81-
scriptResourcePath, result.getExitCode(),
82-
result.getStderr(), result.getStdout()),
83-
new Throwable());
83+
scriptResourcePath, result.getExitCode(),
84+
result.getStderr(), result.getStdout()),
85+
new Throwable());
8486
}
8587

8688
throw new IllegalStateException(String.format(EXECUTE_SCRIPT_ERROR_TEMPLATE,
87-
scriptResourcePath, result.getExitCode(),
88-
result.getStderr(), result.getStdout()));
89+
scriptResourcePath, result.getExitCode(),
90+
result.getStderr(), result.getStdout()));
8991
}
9092

9193
return yaml.load(result.getStdout());
9294
}
9395

94-
public Container.ExecResult executeCommand(String command, SslContext sslContext) throws IOException, InterruptedException {
96+
public Container.ExecResult executeCommand(String command, SslContext sslContext)
97+
throws IOException, InterruptedException {
9598
if (!container.isRunning()) {
9699
throw new IllegalStateException("Cannot execute commands in stopped container");
97100
}
@@ -102,22 +105,22 @@ public Container.ExecResult executeCommand(String command, SslContext sslContext
102105
String bashCommand;
103106
if (sslContext == null) { // No SSL
104107
bashCommand = String.format(COMMAND_TEMPLATE,
105-
container.getHost(), container.getInternalPort(),
106-
container.getUsername(), container.getPassword(),
107-
command
108+
container.getHost(), container.getInternalPort(),
109+
container.getUsername(), container.getPassword(),
110+
command
108111
);
109112
} else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) { // mTLS
110113
bashCommand = String.format(MTLS_COMMAND_TEMPLATE,
111-
container.getHost(), container.getInternalPort(),
112-
sslContext.getKeyFile(), sslContext.getCertFile(),
113-
container.getUsername(), container.getPassword(),
114-
command
114+
container.getHost(), container.getInternalPort(),
115+
sslContext.getKeyFile(), sslContext.getCertFile(),
116+
container.getUsername(), container.getPassword(),
117+
command
115118
);
116119
} else { // SSL
117120
bashCommand = String.format(SSL_COMMAND_TEMPLATE,
118-
container.getHost(), container.getInternalPort(),
119-
container.getUsername(), container.getPassword(),
120-
command
121+
container.getHost(), container.getInternalPort(),
122+
container.getUsername(), container.getPassword(),
123+
command
121124
);
122125
}
123126

@@ -129,7 +132,7 @@ public <T> T executeCommandDecoded(String command, SslContext sslContext) throws
129132

130133
if (result.getExitCode() != 0) {
131134
throw new IllegalStateException(String.format(EXECUTE_COMMAND_ERROR_TEMPLATE,
132-
command, result.getExitCode(), result.getStderr(), result.getStdout()));
135+
command, result.getExitCode(), result.getStderr(), result.getStdout()));
133136
}
134137

135138
return yaml.load(result.getStdout());

‎src/main/java/org/testcontainers/containers/TarantoolContainerImageHelper.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package org.testcontainers.containers;
22

3-
import com.github.dockerjava.api.DockerClient;
4-
import com.github.dockerjava.api.command.BuildImageCmd;
5-
import com.github.dockerjava.api.command.BuildImageResultCallback;
6-
import com.github.dockerjava.api.model.Image;
7-
import org.testcontainers.DockerClientFactory;
8-
93
import java.util.Arrays;
104
import java.util.Collection;
115
import java.util.Collections;
126
import java.util.HashSet;
137
import java.util.List;
148
import java.util.Map;
159

10+
import com.github.dockerjava.api.DockerClient;
11+
import com.github.dockerjava.api.command.BuildImageCmd;
12+
import com.github.dockerjava.api.command.BuildImageResultCallback;
13+
import com.github.dockerjava.api.model.Image;
14+
import org.testcontainers.DockerClientFactory;
15+
1616
/**
1717
* Class for working with docker directly
1818
*

0 commit comments

Comments
 (0)