Skip to content

Commit efb8860

Browse files
committed
Fix some Kafka tests for their individual embedded brokers
* Add `package-info.java` to `kafka.aot` and fix NullAway in the `KafkaRuntimeHints`
1 parent 6ef212a commit efb8860

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/aot/KafkaRuntimeHints.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import java.util.stream.Stream;
2020

21+
import org.jspecify.annotations.Nullable;
22+
2123
import org.springframework.aot.hint.ExecutableMode;
2224
import org.springframework.aot.hint.ReflectionHints;
2325
import org.springframework.aot.hint.RuntimeHints;
@@ -37,7 +39,7 @@
3739
class KafkaRuntimeHints implements RuntimeHintsRegistrar {
3840

3941
@Override
40-
public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
42+
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
4143
ReflectionHints reflectionHints = hints.reflection();
4244

4345
// Java DSL does not register beans during AOT phase, so @Reflective is not reachable from Pausable
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/**
2+
* AOT support classes for Apache Kafka Module.
3+
*/
4+
@org.jspecify.annotations.NullMarked
5+
package org.springframework.integration.kafka.aot;

spring-integration-kafka/src/main/java/org/springframework/integration/kafka/package-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
import org.springframework.kafka.support.Acknowledgment;
7272
import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
7373
import org.springframework.kafka.support.KafkaHeaders;
74+
import org.springframework.kafka.test.context.EmbeddedKafka;
7475
import org.springframework.kafka.test.utils.KafkaTestUtils;
7576
import org.springframework.messaging.Message;
7677
import org.springframework.messaging.MessageChannel;
@@ -97,6 +98,7 @@
9798
*/
9899
@SpringJUnitConfig
99100
@DirtiesContext
101+
@EmbeddedKafka
100102
public class KafkaDslTests {
101103

102104
private static final Log log = LogFactory.getLog(KafkaDslTests.class);
@@ -275,7 +277,7 @@ public static class ContextConfiguration {
275277

276278
private Object fromSource;
277279

278-
@Value("${spring.global.embedded.kafka.brokers}")
280+
@Value("${spring.kafka.bootstrap-servers}")
279281
String embeddedKafkaBrokers;
280282

281283
@Bean

spring-integration-kafka/src/test/kotlin/org/springframework/integration/kafka/dsl/kotlin/KafkaDslKotlinTests.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import org.springframework.kafka.requestreply.ReplyingKafkaTemplate
4747
import org.springframework.kafka.support.Acknowledgment
4848
import org.springframework.kafka.support.DefaultKafkaHeaderMapper
4949
import org.springframework.kafka.support.KafkaHeaders
50+
import org.springframework.kafka.test.context.EmbeddedKafka
5051
import org.springframework.kafka.test.utils.KafkaTestUtils
5152
import org.springframework.messaging.Message
5253
import org.springframework.messaging.MessageChannel
@@ -71,6 +72,7 @@ import java.util.stream.Stream
7172

7273
@SpringJUnitConfig
7374
@DirtiesContext
75+
@EmbeddedKafka
7476
class KafkaDslKotlinTests {
7577

7678
companion object {
@@ -205,7 +207,7 @@ class KafkaDslKotlinTests {
205207

206208
var fromSource: Any? = null
207209

208-
@Value("\${spring.global.embedded.kafka.brokers}")
210+
@Value("\${spring.kafka.bootstrap-servers}")
209211
lateinit var embeddedKafkaBrokers: String
210212

211213
@Bean

0 commit comments

Comments
 (0)