Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
7 changes: 3 additions & 4 deletions investigation-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,34 @@
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();
}

@Test
void kafkaListenerContainerFactory_ConfigurationIsValid() {

// Act
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory =
kafkaConsumerConfig.kafkaListenerContainerFactory();
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory = kafkaConsumerConfig
.kafkaListenerContainerFactory();

// Assert
Assertions.assertNotNull(kafkaListenerContainerFactory);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,33 @@
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();
}

@Test
void producerFactory_configValid() {

// Act
var target =
kafkaProducerConfig.producerFactory();
var target = kafkaProducerConfig.producerFactory();

// Assert
Assertions.assertNotNull(target);
Expand All @@ -44,8 +40,7 @@ void producerFactory_configValid() {
void kafkaTemplate_configValid() {

// Act
var target =
kafkaProducerConfig.kafkaTemplate();
var target = kafkaProducerConfig.kafkaTemplate();

// Assert
Assertions.assertNotNull(target);
Expand Down
7 changes: 3 additions & 4 deletions ldfdata-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
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;

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
static void setUp() {
Expand All @@ -33,8 +33,8 @@ static void tearDown() {
void kafkaListenerContainerFactory_ConfigurationIsValid() {

// Act
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory =
kafkaConsumerConfig.kafkaListenerContainerFactory();
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory = kafkaConsumerConfig
.kafkaListenerContainerFactory();

// Assert
Assertions.assertNotNull(kafkaListenerContainerFactory);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -33,8 +32,7 @@ static void tearDown() {
void producerFactory_configValid() {

// Act
var target =
kafkaProducerConfig.producerFactory();
var target = kafkaProducerConfig.producerFactory();

// Assert
Assertions.assertNotNull(target);
Expand All @@ -44,8 +42,7 @@ void producerFactory_configValid() {
void kafkaTemplate_configValid() {

// Act
var target =
kafkaProducerConfig.kafkaTemplate();
var target = kafkaProducerConfig.kafkaTemplate();

// Assert
Assertions.assertNotNull(target);
Expand Down
7 changes: 3 additions & 4 deletions observation-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,36 @@
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;

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();
}

@Test
void kafkaListenerContainerFactory_ConfigurationIsValid() {

// Act
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory =
kafkaConsumerConfig.kafkaListenerContainerFactory();
ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory = kafkaConsumerConfig
.kafkaListenerContainerFactory();

// Assert
Assertions.assertNotNull(kafkaListenerContainerFactory);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,35 @@
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();
}

@Test
void producerFactory_configValid() {

// Act
var target =
kafkaProducerConfig.producerFactory();
var target = kafkaProducerConfig.producerFactory();

// Assert
Assertions.assertNotNull(target);
Expand All @@ -44,8 +42,7 @@ void producerFactory_configValid() {
void kafkaTemplate_configValid() {

// Act
var target =
kafkaProducerConfig.kafkaTemplate();
var target = kafkaProducerConfig.kafkaTemplate();

// Assert
Assertions.assertNotNull(target);
Expand Down
7 changes: 3 additions & 4 deletions organization-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
Loading