Skip to content

Commit 10d6485

Browse files
committed
apply spotless
1 parent c1d1751 commit 10d6485

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
@@ -75,22 +75,16 @@ public ComposeContainer(DockerImageName image, File... composeFiles) {
7575
}
7676

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

8181
public ComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
82-
this(image,identifier, Arrays.asList(composeFiles));
82+
this(image, identifier, Arrays.asList(composeFiles));
8383
}
8484

8585
public ComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
8686
this.composeDelegate =
87-
new ComposeDelegate(
88-
ComposeDelegate.ComposeVersion.V2,
89-
composeFiles,
90-
identifier,
91-
COMPOSE_EXECUTABLE,
92-
image
93-
);
87+
new ComposeDelegate(ComposeDelegate.ComposeVersion.V2, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
9488
this.project = this.composeDelegate.getProject();
9589
}
9690

@@ -100,8 +94,9 @@ public ComposeContainer(DockerImageName image, String identifier, List<File> com
10094
*/
10195
@Deprecated
10296
public ComposeContainer(File... composeFiles) {
103-
this(getDockerImageName(),Arrays.asList(composeFiles));
97+
this(getDockerImageName(), Arrays.asList(composeFiles));
10498
}
99+
105100
/**
106101
* @deprecated
107102
* Use the new constructor ComposeContainer(DockerImageName image,List<File> composeFiles)
@@ -110,13 +105,14 @@ public ComposeContainer(File... composeFiles) {
110105
public ComposeContainer(List<File> composeFiles) {
111106
this(getDockerImageName(), composeFiles);
112107
}
108+
113109
/**
114110
* @deprecated
115111
* Use the new constructor ComposeContainer(DockerImageName image, String identifier, File... composeFile)
116112
*/
117113
@Deprecated
118114
public ComposeContainer(String identifier, File... composeFiles) {
119-
this(getDockerImageName(),identifier, Arrays.asList(composeFiles));
115+
this(getDockerImageName(), identifier, Arrays.asList(composeFiles));
120116
}
121117

122118
/**
@@ -125,7 +121,7 @@ public ComposeContainer(String identifier, File... composeFiles) {
125121
*/
126122
@Deprecated
127123
public ComposeContainer(String identifier, List<File> composeFiles) {
128-
this(getDockerImageName(),identifier, composeFiles);
124+
this(getDockerImageName(), identifier, composeFiles);
129125
}
130126

131127
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
@@ -13,7 +13,6 @@
1313
import org.testcontainers.lifecycle.Startable;
1414
import org.testcontainers.utility.Base58;
1515
import org.testcontainers.utility.DockerImageName;
16-
import org.testcontainers.utility.TestcontainersConfiguration;
1716

1817
import java.io.File;
1918
import java.time.Duration;
@@ -28,8 +27,6 @@
2827
import java.util.Set;
2928
import java.util.function.Consumer;
3029

31-
import static org.testcontainers.containers.ComposeContainer.getDockerImageName;
32-
3330
/**
3431
* Container which launches Docker Compose, for the purposes of launching a defined set of containers.
3532
*/
@@ -72,32 +69,24 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>>
7269

7370
private List<String> filesInDirectory = new ArrayList<>();
7471

75-
76-
7772
public DockerComposeContainer(DockerImageName image, String identifier, File composeFile) {
7873
this(image, identifier, Collections.singletonList(composeFile));
7974
}
8075

8176
public DockerComposeContainer(DockerImageName image, List<File> composeFiles) {
82-
this(image,Base58.randomString(6).toLowerCase(),composeFiles);
77+
this(image, Base58.randomString(6).toLowerCase(), composeFiles);
8378
}
8479

8580
public DockerComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
86-
this(image,identifier, Arrays.asList(composeFiles));
81+
this(image, identifier, Arrays.asList(composeFiles));
8782
}
83+
8884
public DockerComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
8985
this.composeDelegate =
90-
new ComposeDelegate(
91-
ComposeDelegate.ComposeVersion.V1,
92-
composeFiles,
93-
identifier,
94-
COMPOSE_EXECUTABLE,
95-
image
96-
);
86+
new ComposeDelegate(ComposeDelegate.ComposeVersion.V1, composeFiles, identifier, COMPOSE_EXECUTABLE, image);
9787
this.project = this.composeDelegate.getProject();
9888
}
9989

100-
10190
@Deprecated
10291
public DockerComposeContainer(File composeFile, String identifier) {
10392
this(identifier, composeFile);
@@ -131,8 +120,6 @@ public DockerComposeContainer(String identifier, List<File> composeFiles) {
131120
this.project = this.composeDelegate.getProject();
132121
}
133122

134-
135-
136123
@Override
137124
@Deprecated
138125
public Statement apply(Statement base, Description description) {

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)