From 0f756cc1ecac2e63bf87757a5f726762751ffb73 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 29 Oct 2015 18:47:21 -0400 Subject: [PATCH] INTEXT-139: Deprecate High Level Consumer Adapter JIRA: https://jira.spring.io/browse/INTEXT-139 Revert removal for test and deprecate them --- .../xml/KafkaConsumerContextParser.java | 2 + .../xml/KafkaInboundChannelAdapterParser.java | 9 +++-- .../config/xml/KafkaNamespaceHandler.java | 1 + .../KafkaHighLevelConsumerMessageSource.java | 9 +++-- .../support/ConsumerConfigFactoryBean.java | 6 ++- .../kafka/support/ConsumerConfiguration.java | 3 ++ .../support/ConsumerConnectionProvider.java | 1 + .../kafka/support/ConsumerMetadata.java | 6 ++- .../kafka/support/KafkaConsumerContext.java | 3 ++ .../kafka/support/MessageLeftOverTracker.java | 5 ++- .../support/TopicFilterConfiguration.java | 1 + .../config/spring-integration-kafka-1.3.xsd | 10 ++++- .../xml/KafkaConsumerContextParserTests.java | 22 ++++++----- .../xml/KafkaInboundAdapterParserTests.java | 2 + .../KafkaMultiConsumerContextParserTests.java | 39 ++++++++++++------- .../support/ConsumerConfigurationTests.java | 25 ++++++++---- .../KafkaConsumerContextIntegrationTests.java | 2 + .../support/KafkaConsumerContextTest.java | 2 + 18 files changed, 104 insertions(+), 44 deletions(-) diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParser.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParser.java index ffad4fb64e..8a6857992a 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParser.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParser.java @@ -48,6 +48,8 @@ import org.springframework.util.xml.DomUtils; * @author Gary Russell * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class KafkaConsumerContextParser extends AbstractSingleBeanDefinitionParser { @Override diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParser.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParser.java index 9b9735c65d..ce338b3131 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParser.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParser.java @@ -15,14 +15,14 @@ */ package org.springframework.integration.kafka.config.xml; +import org.w3c.dom.Element; + import org.springframework.beans.BeanMetadataElement; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractPollingInboundChannelAdapterParser; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; -import org.springframework.integration.kafka.inbound.KafkaHighLevelConsumerMessageSource; import org.springframework.util.StringUtils; -import org.w3c.dom.Element; /** * The Kafka Inbound Channel adapter parser @@ -31,11 +31,14 @@ import org.w3c.dom.Element; * @since 0.5 * */ +@Deprecated public class KafkaInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser { + @Override + @SuppressWarnings("deprecation") protected BeanMetadataElement parseSource(final Element element, final ParserContext parserContext) { final BeanDefinitionBuilder highLevelConsumerMessageSourceBuilder = - BeanDefinitionBuilder.genericBeanDefinition(KafkaHighLevelConsumerMessageSource.class); + BeanDefinitionBuilder.genericBeanDefinition(org.springframework.integration.kafka.inbound.KafkaHighLevelConsumerMessageSource.class); IntegrationNamespaceUtils.setReferenceIfAttributeDefined(highLevelConsumerMessageSourceBuilder, element, "kafka-decoder"); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaNamespaceHandler.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaNamespaceHandler.java index 09e10d3b61..d8e1d7a2c3 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaNamespaceHandler.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaNamespaceHandler.java @@ -28,6 +28,7 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa public class KafkaNamespaceHandler extends AbstractIntegrationNamespaceHandler { @Override + @SuppressWarnings("deprecation") public void init() { registerBeanDefinitionParser("zookeeper-connect", new ZookeeperConnectParser()); registerBeanDefinitionParser("inbound-channel-adapter", new KafkaInboundChannelAdapterParser()); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaHighLevelConsumerMessageSource.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaHighLevelConsumerMessageSource.java index 449a8ebeff..4cdb0af336 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaHighLevelConsumerMessageSource.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaHighLevelConsumerMessageSource.java @@ -15,19 +15,20 @@ */ package org.springframework.integration.kafka.inbound; +import java.util.List; +import java.util.Map; + import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.kafka.support.KafkaConsumerContext; import org.springframework.messaging.Message; -import java.util.List; -import java.util.Map; - /** * @author Soby Chacko * @since 0.5 - * + * @deprecated since 1.3 in favor of {@link KafkaMessageDrivenChannelAdapter} */ +@Deprecated public class KafkaHighLevelConsumerMessageSource extends IntegrationObjectSupport implements MessageSource>>> { private final KafkaConsumerContext kafkaConsumerContext; diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfigFactoryBean.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfigFactoryBean.java index cbb81aa610..8fda57e6ed 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfigFactoryBean.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfigFactoryBean.java @@ -17,19 +17,23 @@ package org.springframework.integration.kafka.support; import java.util.Properties; -import kafka.consumer.ConsumerConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.FactoryBean; +import kafka.consumer.ConsumerConfig; + /** * @author Soby Chacko * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class ConsumerConfigFactoryBean implements FactoryBean { private static final Log LOGGER = LogFactory.getLog(ConsumerConfigFactoryBean.class); + private final ConsumerMetadata consumerMetadata; private final ZookeeperConnect zookeeperConnect; private Properties consumerProperties = new Properties(); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java index d5af934b35..ba9333cc84 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java @@ -39,7 +39,10 @@ import kafka.message.MessageAndMetadata; * @author Artem Bilan * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class ConsumerConfiguration { + private static final Log LOGGER = LogFactory.getLog(ConsumerConfiguration.class); private final ConsumerMetadata consumerMetadata; diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConnectionProvider.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConnectionProvider.java index 6b542a45ec..539596bff4 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConnectionProvider.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConnectionProvider.java @@ -22,6 +22,7 @@ import kafka.javaapi.consumer.ConsumerConnector; * @author Soby Chacko * @since 0.5 */ +@Deprecated public class ConsumerConnectionProvider { private final ConsumerConfig consumerConfig; diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerMetadata.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerMetadata.java index 55bb6d5e63..3428f8aea2 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerMetadata.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerMetadata.java @@ -17,16 +17,18 @@ package org.springframework.integration.kafka.support; import java.util.Map; -import kafka.serializer.Decoder; -import kafka.serializer.DefaultDecoder; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.kafka.core.KafkaConsumerDefaults; +import kafka.serializer.Decoder; +import kafka.serializer.DefaultDecoder; + /** * @author Soby Chacko * @author Rajasekar Elango * @since 0.5 */ +@Deprecated public class ConsumerMetadata implements InitializingBean { //High level consumer defaults diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/KafkaConsumerContext.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/KafkaConsumerContext.java index 197e5e0005..e938c1c272 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/KafkaConsumerContext.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/KafkaConsumerContext.java @@ -31,7 +31,10 @@ import org.springframework.util.CollectionUtils; * @author Ilayaperumal Gopinathan * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class KafkaConsumerContext implements DisposableBean { + private Map> consumerConfigurations; private String consumerTimeout = KafkaConsumerDefaults.CONSUMER_TIMEOUT; diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/MessageLeftOverTracker.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/MessageLeftOverTracker.java index bdeb044806..8021a0638f 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/MessageLeftOverTracker.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/MessageLeftOverTracker.java @@ -15,15 +15,16 @@ */ package org.springframework.integration.kafka.support; -import kafka.message.MessageAndMetadata; - import java.util.ArrayList; import java.util.List; +import kafka.message.MessageAndMetadata; + /** * @author Soby Chacko * @since 0.5 */ +@Deprecated public class MessageLeftOverTracker { private final List> messageLeftOverFromPreviousPoll = new ArrayList>(); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/TopicFilterConfiguration.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/TopicFilterConfiguration.java index 576fa0b721..16052542e2 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/TopicFilterConfiguration.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/TopicFilterConfiguration.java @@ -25,6 +25,7 @@ import kafka.consumer.Whitelist; * @author Artem Bilan * @since 0.5 */ +@Deprecated public class TopicFilterConfiguration { private final int numberOfStreams; diff --git a/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-1.3.xsd b/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-1.3.xsd index a43b070734..dd0427d9f0 100644 --- a/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-1.3.xsd +++ b/spring-integration-kafka/src/main/resources/org/springframework/integration/kafka/config/spring-integration-kafka-1.3.xsd @@ -133,7 +133,9 @@ - Custom implementation of a Kafka Encoder for encoding message values. This option is deprecated, 'value-serializer' is the recommended option. + [DEPRECATED] + Custom implementation of a Kafka Encoder for encoding message values. + This option is deprecated, 'value-serializer' is the recommended option. @@ -157,7 +159,9 @@ + [DEPRECATED] Custom implementation of a Kafka Encoder for encoding message keys. + This option is deprecated, 'key-serializer' is the recommended option. @@ -267,6 +271,7 @@ @@ -423,8 +428,11 @@ + [DEPRECATED] The definition for the Spring Integration Kafka Inbound Channel Adapter. + This High Level Consumer Adapter is deprecated in favor of + message-driven-channel-adapter - based on the Simple Consumer API. diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParserTests.java index 84e1320320..dd0214a418 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaConsumerContextParserTests.java @@ -19,7 +19,6 @@ package org.springframework.integration.kafka.config.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import kafka.consumer.Blacklist; import org.hamcrest.Matchers; import org.junit.Assert; @@ -30,13 +29,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.integration.kafka.rule.KafkaRunning; -import org.springframework.integration.kafka.support.ConsumerConfiguration; -import org.springframework.integration.kafka.support.ConsumerMetadata; -import org.springframework.integration.kafka.support.KafkaConsumerContext; -import org.springframework.integration.kafka.support.TopicFilterConfiguration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import kafka.consumer.Blacklist; + /** * @author Soby Chacko * @author Artem Bilan @@ -45,6 +42,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration +@Deprecated +@SuppressWarnings("deprecation") public class KafkaConsumerContextParserTests { @ClassRule @@ -56,13 +55,16 @@ public class KafkaConsumerContextParserTests { @Test @SuppressWarnings("unchecked") public void testConsumerContextConfiguration() { - final KafkaConsumerContext consumerContext = appContext.getBean("consumerContext", - KafkaConsumerContext.class); + final org.springframework.integration.kafka.support.KafkaConsumerContext consumerContext = + appContext.getBean("consumerContext", + org.springframework.integration.kafka.support.KafkaConsumerContext.class); Assert.assertNotNull(consumerContext); - ConsumerConfiguration cc = consumerContext.getConsumerConfiguration("default1"); - ConsumerMetadata cm = cc.getConsumerMetadata(); + org.springframework.integration.kafka.support.ConsumerConfiguration cc + = consumerContext.getConsumerConfiguration("default1"); + org.springframework.integration.kafka.support.ConsumerMetadata cm = cc.getConsumerMetadata(); assertNotNull(cm); - TopicFilterConfiguration topicFilterConfiguration = cm.getTopicFilterConfiguration(); + org.springframework.integration.kafka.support.TopicFilterConfiguration topicFilterConfiguration = + cm.getTopicFilterConfiguration(); assertEquals("foo : 10", topicFilterConfiguration.toString()); assertThat(topicFilterConfiguration.getTopicFilter(), Matchers.instanceOf(Blacklist.class)); } diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundAdapterParserTests.java index 28fb204eb3..f15908d686 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundAdapterParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundAdapterParserTests.java @@ -34,6 +34,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration +@Deprecated +@SuppressWarnings("deprecation") public class KafkaInboundAdapterParserTests { @ClassRule diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMultiConsumerContextParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMultiConsumerContextParserTests.java index e0ee27f97c..1ad682ff6b 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMultiConsumerContextParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMultiConsumerContextParserTests.java @@ -19,13 +19,9 @@ import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.integration.kafka.rule.KafkaRunning; -import org.springframework.integration.kafka.support.ConsumerConfiguration; -import org.springframework.integration.kafka.support.ConsumerMetadata; -import org.springframework.integration.kafka.support.KafkaConsumerContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -35,6 +31,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration +@Deprecated +@SuppressWarnings("deprecation") public class KafkaMultiConsumerContextParserTests { @ClassRule @@ -46,30 +44,43 @@ public class KafkaMultiConsumerContextParserTests { @SuppressWarnings("unchecked") @Test public void testMultiConsumerContexts() { - final KafkaConsumerContext consumerContext1 = appContext.getBean("consumerContext1", KafkaConsumerContext.class); + final org.springframework.integration.kafka.support.KafkaConsumerContext consumerContext1 = + appContext.getBean("consumerContext1", + org.springframework.integration.kafka.support.KafkaConsumerContext.class); Assert.assertNotNull(consumerContext1); - final KafkaConsumerContext consumerContext2 = appContext.getBean("consumerContext2", KafkaConsumerContext.class); + final org.springframework.integration.kafka.support.KafkaConsumerContext consumerContext2 = + appContext.getBean("consumerContext2", + org.springframework.integration.kafka.support.KafkaConsumerContext.class); Assert.assertNotNull(consumerContext2); } @SuppressWarnings("unchecked") @Test public void testConsumerContextConfigurations() { - final KafkaConsumerContext consumerContext = appContext.getBean("consumerContext1", KafkaConsumerContext.class); + final org.springframework.integration.kafka.support.KafkaConsumerContext consumerContext = + appContext.getBean("consumerContext1", + org.springframework.integration.kafka.support.KafkaConsumerContext.class); Assert.assertNotNull(consumerContext); - final ConsumerConfiguration cc = consumerContext.getConsumerConfiguration("default1"); - final ConsumerMetadata cm = cc.getConsumerMetadata(); + final org.springframework.integration.kafka.support.ConsumerConfiguration cc = + consumerContext.getConsumerConfiguration("default1"); + final org.springframework.integration.kafka.support.ConsumerMetadata cm = cc.getConsumerMetadata(); Assert.assertTrue(cm.getTopicStreamMap().get("test1") == 3); Assert.assertTrue(cm.getTopicStreamMap().get("test2") == 4); Assert.assertNotNull(cm); - final ConsumerConfiguration cc2 = consumerContext.getConsumerConfiguration("default2"); - final ConsumerMetadata cm2 = cc2.getConsumerMetadata(); + final org.springframework.integration.kafka.support.ConsumerConfiguration cc2 = + consumerContext.getConsumerConfiguration("default2"); + final org.springframework.integration.kafka.support.ConsumerMetadata cm2 = + cc2.getConsumerMetadata(); Assert.assertTrue(cm2.getTopicStreamMap().get("test3") == 1); Assert.assertNotNull(cm2); - final KafkaConsumerContext consumerContext2 = appContext.getBean("consumerContext2", KafkaConsumerContext.class); + final org.springframework.integration.kafka.support.KafkaConsumerContext consumerContext2 = + appContext.getBean("consumerContext2", + org.springframework.integration.kafka.support.KafkaConsumerContext.class); Assert.assertNotNull(consumerContext2); - final ConsumerConfiguration otherCC = consumerContext2.getConsumerConfiguration("default1"); - final ConsumerMetadata otherCM = otherCC.getConsumerMetadata(); + final org.springframework.integration.kafka.support.ConsumerConfiguration otherCC = + consumerContext2.getConsumerConfiguration("default1"); + final org.springframework.integration.kafka.support.ConsumerMetadata otherCM = + otherCC.getConsumerMetadata(); Assert.assertTrue(otherCM.getTopicStreamMap().get("test4") == 3); } } diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/ConsumerConfigurationTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/ConsumerConfigurationTests.java index 1dab17586b..f7fdd6ea9b 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/ConsumerConfigurationTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/ConsumerConfigurationTests.java @@ -16,9 +16,23 @@ package org.springframework.integration.kafka.support; import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.atMost; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import kafka.consumer.ConsumerIterator; import kafka.consumer.KafkaStream; @@ -26,16 +40,13 @@ import kafka.javaapi.consumer.ConsumerConnector; import kafka.message.MessageAndMetadata; import kafka.serializer.Decoder; -import org.junit.Assert; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - /** * @author Soby Chacko * @author Rajasekar Elango * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class ConsumerConfigurationTests { @Test diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextIntegrationTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextIntegrationTests.java index 6c414f2fa0..ee358928b0 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextIntegrationTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextIntegrationTests.java @@ -49,6 +49,8 @@ import kafka.consumer.ConsumerConfig; * @author Gary Russell * @since 1.2.2 */ +@Deprecated +@SuppressWarnings("deprecation") public class KafkaConsumerContextIntegrationTests { private static final String TOPIC = "springIntegrationTestInbound"; diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextTest.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextTest.java index 709ab632a3..c483a1c207 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextTest.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/support/KafkaConsumerContextTest.java @@ -32,6 +32,8 @@ import org.springframework.messaging.Message; * @author Soby Chacko * @since 0.5 */ +@Deprecated +@SuppressWarnings("deprecation") public class KafkaConsumerContextTest { @Test