Skip to content

Commit e3f0045

Browse files
timonbacksam0r040
timonback
and
sam0r040
authored
chore: update docker compose setup (#1417)
* chore: update docker compose setup Co-authored-by: sam0r040 <[email protected]>
1 parent f08bf05 commit e3f0045

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/AmqpProducerSystemTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.test.context.DynamicPropertySource;
2020
import org.springframework.test.context.TestPropertySource;
2121
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
22-
import org.testcontainers.containers.DockerComposeContainer;
22+
import org.testcontainers.containers.ComposeContainer;
2323
import org.testcontainers.containers.wait.strategy.Wait;
2424
import org.testcontainers.junit.jupiter.Container;
2525
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -57,7 +57,7 @@ public class AmqpProducerSystemTest {
5757
ExampleConsumer exampleConsumer;
5858

5959
@Container
60-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
60+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
6161
.withCopyFilesInContainer(".env") // do not copy all files in the directory
6262
.withServices(AMQP_NAME)
6363
.withExposedService(AMQP_NAME, 5672)

‎springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/JmsProducerSystemTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.test.context.DynamicPropertyRegistry;
1313
import org.springframework.test.context.DynamicPropertySource;
1414
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
15-
import org.testcontainers.containers.DockerComposeContainer;
15+
import org.testcontainers.containers.ComposeContainer;
1616
import org.testcontainers.containers.wait.strategy.Wait;
1717
import org.testcontainers.junit.jupiter.Container;
1818
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -50,7 +50,7 @@ public class JmsProducerSystemTest {
5050
String brokerUrl;
5151

5252
@Container
53-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
53+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
5454
.withCopyFilesInContainer(".env") // do not copy all files in the directory
5555
.withServices(APP_JMS)
5656
.withExposedService(APP_JMS, 61616)

‎springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/KafkaProducerSystemTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.http.HttpHeaders;
1414
import org.springframework.http.ResponseEntity;
1515
import org.springframework.web.client.RestTemplate;
16-
import org.testcontainers.containers.DockerComposeContainer;
16+
import org.testcontainers.containers.ComposeContainer;
1717
import org.testcontainers.containers.wait.strategy.Wait;
1818
import org.testcontainers.junit.jupiter.Container;
1919
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -43,7 +43,7 @@ public class KafkaProducerSystemTest {
4343
private static final boolean USE_SCHEMA_REGISTRY = false;
4444

4545
@Container
46-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
46+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
4747
.withCopyFilesInContainer(".env") // do not copy all files in the directory
4848
.withServices(APP_NAME, KAFKA_NAME, USE_SCHEMA_REGISTRY ? "kafka-schema-registry" : "")
4949
.withExposedService(APP_NAME, APP_PORT)

‎springwolf-examples/springwolf-sns-example/src/test/java/io/github/springwolf/examples/sns/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ApiSystemTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.junit.jupiter.api.Test;
66
import org.springframework.web.client.RestTemplate;
7-
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.containers.ComposeContainer;
88
import org.testcontainers.containers.wait.strategy.Wait;
99
import org.testcontainers.junit.jupiter.Container;
1010
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -27,11 +27,11 @@
2727
public class ApiSystemTest {
2828

2929
private static final RestTemplate restTemplate = new RestTemplate();
30-
private static final String APP_NAME = "app_1";
30+
private static final String APP_NAME = "app";
3131
private static final int APP_PORT = 8080;
3232

3333
@Container
34-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
34+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
3535
.withCopyFilesInContainer(".env") // do not copy all files in the directory
3636
.withExposedService(APP_NAME, APP_PORT)
3737
.waitingFor(APP_NAME, Wait.forLogMessage(".*AsyncAPI document was built.*", 1))

‎springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SqsProducerSystemTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.test.context.SpringBootTest;
1414
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
15-
import org.testcontainers.containers.DockerComposeContainer;
15+
import org.testcontainers.containers.ComposeContainer;
1616
import org.testcontainers.containers.wait.strategy.Wait;
1717
import org.testcontainers.junit.jupiter.Container;
1818
import org.testcontainers.junit.jupiter.Testcontainers;
@@ -50,7 +50,7 @@ public class SqsProducerSystemTest {
5050
ArgumentCaptor<Map<String, Object>> headersCaptor;
5151

5252
@Container
53-
public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
53+
public static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
5454
.withCopyFilesInContainer(".env") // do not copy all files in the directory
5555
.withServices(LOCALSTACK_NAME)
5656
.withLogConsumer(LOCALSTACK_NAME, l -> Arrays.stream(

0 commit comments

Comments
 (0)