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

Start version 3.1 for compatibility with SK-2.2

Browse Source
This commit is contained in:
Artem Bilan
2018-04-13 21:01:46 -04:00
committed by Artem Bilan
parent fc3f33671b
commit 1be6a6a3fa
12 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@
</bean>
</constructor-arg>
<constructor-arg>
<bean class="org.springframework.kafka.listener.config.ContainerProperties">
<bean class="org.springframework.kafka.listener.ContainerProperties">
<constructor-arg name="topics" value="foo" />
</bean>
</constructor-arg>
@@ -67,7 +67,7 @@
</bean>
</constructor-arg>
<constructor-arg>
<bean class="org.springframework.kafka.listener.config.ContainerProperties">
<bean class="org.springframework.kafka.listener.ContainerProperties">
<constructor-arg name="topics" value="foo" />
</bean>
</constructor-arg>

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

@@ -1,5 +1,5 @@
/*
* Copyright 2015-2017 the original author or authors.
* Copyright 2015-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,11 +33,11 @@ import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAd
import org.springframework.integration.support.ErrorMessageStrategy;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.adapter.FilteringMessageListenerAdapter;
import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
import org.springframework.kafka.listener.adapter.RetryingMessageListenerAdapter;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.retry.RecoveryCallback;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.test.context.ContextConfiguration;
@@ -73,7 +73,7 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
private RecoveryCallback<?> recoveryCallback;
@Test
public void testKafkaMessageDrivenChannelAdapterParser() throws Exception {
public void testKafkaMessageDrivenChannelAdapterParser() {
assertThat(this.kafkaListener.isAutoStartup()).isFalse();
assertThat(this.kafkaListener.isRunning()).isFalse();
assertThat(this.kafkaListener.getPhase()).isEqualTo(100);
@@ -94,7 +94,7 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
}
@Test
public void testKafkaBatchMessageDrivenChannelAdapterParser() throws Exception {
public void testKafkaBatchMessageDrivenChannelAdapterParser() {
assertThat(this.kafkaBatchListener.isAutoStartup()).isFalse();
assertThat(this.kafkaBatchListener.isRunning()).isFalse();
assertThat(this.kafkaBatchListener.getPhase()).isEqualTo(100);
@@ -112,7 +112,7 @@ public class KafkaMessageDrivenChannelAdapterParserTests {
@SuppressWarnings("unchecked")
public void testKafkaMessageDrivenChannelAdapterOptions() {
DefaultKafkaConsumerFactory<Integer, String> cf =
new DefaultKafkaConsumerFactory<>(Collections.<String, Object>emptyMap());
new DefaultKafkaConsumerFactory<>(Collections.emptyMap());
ContainerProperties containerProps = new ContainerProperties("foo");
KafkaMessageListenerContainer<Integer, String> container =
new KafkaMessageListenerContainer<>(cf, containerProps);

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

@@ -57,11 +57,10 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.listener.AbstractMessageListenerContainer;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.GenericMessageListenerContainer;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.MessageListenerContainer;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
import org.springframework.kafka.support.KafkaHeaders;
@@ -246,7 +245,7 @@ public class KafkaDslTests {
.from(Kafka.messageDrivenChannelAdapter(consumerFactory(),
KafkaMessageDrivenChannelAdapter.ListenerMode.record, TEST_TOPIC1)
.configureListenerContainer(c ->
c.ackMode(AbstractMessageListenerContainer.AckMode.MANUAL)
c.ackMode(ContainerProperties.AckMode.MANUAL)
.id("topic1ListenerContainer"))
.recoveryCallback(new ErrorMessageSendingRecoverer(errorChannel(),
new RawRecordHeaderErrorMessageStrategy()))
@@ -266,7 +265,7 @@ public class KafkaDslTests {
.from(Kafka.messageDrivenChannelAdapter(consumerFactory(),
KafkaMessageDrivenChannelAdapter.ListenerMode.record, TEST_TOPIC2)
.configureListenerContainer(c ->
c.ackMode(AbstractMessageListenerContainer.AckMode.MANUAL))
c.ackMode(ContainerProperties.AckMode.MANUAL))
.recoveryCallback(new ErrorMessageSendingRecoverer(errorChannel(),
new RawRecordHeaderErrorMessageStrategy()))
.retryTemplate(new RetryTemplate())
@@ -336,7 +335,7 @@ public class KafkaDslTests {
public IntegrationFlow outboundGateFlow() {
return IntegrationFlows.from(Gate.class)
.handle(Kafka.outboundGateway(producerFactory(), replyContainer())
.configureKafkaTemplate(t -> t.replyTimeout(30_000)))
.configureKafkaTemplate(t -> t.replyTimeout(30_000)))
.get();
}

2
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java
View File

@@ -43,8 +43,8 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.kafka.support.KafkaHeaders;
import org.springframework.kafka.support.converter.MessagingMessageConverter;

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

@@ -48,21 +48,20 @@ import org.apache.kafka.common.header.internals.RecordHeaders;
import org.junit.ClassRule;
import org.junit.Test;
import org.springframework.integration.StaticMessageHeaderAccessor;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.handler.advice.ErrorMessageSendingRecoverer;
import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAdapter.ListenerMode;
import org.springframework.integration.kafka.support.RawRecordHeaderErrorMessageStrategy;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.support.StaticMessageHeaderAccessor;
import org.springframework.kafka.core.ConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.listener.AbstractMessageListenerContainer.AckMode;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.kafka.support.Acknowledgment;
import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
import org.springframework.kafka.support.KafkaHeaders;
@@ -466,7 +465,7 @@ public class MessageDrivenAdapterTests {
TopicPartitionInitialOffset[] topicPartition = new TopicPartitionInitialOffset[] {
new TopicPartitionInitialOffset("foo", 0) };
ContainerProperties containerProps = new ContainerProperties(topicPartition);
containerProps.setAckMode(AckMode.RECORD);
containerProps.setAckMode(ContainerProperties.AckMode.RECORD);
containerProps.setClientId("clientId");
containerProps.setIdleEventInterval(100L);
KafkaMessageListenerContainer<Integer, String> container =

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

@@ -55,9 +55,8 @@ import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.integration.support.AcknowledgmentCallback;
import org.springframework.integration.support.AcknowledgmentCallback.Status;
import org.springframework.integration.support.StaticMessageHeaderAccessor;
import org.springframework.integration.StaticMessageHeaderAccessor;
import org.springframework.integration.acks.AcknowledgmentCallback;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.kafka.core.ConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
@@ -118,19 +117,19 @@ public class MessageSourceTests {
assertThat(received).isNotNull();
assertThat(received.getHeaders().get(KafkaHeaders.RAW_DATA)).isInstanceOf(ConsumerRecord.class);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
assertThat(received).isNotNull();
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
assertThat(received).isNotNull();
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
assertThat(received).isNotNull();
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
assertThat(received).isNull();
source.destroy();
@@ -209,17 +208,17 @@ public class MessageSourceTests {
consumer.paused(); // need some other interaction with mock between polls for InOrder
Message<?> received6 = source.receive();
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received3)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received2)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received5)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received1)
.acknowledge(Status.ACCEPT); // should commit offset 3 (received 3)
.acknowledge(AcknowledgmentCallback.Status.ACCEPT); // should commit offset 3 (received 3)
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received6)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received4)
.acknowledge(Status.ACCEPT); // should commit offset 6 (received 6).
.acknowledge(AcknowledgmentCallback.Status.ACCEPT); // should commit offset 6 (received 6).
assertThat(source.receive()).isNull();
source.destroy();
InOrder inOrder = inOrder(consumer);
@@ -274,19 +273,19 @@ public class MessageSourceTests {
Message<?> received = source.receive();
assertThat(received.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(0L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.REQUEUE);
.acknowledge(AcknowledgmentCallback.Status.REQUEUE);
received = source.receive();
assertThat(received.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(0L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
assertThat(received.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(1L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.REQUEUE);
.acknowledge(AcknowledgmentCallback.Status.REQUEUE);
received = source.receive();
assertThat(received.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(1L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received = source.receive();
source.destroy();
assertThat(received).isNull();
@@ -345,22 +344,22 @@ public class MessageSourceTests {
new DirectFieldAccessor(ack1).setPropertyValue("logger", log1);
given(log1.isWarnEnabled()).willReturn(true);
willDoNothing().given(log1).warn(any());
ack1.acknowledge(Status.REQUEUE);
ack1.acknowledge(AcknowledgmentCallback.Status.REQUEUE);
assertThat(received2.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(1L);
AcknowledgmentCallback ack2 = StaticMessageHeaderAccessor.getAcknowledgmentCallback(received2);
Log log2 = spy(KafkaTestUtils.getPropertyValue(ack1, "logger", Log.class));
new DirectFieldAccessor(ack2).setPropertyValue("logger", log2);
given(log2.isWarnEnabled()).willReturn(true);
willDoNothing().given(log2).warn(any());
ack2.acknowledge(Status.ACCEPT);
ack2.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received1 = source.receive();
assertThat(received1.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(0L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received1)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received2 = source.receive();
assertThat(received2.getHeaders().get(KafkaHeaders.OFFSET)).isEqualTo(1L);
StaticMessageHeaderAccessor.getAcknowledgmentCallback(received2)
.acknowledge(Status.ACCEPT);
.acknowledge(AcknowledgmentCallback.Status.ACCEPT);
received1 = source.receive();
source.destroy();
assertThat(received1).isNull();

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

@@ -61,8 +61,8 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.listener.ContainerProperties;
import org.springframework.kafka.listener.KafkaMessageListenerContainer;
import org.springframework.kafka.listener.config.ContainerProperties;
import org.springframework.kafka.requestreply.ReplyingKafkaTemplate;
import org.springframework.kafka.support.DefaultKafkaHeaderMapper;
import org.springframework.kafka.support.KafkaHeaders;
@@ -315,7 +315,9 @@ public class KafkaProducerMessageHandlerTests {
}
});
KafkaMessageListenerContainer<Integer, String> container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties);
KafkaMessageListenerContainer<Integer, String> container =
new KafkaMessageListenerContainer<>(consumerFactory, containerProperties);
ProducerFactory<Integer, String> producerFactory = new DefaultKafkaProducerFactory<>(
KafkaTestUtils.producerProps(embeddedKafka));
ReplyingKafkaTemplate<Integer, String, String> template = new ReplyingKafkaTemplate<>(producerFactory, container);