Fixing build issues

Signed-off-by: Soby Chacko <[email protected]>

Author: sobychacko

spring-kafka/src/test/java/org/springframework/kafka/listener/TransactionalContainerTests.java

@@ -47,7 +47,6 @@
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.internals.RecordHeader;
 import org.apache.kafka.common.header.internals.RecordHeaders;
-import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -1164,7 +1163,7 @@ void testSendOffsetOnlyOnActiveTransaction() throws InterruptedException {
 
 		// init consumer
 		String group = "testSendOffsetOnlyOnActiveTransaction";
-		Map<String, Object> consumerProperties = KafkaTestUtils.consumerProps(embeddedKafka, group, false);
+		Map<String, Object> consumerProperties = KafkaTestUtils.consumerProps(group, "false", embeddedKafka);
 		consumerProperties.put(ConsumerConfig.ISOLATION_LEVEL_CONFIG, "read_committed");
 		DefaultKafkaConsumerFactory<Integer, String> cf = new DefaultKafkaConsumerFactory<>(consumerProperties);
 		ContainerProperties containerProps = new ContainerProperties(topic11);
@@ -1181,7 +1180,7 @@ public void onMessage(ConsumerRecord<Integer, String> data) {
 		AtomicInteger txCount = new AtomicInteger(0);
 		tm.addListener(new TransactionExecutionListener() {
 			@Override
-			public void afterCommit(TransactionExecution transaction, @Nullable Throwable commitFailure) {
+			public void afterCommit(TransactionExecution transaction, Throwable commitFailure) {
 				txCount.incrementAndGet();
 				TransactionExecutionListener.super.afterCommit(transaction, commitFailure);
 			}
@@ -1195,7 +1194,7 @@ public void afterCommit(TransactionExecution transaction, @Nullable Throwable co
 			boolean isFirst = true;
 
 			@Override
-			public @Nullable ConsumerRecord<Integer, String> intercept(
+			public ConsumerRecord<Integer, String> intercept(
 					ConsumerRecord<Integer, String> record,
 					Consumer<Integer, String> consumer) {
 				if (isFirst) {

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/ReusableRetryTopicMultipleDltIntegrationTests.java

@@ -34,7 +34,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.annotation.BackOff;
 import org.springframework.kafka.annotation.DltHandler;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -52,6 +51,7 @@
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.retry.annotation.Backoff;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.test.annotation.DirtiesContext;
@@ -134,7 +134,7 @@ static class SingleDltListener {
 
 		@RetryableTopic(
 				attempts = "3",
-				backOff = @BackOff(50),
+				backoff = @Backoff(50),
 				sameIntervalTopicReuseStrategy = SameIntervalTopicReuseStrategy.SINGLE_TOPIC
 		)
 		@KafkaListener(id = "singleDltListenerId", topics = SINGLE_DLT_TOPIC)
@@ -158,7 +158,7 @@ static class MultiDltListener {
 
 		@RetryableTopic(
 				attempts = "3",
-				backOff = @BackOff(50),
+				backoff = @Backoff(50),
 				sameIntervalTopicReuseStrategy = SameIntervalTopicReuseStrategy.SINGLE_TOPIC,
 				exceptionBasedDltRouting = {
 						@ExceptionBasedDltDestination(suffix = "-custom", exceptions = { CustomRetryException.class }),
@@ -195,7 +195,7 @@ static class NoDltListener {
 
 		@RetryableTopic(
 				attempts = "3",
-				backOff = @BackOff(50),
+				backoff = @Backoff(50),
 				dltStrategy = DltStrategy.NO_DLT,
 				sameIntervalTopicReuseStrategy = SameIntervalTopicReuseStrategy.SINGLE_TOPIC
 		)