Skip to content

Commit b15f98e

Browse files
fokioneddumelendez
authored andcommitted
apply spotless
1 parent 4acc8fd commit b15f98e

File tree

3 files changed

+14
-30
lines changed

3 files changed

+14
-30
lines changed

core/src/main/java/org/testcontainers/containers/ComposeContainer.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,16 @@ public ComposeContainer(DockerImageName image, File... composeFiles) {
7373
}
7474

7575
public ComposeContainer(DockerImageName image, List<File> composeFiles) {
76-
this(image,Base58.randomString(6).toLowerCase(),composeFiles);
76+
this(image, Base58.randomString(6).toLowerCase(), composeFiles);
7777
}
7878

7979
public ComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
80-
this(image,identifier, Arrays.asList(composeFiles));
80+
this(image, identifier, Arrays.asList(composeFiles));
8181
}
8282

8383
public ComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
8484
this.composeDelegate =
85-
new ComposeDelegate(
86-
ComposeDelegate.ComposeVersion.V2,
87-
composeFiles,
88-
identifier,
89-
COMPOSE_EXECUTABLE,
90-
image
91-
);
85+
new ComposeDelegate(ComposeDelegate.ComposeVersion.V2, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
9286
this.project = this.composeDelegate.getProject();
9387
}
9488

@@ -98,8 +92,9 @@ public ComposeContainer(DockerImageName image, String identifier, List<File> com
9892
*/
9993
@Deprecated
10094
public ComposeContainer(File... composeFiles) {
101-
this(getDockerImageName(),Arrays.asList(composeFiles));
95+
this(getDockerImageName(), Arrays.asList(composeFiles));
10296
}
97+
10398
/**
10499
* @deprecated
105100
* Use the new constructor ComposeContainer(DockerImageName image,List<File> composeFiles)
@@ -108,13 +103,14 @@ public ComposeContainer(File... composeFiles) {
108103
public ComposeContainer(List<File> composeFiles) {
109104
this(getDockerImageName(), composeFiles);
110105
}
106+
111107
/**
112108
* @deprecated
113109
* Use the new constructor ComposeContainer(DockerImageName image, String identifier, File... composeFile)
114110
*/
115111
@Deprecated
116112
public ComposeContainer(String identifier, File... composeFiles) {
117-
this(getDockerImageName(),identifier, Arrays.asList(composeFiles));
113+
this(getDockerImageName(), identifier, Arrays.asList(composeFiles));
118114
}
119115

120116
/**
@@ -123,7 +119,7 @@ public ComposeContainer(String identifier, File... composeFiles) {
123119
*/
124120
@Deprecated
125121
public ComposeContainer(String identifier, List<File> composeFiles) {
126-
this(getDockerImageName(),identifier, composeFiles);
122+
this(getDockerImageName(), identifier, composeFiles);
127123
}
128124

129125
public static DockerImageName getDockerImageName() {

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.testcontainers.lifecycle.Startable;
1212
import org.testcontainers.utility.Base58;
1313
import org.testcontainers.utility.DockerImageName;
14-
import org.testcontainers.utility.TestcontainersConfiguration;
1514

1615
import java.io.File;
1716
import java.time.Duration;
@@ -26,8 +25,6 @@
2625
import java.util.Set;
2726
import java.util.function.Consumer;
2827

29-
import static org.testcontainers.containers.ComposeContainer.getDockerImageName;
30-
3128
/**
3229
* Container which launches Docker Compose, for the purposes of launching a defined set of containers.
3330
*/
@@ -68,32 +65,24 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> i
6865

6966
private List<String> filesInDirectory = new ArrayList<>();
7067

71-
72-
7368
public DockerComposeContainer(DockerImageName image, String identifier, File composeFile) {
7469
this(image, identifier, Collections.singletonList(composeFile));
7570
}
7671

7772
public DockerComposeContainer(DockerImageName image, List<File> composeFiles) {
78-
this(image,Base58.randomString(6).toLowerCase(),composeFiles);
73+
this(image, Base58.randomString(6).toLowerCase(), composeFiles);
7974
}
8075

8176
public DockerComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
82-
this(image,identifier, Arrays.asList(composeFiles));
77+
this(image, identifier, Arrays.asList(composeFiles));
8378
}
79+
8480
public DockerComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
8581
this.composeDelegate =
86-
new ComposeDelegate(
87-
ComposeDelegate.ComposeVersion.V1,
88-
composeFiles,
89-
identifier,
90-
COMPOSE_EXECUTABLE,
91-
image
92-
);
82+
new ComposeDelegate(ComposeDelegate.ComposeVersion.V1, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
9383
this.project = this.composeDelegate.getProject();
9484
}
9585

96-
9786
@Deprecated
9887
public DockerComposeContainer(File composeFile, String identifier) {
9988
this(identifier, composeFile);
@@ -127,8 +116,6 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
127116
this.project = this.composeDelegate.getProject();
128117
}
129118

130-
131-
132119
@Override
133120
public void start() {
134121
synchronized (MUTEX) {

core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public class ComposeContainerTest {
2222

2323
public static final String DOCKER_IMAGE = "docker:25.0.2";
24+
2425
private TestLogAppender testLogAppender;
2526

2627
private Logger rootLogger;
@@ -53,7 +54,7 @@ public void testWithCustomDockerImage() throws IOException {
5354
assertThat(logs).isNotNull();
5455
Optional<String> verification = logs
5556
.stream()
56-
.filter(line -> line.contains("Creating container for image: "+DOCKER_IMAGE))
57+
.filter(line -> line.contains("Creating container for image: " + DOCKER_IMAGE))
5758
.findFirst();
5859
assertThat(verification.isPresent()).isTrue();
5960
}

0 commit comments

Comments
 (0)