From 8e353d8a546a6c3e07abc950acfacc8043d4af2b Mon Sep 17 00:00:00 2001 From: Michael Peels Date: Fri, 27 Feb 2026 14:09:55 -0500 Subject: [PATCH 1/2] Update testcontainers dependency --- investigation-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 16 +++++++--------- .../config/KafkaProducerConfigTest.java | 19 +++++++------------ ldfdata-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 10 +++++----- .../config/KafkaProducerConfigTest.java | 13 +++++-------- observation-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 14 +++++++------- .../config/KafkaProducerConfigTest.java | 17 +++++++---------- organization-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 14 +++++++------- .../config/KafkaProducerConfigTest.java | 17 +++++++---------- person-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 14 +++++++------- .../config/KafkaProducerConfigTest.java | 17 +++++++---------- post-processing-service/build.gradle | 7 +++---- .../config/KafkaConsumerConfigTest.java | 10 +++++----- .../config/KafkaProducerConfigTest.java | 13 +++++-------- 18 files changed, 94 insertions(+), 122 deletions(-) diff --git a/investigation-service/build.gradle b/investigation-service/build.gradle index 4a2f84121..9cfdbe8c9 100644 --- a/investigation-service/build.gradle +++ b/investigation-service/build.gradle @@ -54,7 +54,6 @@ dependencies { implementation 'org.apache.kafka:connect-api:3.9.1' implementation 'io.debezium:debezium-core:2.4.1.Final' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -78,9 +77,9 @@ dependencies { } testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:testcontainers:1.21.3' - testImplementation 'org.testcontainers:kafka:1.21.3' - testImplementation 'org.testcontainers:junit-jupiter:1.21.3' + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' testImplementation 'org.awaitility:awaitility:4.2.0' } diff --git a/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaConsumerConfigTest.java b/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaConsumerConfigTest.java index 926a46b5a..0d64fd4ba 100644 --- a/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaConsumerConfigTest.java +++ b/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaConsumerConfigTest.java @@ -5,27 +5,25 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.utility.DockerImageName; -import java.time.Duration; - class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaConsumerConfig = new KafkaConsumerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +31,8 @@ public static void tearDown() { void kafkaListenerContainerFactory_ConfigurationIsValid() { // Act - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactory(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactory(); // Assert Assertions.assertNotNull(kafkaListenerContainerFactory); diff --git a/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaProducerConfigTest.java b/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaProducerConfigTest.java index 4bfaa44f0..4f1d14932 100644 --- a/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaProducerConfigTest.java +++ b/investigation-service/src/test/java/gov/cdc/etldatapipeline/investigation/config/KafkaProducerConfigTest.java @@ -4,28 +4,25 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.utility.DockerImageName; -import java.time.Duration; - class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaProducerConfig = new KafkaProducerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +30,7 @@ public static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +40,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); diff --git a/ldfdata-service/build.gradle b/ldfdata-service/build.gradle index 2fab68b9b..734703d4e 100644 --- a/ldfdata-service/build.gradle +++ b/ldfdata-service/build.gradle @@ -50,7 +50,6 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka:3.3.1' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -72,9 +71,9 @@ dependencies { } testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:testcontainers:1.19.8' - testImplementation 'org.testcontainers:kafka:1.19.8' - testImplementation 'org.testcontainers:junit-jupiter:1.19.8' + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' } dependencyManagement { diff --git a/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaConsumerConfigTest.java b/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaConsumerConfigTest.java index 9ab61ca13..a8dbbe7ed 100644 --- a/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaConsumerConfigTest.java +++ b/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaConsumerConfigTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; @@ -13,10 +13,10 @@ class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll static void setUp() { @@ -33,8 +33,8 @@ static void tearDown() { void kafkaListenerContainerFactory_ConfigurationIsValid() { // Act - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactory(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactory(); // Assert Assertions.assertNotNull(kafkaListenerContainerFactory); diff --git a/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaProducerConfigTest.java b/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaProducerConfigTest.java index e04d5202a..559249262 100644 --- a/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaProducerConfigTest.java +++ b/ldfdata-service/src/test/java/gov/cdc/etldatapipeline/ldfdata/config/KafkaProducerConfigTest.java @@ -4,19 +4,18 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import java.time.Duration; class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll static void setUp() { @@ -33,8 +32,7 @@ static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +42,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); diff --git a/observation-service/build.gradle b/observation-service/build.gradle index 903ad5157..03ede49a0 100644 --- a/observation-service/build.gradle +++ b/observation-service/build.gradle @@ -50,7 +50,6 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka:3.3.1' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -73,9 +72,9 @@ dependencies { } testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:testcontainers:1.19.8' - testImplementation 'org.testcontainers:kafka:1.19.8' - testImplementation 'org.testcontainers:junit-jupiter:1.19.8' + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' } dependencyManagement { diff --git a/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaConsumerConfigTest.java b/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaConsumerConfigTest.java index 3530fcd0d..59c67d022 100644 --- a/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaConsumerConfigTest.java +++ b/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaConsumerConfigTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; @@ -13,19 +13,19 @@ class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaConsumerConfig = new KafkaConsumerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +33,8 @@ public static void tearDown() { void kafkaListenerContainerFactory_ConfigurationIsValid() { // Act - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactory(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactory(); // Assert Assertions.assertNotNull(kafkaListenerContainerFactory); diff --git a/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaProducerConfigTest.java b/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaProducerConfigTest.java index 7c38266ab..9f6e8a65d 100644 --- a/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaProducerConfigTest.java +++ b/observation-service/src/test/java/gov/cdc/etldatapipeline/observation/config/KafkaProducerConfigTest.java @@ -4,28 +4,27 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import java.time.Duration; class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaProducerConfig = new KafkaProducerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +32,7 @@ public static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +42,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); diff --git a/organization-service/build.gradle b/organization-service/build.gradle index 0ca2196c7..c120bf8e8 100644 --- a/organization-service/build.gradle +++ b/organization-service/build.gradle @@ -50,7 +50,6 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka:3.3.1' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -71,9 +70,9 @@ dependencies { } testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:testcontainers:1.19.8' - testImplementation 'org.testcontainers:kafka:1.19.8' - testImplementation 'org.testcontainers:junit-jupiter:1.19.8' + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' } dependencyManagement { diff --git a/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaConsumerConfigTest.java b/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaConsumerConfigTest.java index f76458f45..342243937 100644 --- a/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaConsumerConfigTest.java +++ b/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaConsumerConfigTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; @@ -13,19 +13,19 @@ class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaConsumerConfig = new KafkaConsumerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +33,8 @@ public static void tearDown() { void kafkaListenerContainerFactory_ConfigurationIsValid() { // Act - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactory(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactory(); // Assert Assertions.assertNotNull(kafkaListenerContainerFactory); diff --git a/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaProducerConfigTest.java b/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaProducerConfigTest.java index cb94ad087..f96dcc821 100644 --- a/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaProducerConfigTest.java +++ b/organization-service/src/test/java/gov/cdc/etldatapipeline/organization/config/KafkaProducerConfigTest.java @@ -4,28 +4,27 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import java.time.Duration; class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaProducerConfig = new KafkaProducerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +32,7 @@ public static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +42,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); diff --git a/person-service/build.gradle b/person-service/build.gradle index 90e88f996..01c7fca92 100644 --- a/person-service/build.gradle +++ b/person-service/build.gradle @@ -53,7 +53,6 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka:3.3.1' implementation 'io.debezium:debezium-core:2.4.1.Final' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -74,9 +73,9 @@ dependencies { } testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.testcontainers:testcontainers:1.19.8' - testImplementation 'org.testcontainers:kafka:1.19.8' - testImplementation 'org.testcontainers:junit-jupiter:1.19.8' + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' } dependencyManagement { diff --git a/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaConsumerConfigTest.java b/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaConsumerConfigTest.java index 0d7cef39f..c9abe9764 100644 --- a/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaConsumerConfigTest.java +++ b/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaConsumerConfigTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; @@ -13,19 +13,19 @@ class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaConsumerConfig = new KafkaConsumerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +33,8 @@ public static void tearDown() { void kafkaListenerContainerFactory_ConfigurationIsValid() { // Act - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactory(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactory(); // Assert Assertions.assertNotNull(kafkaListenerContainerFactory); diff --git a/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaProducerConfigTest.java b/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaProducerConfigTest.java index 663539851..407ed3790 100644 --- a/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaProducerConfigTest.java +++ b/person-service/src/test/java/gov/cdc/etldatapipeline/person/config/KafkaProducerConfigTest.java @@ -4,28 +4,27 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import java.time.Duration; class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll - public static void setUp() { + static void setUp() { kafkaContainer.start(); kafkaProducerConfig = new KafkaProducerConfig(); } @AfterAll - public static void tearDown() { + static void tearDown() { kafkaContainer.stop(); } @@ -33,8 +32,7 @@ public static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +42,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); diff --git a/post-processing-service/build.gradle b/post-processing-service/build.gradle index 20ee076e4..705979a74 100644 --- a/post-processing-service/build.gradle +++ b/post-processing-service/build.gradle @@ -69,7 +69,6 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka:3.3.1' implementation 'org.apache.kafka:connect-api:3.9.1' - implementation 'commons-io:commons-io:2.15.0' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' implementation 'com.microsoft.sqlserver:mssql-jdbc:12.3.0.jre17-preview' implementation 'ch.qos.logback:logback-classic' @@ -94,9 +93,9 @@ dependencies { testImplementation(platform('org.junit:junit-bom:5.9.1')) testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test:6.2.0' - testImplementation 'org.testcontainers:testcontainers:1.19.8' - testImplementation "org.testcontainers:kafka:1.19.8" - testImplementation "org.testcontainers:junit-jupiter:1.19.8" + testImplementation 'org.testcontainers:testcontainers:2.0.3' + testImplementation 'org.testcontainers:testcontainers-kafka:2.0.3' + testImplementation 'org.testcontainers:testcontainers-junit-jupiter:2.0.3' } dependencyManagement { diff --git a/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaConsumerConfigTest.java b/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaConsumerConfigTest.java index 016c31f0a..d7b5281e3 100644 --- a/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaConsumerConfigTest.java +++ b/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaConsumerConfigTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; @@ -13,10 +13,10 @@ class KafkaConsumerConfigTest { private static KafkaConsumerConfig kafkaConsumerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll static void setUp() { @@ -32,8 +32,8 @@ static void tearDown() { @Test void kafkaListenerContainerFactory_ConfigurationIsValid() { - ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = - kafkaConsumerConfig.kafkaListenerContainerFactoryDefault(); + ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory = kafkaConsumerConfig + .kafkaListenerContainerFactoryDefault(); Assertions.assertNotNull(kafkaListenerContainerFactory); } diff --git a/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaProducerConfigTest.java b/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaProducerConfigTest.java index d1626fd81..a0b8f985c 100644 --- a/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaProducerConfigTest.java +++ b/post-processing-service/src/test/java/gov/cdc/etldatapipeline/postprocessingservice/config/KafkaProducerConfigTest.java @@ -4,19 +4,18 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; +import org.testcontainers.kafka.ConfluentKafkaContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.utility.DockerImageName; import java.time.Duration; class KafkaProducerConfigTest { - private static KafkaProducerConfig kafkaProducerConfig; + private static DockerImageName image = DockerImageName.parse("confluentinc/cp-kafka:8.0.4"); @Container - public static KafkaContainer kafkaContainer = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.3.0")) - .withStartupTimeout(Duration.ofMinutes(5)); + private static ConfluentKafkaContainer kafkaContainer = new ConfluentKafkaContainer(image); @BeforeAll static void setUp() { @@ -33,8 +32,7 @@ static void tearDown() { void producerFactory_configValid() { // Act - var target = - kafkaProducerConfig.producerFactory(); + var target = kafkaProducerConfig.producerFactory(); // Assert Assertions.assertNotNull(target); @@ -44,8 +42,7 @@ void producerFactory_configValid() { void kafkaTemplate_configValid() { // Act - var target = - kafkaProducerConfig.kafkaTemplate(); + var target = kafkaProducerConfig.kafkaTemplate(); // Assert Assertions.assertNotNull(target); From 48a5d6fa7a7fe0a2eddb124c8a4c97d9eefd6658 Mon Sep 17 00:00:00 2001 From: Michael Peels Date: Fri, 27 Feb 2026 15:23:55 -0500 Subject: [PATCH 2/2] Update common-util to be compatible --- common-util/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-util/build.gradle b/common-util/build.gradle index 7ad648f91..74a3e5bc2 100644 --- a/common-util/build.gradle +++ b/common-util/build.gradle @@ -42,7 +42,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' compileOnly 'org.slf4j:slf4j-api' - implementation 'commons-io:commons-io:2.15.0' + implementation 'commons-io:commons-io:2.21.0' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0' implementation 'com.google.guava:guava:33.5.0-jre'