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

GH-164: Spring Kafka 2.0.0 Compatibility

Browse Source 
Resolves: https://github.com/spring-projects/spring-integration-kafka/issues/164

Also gradle 3.5.

Requires https://github.com/spring-projects/spring-kafka/pull/296

Fix javadocs

More javadoc polishing

Updates for new Consumer header

* Simple polishing
This commit is contained in:
Gary Russell
2017-04-25 11:45:48 -04:00
committed by Artem Bilan
parent 69e533f338
commit ee6b3f87b3
4 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests.java
View File

@@ -33,9 +33,9 @@ import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAd
import org.springframework.integration.test.util.TestUtils;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.adapter.FilteringAcknowledgingMessageListenerAdapter;
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
import org.springframework.kafka.listener.adapter.RetryingAcknowledgingMessageListenerAdapter;
import org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.test.context.ContextConfiguration;
@@ -112,7 +112,7 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
containerProps = TestUtils.getPropertyValue(container, "containerProperties", ContainerProperties.class);
Object messageListener = containerProps.getMessageListener();
assertThat(messageListener).isInstanceOf(FilteringAcknowledgingMessageListenerAdapter.class);
assertThat(messageListener).isInstanceOf(FilteringMessageListenerAdapter.class);
Object delegate = TestUtils.getPropertyValue(messageListener, "delegate");
@@ -123,7 +123,7 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
adapter.afterPropertiesSet();
messageListener = containerProps.getMessageListener();
assertThat(messageListener).isInstanceOf(RetryingAcknowledgingMessageListenerAdapter.class);
assertThat(messageListener).isInstanceOf(RetryingMessageListenerAdapter.class);
delegate = TestUtils.getPropertyValue(messageListener, "delegate");
@@ -133,21 +133,21 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
adapter.afterPropertiesSet();
messageListener = containerProps.getMessageListener();
assertThat(messageListener).isInstanceOf(FilteringAcknowledgingMessageListenerAdapter.class);
assertThat(messageListener).isInstanceOf(FilteringMessageListenerAdapter.class);
delegate = TestUtils.getPropertyValue(messageListener, "delegate");
assertThat(delegate).isInstanceOf(RetryingAcknowledgingMessageListenerAdapter.class);
assertThat(delegate).isInstanceOf(RetryingMessageListenerAdapter.class);
adapter.setFilterInRetry(true);
adapter.afterPropertiesSet();
messageListener = containerProps.getMessageListener();
assertThat(messageListener).isInstanceOf(RetryingAcknowledgingMessageListenerAdapter.class);
assertThat(messageListener).isInstanceOf(RetryingMessageListenerAdapter.class);
delegate = TestUtils.getPropertyValue(messageListener, "delegate");
assertThat(delegate).isInstanceOf(FilteringAcknowledgingMessageListenerAdapter.class);
assertThat(delegate).isInstanceOf(FilteringMessageListenerAdapter.class);
}
}

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

@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.producer.ProducerRecord;
@@ -89,8 +90,9 @@ public class MessageDrivenAdapterTests {
adapter.setRecordMessageConverter(new MessagingMessageConverter() {
@Override
public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowledgment, Type type) {
Message<?> message = super.toMessage(record, acknowledgment, type);
public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowledgment,
Consumer<?, ?> consumer, Type type) {
Message<?> message = super.toMessage(record, acknowledgment, consumer, type);
return MessageBuilder.fromMessage(message).setHeader("testHeader", "testValue").build();
}
@@ -136,7 +138,8 @@ public class MessageDrivenAdapterTests {
adapter.setMessageConverter(new RecordMessageConverter() {
@Override
public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowledgment, Type payloadType) {
public Message<?> toMessage(ConsumerRecord<?, ?> record, Acknowledgment acknowledgment,
Consumer<?, ?> consumer, Type type) {
throw new RuntimeException("testError");
}
@@ -173,8 +176,9 @@ public class MessageDrivenAdapterTests {
adapter.setBatchMessageConverter(new BatchMessagingMessageConverter() {
@Override
public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, Acknowledgment acknowledgment, Type type) {
Message<?> message = super.toMessage(records, acknowledgment, type);
public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, Acknowledgment acknowledgment,
Consumer<?, ?> consumer, Type type) {
Message<?> message = super.toMessage(records, acknowledgment, consumer, type);
return MessageBuilder.fromMessage(message).setHeader("testHeader", "testValue").build();
}
@@ -211,7 +215,7 @@ public class MessageDrivenAdapterTests {
@Override
public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, Acknowledgment acknowledgment,
Type payloadType) {
Consumer<?, ?> consumer, Type payloadType) {
throw new RuntimeException("testError");
}