From 3af880d92f080defd4f1b7e94edc179262514238 Mon Sep 17 00:00:00 2001 From: David Turanski Date: Wed, 4 Nov 2020 13:59:04 -0500 Subject: [PATCH] Change to Type annotations --- .../test/common/Configuration.java | 9 +++++++ .../KafkaHttpRequestProcessorTests.java | 9 ++++--- .../RabbitMQHttpRequestProcessorTests.java | 10 ++++---- .../test/sink/jdbc/KafkaJdbcSinkTests.java | 11 +++------ .../test/sink/jdbc/RabbitMQJdbcSinkTests.java | 12 +++------- .../sink/mongodb/KafkaMongoDBSinkTests.java | 11 +++------ .../mongodb/RabbitMQMongoDBSinkTests.java | 12 +++------- .../test/sink/tcp/KafkaTcpSinkTests.java | 12 +++------- .../test/sink/tcp/RabbitMQTcpSinkTests.java | 11 +++------ .../source/geode/KafkaGeodeSourceTests.java | 12 +++------- .../geode/RabbitMQGeodeSourceTests.java | 12 +++------- .../source/http/KafkaHttpSourceTests.java | 11 +++------ .../source/http/RabbitMQHttpSourceTests.java | 11 +++------ .../source/jdbc/KafkaJdbcSourceTests.java | 11 +++------ .../source/jdbc/RabbitMQJdbcSourceTests.java | 11 +++------ .../test/source/s3/KafkaS3SourceTests.java | 11 +++------ .../test/source/s3/RabbitMQS3SourceTests.java | 11 +++------ .../source/sftp/KafkaSftpSourceTests.java | 12 +++------- .../source/sftp/RabbitMQSftpSourceTests.java | 12 +++------- .../source/time/KafkaTimeSourceTests.java | 8 +++---- .../source/time/RabbitMQTimeSourceTests.java | 9 ++++--- .../jdbclog/KafkaJdbcLogStreamTests.java | 24 ++++++++++++------- .../test/stream/tiktok/KafkaTikTokTests.java | 12 +++++++--- 23 files changed, 103 insertions(+), 161 deletions(-) diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java index 5b29bee..e7570b0 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java @@ -17,6 +17,7 @@ package org.springframework.cloud.stream.apps.integration.test.common; import java.time.Duration; +import java.util.function.Supplier; public abstract class Configuration { @@ -30,4 +31,12 @@ public abstract class Configuration { VERSION = System.getProperty(SPRING_CLOUD_STREAM_APPLICATIONS_VERSION, "3.1.0-SNAPSHOT"); } + public static class VersionSupplier implements Supplier { + + @Override + public String get() { + return VERSION; + } + } + } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/KafkaHttpRequestProcessorTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/KafkaHttpRequestProcessorTests.java index f2b06e2..3ad5e1e 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/KafkaHttpRequestProcessorTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/KafkaHttpRequestProcessorTests.java @@ -19,15 +19,18 @@ package org.springframework.cloud.stream.apps.integration.test.processor.httpreq import org.testcontainers.junit.jupiter.Container; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; +import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer; + import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; @KafkaStreamAppTest class KafkaHttpRequestProcessorTests extends HttpRequestProcessorTests { @Container - private static StreamAppContainer container = configureProcessor(KafkaConfig - .prepackagedContainerFor("http-request-processor", VERSION)); + private static StreamAppContainer container = configureProcessor( + new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName( + "http-request-processor-kafka", VERSION))); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/RabbitMQHttpRequestProcessorTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/RabbitMQHttpRequestProcessorTests.java index 3c32ed1..6781ad0 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/RabbitMQHttpRequestProcessorTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/RabbitMQHttpRequestProcessorTests.java @@ -19,15 +19,17 @@ package org.springframework.cloud.stream.apps.integration.test.processor.httpreq import org.testcontainers.junit.jupiter.Container; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; +import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQStreamAppContainer; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; @RabbitMQStreamAppTest class RabbitMQHttpRequestProcessorTests extends HttpRequestProcessorTests { - @Container - private static StreamAppContainer container = configureProcessor(RabbitMQConfig - .prepackagedContainerFor("http-request-processor", VERSION)); + @Container + private static StreamAppContainer container = configureProcessor( + new RabbitMQStreamAppContainer(StreamAppContainerTestUtils.imageName( + "http-request-processor-rabbit", VERSION))); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/KafkaJdbcSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/KafkaJdbcSinkTests.java index e955239..a8d1174 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/KafkaJdbcSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/KafkaJdbcSinkTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.jdbc; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "jdbc-sink-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaJdbcSinkTests extends JdbcSinkTests { - - @BaseContainer - public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("jdbc-sink", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/RabbitMQJdbcSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/RabbitMQJdbcSinkTests.java index be9ebb5..aca720b 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/RabbitMQJdbcSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/RabbitMQJdbcSinkTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.jdbc; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "jdbc-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQJdbcSinkTests extends JdbcSinkTests { - - @BaseContainer - public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("jdbc-sink", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/KafkaMongoDBSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/KafkaMongoDBSinkTests.java index 508d8d1..89b3f73 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/KafkaMongoDBSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/KafkaMongoDBSinkTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.mongodb; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "mongodb-sink-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaMongoDBSinkTests extends MongoDBSinkTests { - - @BaseContainer - public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("mongodb-sink", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/RabbitMQMongoDBSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/RabbitMQMongoDBSinkTests.java index 4342c98..f6fab69 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/RabbitMQMongoDBSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/RabbitMQMongoDBSinkTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.mongodb; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "mongodb-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQMongoDBSinkTests extends MongoDBSinkTests { - - @BaseContainer - public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("mongodb-sink", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/KafkaTcpSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/KafkaTcpSinkTests.java index c21f210..c5cac73 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/KafkaTcpSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/KafkaTcpSinkTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.tcp; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "tcp-sink-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaTcpSinkTests extends TcpSinkTests { - - @BaseContainer - public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("tcp-sink", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/RabbitMQTcpSinkTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/RabbitMQTcpSinkTests.java index a4d0a4c..e1b731c 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/RabbitMQTcpSinkTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/RabbitMQTcpSinkTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.sink.tcp; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "tcp-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQTcpSinkTests extends TcpSinkTests { - - @BaseContainer - public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("tcp-sink", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/KafkaGeodeSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/KafkaGeodeSourceTests.java index be4ff06..3b47eda 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/KafkaGeodeSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/KafkaGeodeSourceTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.geode; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "geode-source-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaGeodeSourceTests extends GeodeSourceTests { - - @BaseContainer - public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("geode-source", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/RabbitMQGeodeSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/RabbitMQGeodeSourceTests.java index 82f9799..07a0424 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/RabbitMQGeodeSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/RabbitMQGeodeSourceTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.geode; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "geode-source-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQGeodeSourceTests extends GeodeSourceTests { - - @BaseContainer - public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("geode-source", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/KafkaHttpSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/KafkaHttpSourceTests.java index 9d21886..633e4a7 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/KafkaHttpSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/KafkaHttpSourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.http; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "http-source-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaHttpSourceTests extends HttpSourceTests { - - @BaseContainer - public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("http-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/RabbitMQHttpSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/RabbitMQHttpSourceTests.java index 8123220..04be5f7 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/RabbitMQHttpSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/RabbitMQHttpSourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.http; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "http-source-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQHttpSourceTests extends HttpSourceTests { - - @BaseContainer - public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("http-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/KafkaJdbcSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/KafkaJdbcSourceTests.java index 017cd57..b5f745a 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/KafkaJdbcSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/KafkaJdbcSourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.jdbc; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "jdbc-source-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaJdbcSourceTests extends JdbcSourceTests { - - @BaseContainer - public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("jdbc-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/RabbitMQJdbcSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/RabbitMQJdbcSourceTests.java index 8bc32a2..ec990e4 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/RabbitMQJdbcSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/RabbitMQJdbcSourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.jdbc; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "jdbc-source-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQJdbcSourceTests extends JdbcSourceTests { - - @BaseContainer - public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("jdbc-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/KafkaS3SourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/KafkaS3SourceTests.java index 3ce28e4..e6a7ebe 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/KafkaS3SourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/KafkaS3SourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.s3; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "s3-source-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaS3SourceTests extends S3SourceTests { - - @BaseContainer - public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("s3-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/RabbitMQS3SourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/RabbitMQS3SourceTests.java index 23a249d..365905f 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/RabbitMQS3SourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/RabbitMQS3SourceTests.java @@ -16,16 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.s3; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "s3-source-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQS3SourceTests extends S3SourceTests { - - @BaseContainer - public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("s3-source", VERSION); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/KafkaSftpSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/KafkaSftpSourceTests.java index 452336e..394df8a 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/KafkaSftpSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/KafkaSftpSourceTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.sftp; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @KafkaStreamAppTest +@KafkaBaseContainer(name = "sftp-source-kafka", versionSupplier = Configuration.VersionSupplier.class) public class KafkaSftpSourceTests extends SftpSourceTests { - - @BaseContainer - public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("sftp-source", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/RabbitMQSftpSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/RabbitMQSftpSourceTests.java index 6dd2369..7994dc6 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/RabbitMQSftpSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/RabbitMQSftpSourceTests.java @@ -16,17 +16,11 @@ package org.springframework.cloud.stream.apps.integration.test.source.sftp; -import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; -import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer; +import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - -import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; +import org.springframework.cloud.stream.apps.integration.test.common.Configuration; @RabbitMQStreamAppTest +@RabbitMQBaseContainer(name = "sftp-source-rabbit", versionSupplier = Configuration.VersionSupplier.class) public class RabbitMQSftpSourceTests extends SftpSourceTests { - - @BaseContainer - public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("sftp-source", VERSION); - } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/KafkaTimeSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/KafkaTimeSourceTests.java index 9dab4e7..7421431 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/KafkaTimeSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/KafkaTimeSourceTests.java @@ -19,9 +19,9 @@ package org.springframework.cloud.stream.apps.integration.test.source.time; import org.testcontainers.junit.jupiter.Container; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; - +import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; @@ -29,6 +29,6 @@ import static org.springframework.cloud.stream.apps.integration.test.common.Conf class KafkaTimeSourceTests extends TimeSourceTests { @Container - static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("time-source", VERSION); - + static StreamAppContainer source = new KafkaStreamAppContainer(StreamAppContainerTestUtils + .imageName(StreamAppContainerTestUtils.SPRINGCLOUDSTREAM_REPOSITOTRY, "time-source-kafka", VERSION)); } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/RabbitMQTimeSourceTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/RabbitMQTimeSourceTests.java index fe06d29..9c68b4a 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/RabbitMQTimeSourceTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/RabbitMQTimeSourceTests.java @@ -19,15 +19,18 @@ package org.springframework.cloud.stream.apps.integration.test.source.time; import org.testcontainers.junit.jupiter.Container; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; -import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; - +import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQStreamAppContainer; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; @RabbitMQStreamAppTest + class RabbitMQTimeSourceTests extends TimeSourceTests { @Container - static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("time-source", VERSION); + static StreamAppContainer source = new RabbitMQStreamAppContainer(StreamAppContainerTestUtils + .imageName(StreamAppContainerTestUtils.SPRINGCLOUDSTREAM_REPOSITOTRY, "time-source-rabbit", VERSION)); + } diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/jdbclog/KafkaJdbcLogStreamTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/jdbclog/KafkaJdbcLogStreamTests.java index 39130f3..21db634 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/jdbclog/KafkaJdbcLogStreamTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/jdbclog/KafkaJdbcLogStreamTests.java @@ -23,9 +23,11 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import org.springframework.cloud.stream.app.test.integration.LogMatcher; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.StreamApps; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; +import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer; import static org.awaitility.Awaitility.await; import static org.springframework.cloud.stream.app.test.integration.AppLog.appLog; @@ -53,16 +55,20 @@ public class KafkaJdbcLogStreamTests { private static final StreamApps streamApp = kafkaStreamApps(KafkaJdbcLogStreamTests.class.getSimpleName(), KafkaConfig.kafka) .withSourceContainer( - KafkaConfig.prepackagedContainerFor("jdbc-source", VERSION) - .withEnv("JDBC_SUPPLIER_QUERY", "SELECT * FROM People WHERE deleted='N'") - .withEnv("JDBC_SUPPLIER_UPDATE", "UPDATE People SET deleted='Y' WHERE id=:id") - .withEnv("SPRING_DATASOURCE_PASSWORD", "secret") - .withEnv("SPRING_DATASOURCE_USERNAME", "test") - .withEnv("SPRING_DATASOURCE_DRIVER_CLASS_NAME", "org.mariadb.jdbc.Driver") - .withEnv("SPRING_DATASOURCE_URL", - "jdbc:mariadb://mysql-for-stream:3306/test")) + new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName( + "jdbc-source-kafka", + VERSION)) + .withEnv("JDBC_SUPPLIER_QUERY", "SELECT * FROM People WHERE deleted='N'") + .withEnv("JDBC_SUPPLIER_UPDATE", + "UPDATE People SET deleted='Y' WHERE id=:id") + .withEnv("SPRING_DATASOURCE_PASSWORD", "secret") + .withEnv("SPRING_DATASOURCE_USERNAME", "test") + .withEnv("SPRING_DATASOURCE_DRIVER_CLASS_NAME", "org.mariadb.jdbc.Driver") + .withEnv("SPRING_DATASOURCE_URL", + "jdbc:mariadb://mysql-for-stream:3306/test")) .withSinkContainer( - KafkaConfig.prepackagedContainerFor("log-sink", VERSION).withLogConsumer(logMatcher)) + new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName( + "log-sink-kafka", VERSION)).withLogConsumer(logMatcher)) .build(); @Test diff --git a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/tiktok/KafkaTikTokTests.java b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/tiktok/KafkaTikTokTests.java index 04ea898..26bffde 100644 --- a/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/tiktok/KafkaTikTokTests.java +++ b/stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/tiktok/KafkaTikTokTests.java @@ -20,9 +20,11 @@ import org.junit.jupiter.api.Test; import org.testcontainers.junit.jupiter.Container; import org.springframework.cloud.stream.app.test.integration.LogMatcher; +import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils; import org.springframework.cloud.stream.app.test.integration.StreamApps; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; +import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer; import static org.awaitility.Awaitility.await; import static org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamApps.kafkaStreamApps; @@ -39,10 +41,14 @@ public class KafkaTikTokTests { private static final StreamApps streamApp = kafkaStreamApps(KafkaTikTokTests.class.getSimpleName(), KafkaConfig.kafka) .withSourceContainer( - KafkaConfig.prepackagedContainerFor("time-source", VERSION)) + new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName( + "time-source-kafka", + VERSION))) .withSinkContainer( - KafkaConfig.prepackagedContainerFor("log-sink", VERSION).withLogConsumer(logMatcher) - .log()) + new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName( + "log-sink-kafka", + VERSION)).withLogConsumer(logMatcher) + .log()) .build(); @Test