Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to spring-kafka 2.6.0

Browse Source
This commit is contained in:
Gary Russell
2020-08-04 12:14:16 -04:00
parent 0e2652fdf6
commit acdc25a172
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceTests.java
View File

@@ -21,7 +21,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.BDDMockito.given;
@@ -45,7 +44,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -329,7 +327,7 @@ class MessageSourceTests {
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).resume(partitions.getAllValues().get(1));
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(any());
inOrder.verifyNoMoreInteractions();
if (!sync) {
assertThat(callbackCount.get()).isEqualTo(4);
@@ -444,7 +442,7 @@ class MessageSourceTests {
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(3L)));
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(6L)));
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(any());
inOrder.verifyNoMoreInteractions();
}
@@ -513,7 +511,7 @@ class MessageSourceTests {
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(2L)),
Duration.ofSeconds(30));
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(any());
inOrder.verifyNoMoreInteractions();
}
@@ -599,7 +597,7 @@ class MessageSourceTests {
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(2L)));
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(any());
inOrder.verifyNoMoreInteractions();
}
@@ -744,7 +742,7 @@ class MessageSourceTests {
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(3L)));
inOrder.verify(consumer).commitSync(Collections.singletonMap(topicPartition, new OffsetAndMetadata(4L)));
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(any());
inOrder.verifyNoMoreInteractions();
}
@@ -922,9 +920,7 @@ class MessageSourceTests {
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).resume(anyCollection());
inOrder.verify(consumer).poll(any(Duration.class));
inOrder.verify(consumer).close();
inOrder.verify(consumer).close(anyLong(), any(TimeUnit.class));
inOrder.verifyNoMoreInteractions();
inOrder.verify(consumer).close(any());
}
}

13
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java
View File

@@ -48,6 +48,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerGroupMetadata;
import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -505,6 +506,8 @@ class KafkaProducerMessageHandlerTests {
return null;
}
}).given(mockConsumer).poll(any(Duration.class));
ConsumerGroupMetadata meta = new ConsumerGroupMetadata("group");
given(mockConsumer.groupMetadata()).willReturn(meta);
ConsumerFactory cf = mock(ConsumerFactory.class);
willReturn(mockConsumer).given(cf).createConsumer("group", "", null, KafkaTestUtils.defaultPropertyOverrides());
Producer producer = mock(Producer.class);
@@ -543,7 +546,7 @@ class KafkaProducerMessageHandlerTests {
InOrder inOrder = inOrder(producer);
inOrder.verify(producer).beginTransaction();
inOrder.verify(producer).sendOffsetsToTransaction(Collections.singletonMap(topicPartition,
new OffsetAndMetadata(0)), "group");
new OffsetAndMetadata(0)), meta);
inOrder.verify(producer).commitTransaction();
inOrder.verify(producer).close(any());
inOrder.verify(producer).beginTransaction();
@@ -551,7 +554,7 @@ class KafkaProducerMessageHandlerTests {
inOrder.verify(producer).send(captor.capture(), any(Callback.class));
assertThat(captor.getValue()).isEqualTo(new ProducerRecord("topic", null, "bar", "value"));
inOrder.verify(producer).sendOffsetsToTransaction(Collections.singletonMap(topicPartition,
new OffsetAndMetadata(1)), "group");
new OffsetAndMetadata(1)), meta);
inOrder.verify(producer).commitTransaction();
inOrder.verify(producer).close(any());
container.stop();
@@ -617,6 +620,8 @@ class KafkaProducerMessageHandlerTests {
return null;
}
}).given(mockConsumer).poll(any(Duration.class));
ConsumerGroupMetadata meta = new ConsumerGroupMetadata("group");
given(mockConsumer.groupMetadata()).willReturn(meta);
ConsumerFactory cf = mock(ConsumerFactory.class);
willReturn(mockConsumer).given(cf).createConsumer("group", "", null, KafkaTestUtils.defaultPropertyOverrides());
Producer producer = mock(Producer.class);
@@ -663,7 +668,7 @@ class KafkaProducerMessageHandlerTests {
InOrder inOrder = inOrder(producer);
inOrder.verify(producer).beginTransaction();
inOrder.verify(producer).sendOffsetsToTransaction(Collections.singletonMap(topicPartition,
new OffsetAndMetadata(0)), "group");
new OffsetAndMetadata(0)), meta);
inOrder.verify(producer).commitTransaction();
inOrder.verify(producer).close(any());
inOrder.verify(producer).beginTransaction();
@@ -671,7 +676,7 @@ class KafkaProducerMessageHandlerTests {
inOrder.verify(producer).send(captor.capture(), any(Callback.class));
assertThat(captor.getValue()).isEqualTo(new ProducerRecord("topic", null, "bar", "value"));
inOrder.verify(producer).sendOffsetsToTransaction(Collections.singletonMap(topicPartition,
new OffsetAndMetadata(1)), "group");
new OffsetAndMetadata(1)), meta);
inOrder.verify(producer).commitTransaction();
inOrder.verify(producer).close(any());
container.stop();