Skip to content

Commit ec0f17c

Browse files
fix(deps): update kafka-client.version to v4 (release/5.0.x) (major) (#555)
* fix(deps): update kafka-client.version to v4 * chore(deps): update dependency org.springframework.kafka:spring-kafka-test to v4 * Migrate tests to JUnit Jupiter --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jochen Schalanda <jochen@schalanda.name>
1 parent 272c338 commit ec0f17c

34 files changed

Lines changed: 84 additions & 71 deletions

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<sonar.projectKey>dropwizard_dropwizard-kafka</sonar.projectKey>
2727

2828
<brave.version>6.3.0</brave.version>
29-
<kafka-client.version>3.9.1</kafka-client.version>
30-
<spring-kafka.version>3.3.11</spring-kafka.version>
29+
<kafka-client.version>4.1.1</kafka-client.version>
30+
<spring-kafka.version>4.0.1</spring-kafka.version>
3131
</properties>
3232

3333
<dependencyManagement>
@@ -126,15 +126,19 @@
126126

127127
<!-- test dependencies -->
128128
<dependency>
129-
<groupId>org.junit.vintage</groupId>
130-
<artifactId>junit-vintage-engine</artifactId>
129+
<groupId>org.junit.jupiter</groupId>
130+
<artifactId>junit-jupiter</artifactId>
131131
<scope>test</scope>
132132
</dependency>
133133
<dependency>
134134
<groupId>org.mockito</groupId>
135135
<artifactId>mockito-core</artifactId>
136136
<scope>test</scope>
137137
</dependency>
138+
<dependency>
139+
<groupId>org.awaitility</groupId>
140+
<artifactId>awaitility</artifactId>
141+
</dependency>
138142
<dependency>
139143
<groupId>io.dropwizard</groupId>
140144
<artifactId>dropwizard-testing</artifactId>

src/test/java/io/dropwizard/kafka/BasicKafkaAdminClientFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.dropwizard.jersey.validation.Validators;
1111
import io.dropwizard.lifecycle.setup.LifecycleEnvironment;
1212
import org.apache.kafka.clients.admin.AdminClient;
13-
import org.junit.Test;
13+
import org.junit.jupiter.api.Test;
1414

1515
import java.io.File;
1616
import java.util.Collections;

src/test/java/io/dropwizard/kafka/BasicKafkaConsumerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.dropwizard.jersey.validation.Validators;
1111
import io.dropwizard.lifecycle.setup.LifecycleEnvironment;
1212
import org.apache.kafka.clients.consumer.Consumer;
13-
import org.junit.Test;
13+
import org.junit.jupiter.api.Test;
1414

1515
import java.io.File;
1616

src/test/java/io/dropwizard/kafka/BasicKafkaProducerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.dropwizard.jersey.validation.Validators;
1212
import io.dropwizard.lifecycle.setup.LifecycleEnvironment;
1313
import org.apache.kafka.clients.producer.Producer;
14-
import org.junit.Test;
14+
import org.junit.jupiter.api.Test;
1515

1616
import java.io.File;
1717

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package io.dropwizard.kafka;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Assertions;
4+
import org.junit.jupiter.api.Test;
45

56
import java.util.ArrayList;
67
import java.util.Map;
78

9+
import static org.junit.jupiter.api.Assertions.assertThrows;
10+
811
public class DropwizardKafkaUtilsTest {
912
@Test
1013
public void actualSubclassShouldBeCorrectlyValidated() {
@@ -13,17 +16,17 @@ public void actualSubclassShouldBeCorrectlyValidated() {
1316
DropwizardKafkaUtils.validateStringIsValidSubClass(integerClassName, Object.class);
1417
}
1518

16-
@Test(expected = IllegalStateException.class)
19+
@Test
1720
public void nonSubclassShouldFailValidations() {
1821
final String arrayListClassName = ArrayList.class.getName();
1922

20-
DropwizardKafkaUtils.validateStringIsValidSubClass(arrayListClassName, Map.class);
23+
assertThrows(IllegalStateException.class, () -> DropwizardKafkaUtils.validateStringIsValidSubClass(arrayListClassName, Map.class));
2124
}
2225

23-
@Test(expected = RuntimeException.class)
26+
@Test
2427
public void classThatDoesNotExistShouldFailValidations() {
2528
final String fakeClassName = "blah.blah.blah.businesslogic.ObjectFactoryFactoryVisitor";
2629

27-
DropwizardKafkaUtils.validateStringIsValidSubClass(fakeClassName, Object.class);
30+
assertThrows(RuntimeException.class, () -> DropwizardKafkaUtils.validateStringIsValidSubClass(fakeClassName, Object.class));
2831
}
2932
}

src/test/java/io/dropwizard/kafka/KafkaTopicFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.dropwizard.jersey.validation.Validators;
88
import org.apache.kafka.clients.admin.NewTopic;
99
import org.apache.kafka.common.config.TopicConfig;
10-
import org.junit.Test;
10+
import org.junit.jupiter.api.Test;
1111

1212
import jakarta.validation.Validator;
1313
import java.io.File;

src/test/java/io/dropwizard/kafka/MockKafkaConsumerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dropwizard.kafka;
22

33
import io.dropwizard.jackson.DiscoverableSubtypeResolver;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55

66
import static org.assertj.core.api.Assertions.assertThat;
77

src/test/java/io/dropwizard/kafka/MockKafkaProducerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.dropwizard.kafka;
22

33
import io.dropwizard.jackson.DiscoverableSubtypeResolver;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
55

66
import static org.assertj.core.api.Assertions.assertThat;
77

src/test/java/io/dropwizard/kafka/deserializer/ByteArrayDeserializerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.dropwizard.jersey.validation.Validators;
99
import org.apache.kafka.clients.consumer.ConsumerConfig;
1010
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212

1313
import java.io.File;
1414
import java.util.Map;

src/test/java/io/dropwizard/kafka/deserializer/ByteBufferDeserializerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.dropwizard.jersey.validation.Validators;
99
import org.apache.kafka.clients.consumer.ConsumerConfig;
1010
import org.apache.kafka.common.serialization.ByteBufferDeserializer;
11-
import org.junit.Test;
11+
import org.junit.jupiter.api.Test;
1212

1313
import java.io.File;
1414
import java.util.Map;

0 commit comments

Comments
 (0)