diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java
index 24cf63d2..033eac77 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/EnableKafka.java
@@ -240,6 +240,7 @@ import org.springframework.context.annotation.Import;
*
* @author Stephane Nicoll
* @author Gary Russell
+ *
* @see KafkaListener
* @see KafkaListenerAnnotationBeanPostProcessor
* @see org.springframework.kafka.listener.KafkaListenerEndpointRegistrar
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaBootstrapConfiguration.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaBootstrapConfiguration.java
index 3c94f72d..89620314 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaBootstrapConfiguration.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaBootstrapConfiguration.java
@@ -33,6 +33,7 @@ import org.springframework.kafka.listener.KafkaListenerEndpointRegistry;
*
* @author Stephane Nicoll
* @author Gary Russell
+ *
* @see KafkaListenerAnnotationBeanPostProcessor
* @see KafkaListenerEndpointRegistry
* @see EnableKafka
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaHandler.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaHandler.java
index d6cf3499..a7a1a82b 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaHandler.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaHandler.java
@@ -37,6 +37,7 @@ import org.springframework.messaging.handler.annotation.MessageMapping;
* must be able to select exactly one method based on the payload type.
*
* @author Gary Russell
+ *
* @see EnableKafka
* @see KafkaListener
* @see KafkaListenerAnnotationBeanPostProcessor
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListener.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListener.java
index 979a3978..eb172974 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListener.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListener.java
@@ -71,7 +71,9 @@ import org.springframework.messaging.handler.annotation.MessageMapping;
* methods must not cause any ambiguity such that a single method can be resolved for a
* particular inbound message. The {@link MessagingMessageListenerAdapter} is configured with
* a {@link org.springframework.kafka.listener.MultiMethodKafkaListenerEndpoint}.
+ *
* @author Gary Russell
+ *
* @see EnableKafka
* @see KafkaListenerAnnotationBeanPostProcessor
* @see KafkaListeners
@@ -130,7 +132,6 @@ public @interface KafkaListener {
* This allows, for example, iteration over the collection to start/stop a subset
* of containers.
* @return the bean name for the group.
- * @since 1.5
*/
String group() default "";
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
index 8f37b728..102d0049 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java
@@ -76,7 +76,7 @@ import org.springframework.util.StringUtils;
* @author Stephane Nicoll
* @author Juergen Hoeller
* @author Gary Russell
- * @since 1.4
+ *
* @see KafkaListener
* @see EnableKafka
* @see KafkaListenerConfigurer
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerConfigurer.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerConfigurer.java
index 57aa9ba1..4a383807 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerConfigurer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerConfigurer.java
@@ -31,7 +31,7 @@ import org.springframework.kafka.listener.KafkaListenerEndpointRegistrar;
*
See @{@link EnableKafka} for detailed usage examples.
*
* @author Stephane Nicoll
- * @since 1.4
+ *
* @see EnableKafka
* @see org.springframework.kafka.listener.KafkaListenerEndpointRegistrar
*/
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListeners.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListeners.java
index bd8e92a2..9d835db3 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListeners.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListeners.java
@@ -30,6 +30,7 @@ import java.lang.annotation.Target;
* (or class), implicitly generating this container annotation.
*
* @author Gary Russell
+ *
* @see KafkaListener
*/
@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/annotation/TopicPartition.java b/spring-kafka/src/main/java/org/springframework/kafka/annotation/TopicPartition.java
index 25df6f79..49eff4a7 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/annotation/TopicPartition.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/annotation/TopicPartition.java
@@ -15,10 +15,19 @@
*/
package org.springframework.kafka.annotation;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
/**
+ * Used to add topic/partition information to a {@code KafkaListener}.
+ *
* @author Gary Russell
*
*/
+@Target({})
+@Retention(RUNTIME)
public @interface TopicPartition {
String topic() default "";
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java
index 08a40939..9ae4d0d7 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerContainerFactory.java
@@ -18,10 +18,6 @@ package org.springframework.kafka.config;
import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.kafka.core.ConsumerFactory;
import org.springframework.kafka.listener.AbstractMessageListenerContainer;
@@ -34,13 +30,12 @@ import org.springframework.kafka.listener.KafkaListenerEndpoint;
* Base {@link KafkaListenerContainerFactory} for Spring's base container implementation.
*
* @author Stephane Nicoll
+ *
* @see AbstractMessageListenerContainer
*/
public abstract class AbstractKafkaListenerContainerFactory, K, V>
implements KafkaListenerContainerFactory {
- protected final Log logger = LogFactory.getLog(getClass());
-
private ConsumerFactory consumerFactory;
private ErrorHandler errorHandler;
@@ -49,8 +44,6 @@ public abstract class AbstractKafkaListenerContainerFactorySubclasses can inherit from this method to apply extra
* configuration if necessary.
- * @param instance the containe instance to configure.
+ * @param instance the container instance to configure.
*/
protected void initializeContainer(C instance) {
}
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerConfigUtils.java b/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerConfigUtils.java
index f40408b3..188a95f0 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerConfigUtils.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/config/KafkaListenerConfigUtils.java
@@ -21,7 +21,6 @@ package org.springframework.kafka.config;
*
* @author Juergen Hoeller
* @author Gary Russell
- * @since 1.4
*/
public abstract class KafkaListenerConfigUtils {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java b/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java
index 5785e51b..41554efc 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/config/SimpleKafkaListenerContainerFactory.java
@@ -41,7 +41,7 @@ public class SimpleKafkaListenerContainerFactory
private Integer concurrency;
- private Long receentOffset;
+ private Long recentOffset;
private ContainerOffsetResetStrategy resetStrategy;
@@ -54,11 +54,11 @@ public class SimpleKafkaListenerContainerFactory
}
/**
- * @param receentOffset the recent offset.
+ * @param recentOffset the recent offset.
* @see ConcurrentMessageListenerContainer#setRecentOffset(long)
*/
- public void setReceentOffset(Long receentOffset) {
- this.receentOffset = receentOffset;
+ public void setRecentOffset(Long recentOffset) {
+ this.recentOffset = recentOffset;
}
/**
@@ -95,8 +95,8 @@ public class SimpleKafkaListenerContainerFactory
if (this.concurrency != null) {
instance.setConcurrency(this.concurrency);
}
- if (this.receentOffset != null) {
- instance.setRecentOffset(this.receentOffset);
+ if (this.recentOffset != null) {
+ instance.setRecentOffset(this.recentOffset);
}
if (this.resetStrategy != null) {
instance.setResetStrategy(this.resetStrategy);
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractKafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractKafkaListenerEndpoint.java
index 9f756960..73fd9ed5 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractKafkaListenerEndpoint.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractKafkaListenerEndpoint.java
@@ -38,6 +38,7 @@ import org.springframework.util.Assert;
*
* @author Stephane Nicoll
* @author Gary Russell
+ *
* @see MethodKafkaListenerEndpoint
* @see org.springframework.kafka.config.SimpleKafkaListenerEndpoint
*/
@@ -162,7 +163,6 @@ public abstract class AbstractKafkaListenerEndpoint
/**
* Set the group for the corresponding listener container.
* @param group the group.
- * @since 1.5
*/
public void setGroup(String group) {
this.group = group;
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/AcknowledgingMessageListener.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/AcknowledgingMessageListener.java
index 303ce64b..f9f6dff7 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/AcknowledgingMessageListener.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/AcknowledgingMessageListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -24,7 +24,6 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
*
* @author Marius Bogoevici
* @author Gary Russell
- * @since 1.0.1
*/
public interface AcknowledgingMessageListener {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/Acknowledgment.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/Acknowledgment.java
index 42469ff7..b6aa5705 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/Acknowledgment.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/Acknowledgment.java
@@ -24,7 +24,6 @@ package org.springframework.kafka.listener;
*
* @author Marius Bogoevici
* @author Gary Russell
- * @since 1.0.1
*/
public interface Acknowledgment {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
index f3f800fe..07ae91c0 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
@@ -40,8 +40,6 @@ import org.springframework.util.Assert;
*/
public class ConcurrentMessageListenerContainer extends AbstractMessageListenerContainer {
- private static final int DEFAULT_STOP_TIMEOUT = 1000;
-
private final ConsumerFactory consumerFactory;
private final String[] topics;
@@ -58,8 +56,6 @@ public class ConcurrentMessageListenerContainer extends AbstractMessageLis
int concurrency = 1;
- private int stopTimeout = DEFAULT_STOP_TIMEOUT;
-
/**
* Construct an instance with the supplied configuration properties and specific
* topics/partitions - when using this constructor, a
@@ -148,20 +144,6 @@ public class ConcurrentMessageListenerContainer extends AbstractMessageLis
this.concurrency = concurrency;
}
- /**
- * The timeout for waiting for each concurrent {@link MessageListener} to finish on
- * stopping.
- * @param stopTimeout timeout in milliseconds
- * @since 1.1
- */
- public void setStopTimeout(int stopTimeout) {
- this.stopTimeout = stopTimeout;
- }
-
- public int getStopTimeout() {
- return stopTimeout;
- }
-
/**
* @return the list of {@link KafkaMessageListenerContainer}s created by
* this container.
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpoint.java
index c12542fe..5dc7ebbe 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpoint.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpoint.java
@@ -28,7 +28,6 @@ import org.apache.kafka.common.TopicPartition;
*
* @author Stephane Nicoll
* @author Gary Russell
- * @since 1.4
*/
public interface KafkaListenerEndpoint {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistrar.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistrar.java
index f9a68c41..f850a753 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistrar.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistrar.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2016 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,7 +33,8 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll
* @author Juergen Hoeller
* @author Artem Bilan
- * @since 1.4
+ * @author Gary Russell
+ *
* @see org.springframework.kafka.annotation.KafkaListenerConfigurer
*/
public class KafkaListenerEndpointRegistrar implements BeanFactoryAware, InitializingBean {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistry.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistry.java
index 360314ca..b8019fc4 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistry.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaListenerEndpointRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -56,7 +56,7 @@ import org.springframework.util.StringUtils;
* @author Juergen Hoeller
* @author Artem Bilan
* @author Gary Russell
- * @since 1.4
+ *
* @see KafkaListenerEndpoint
* @see MessageListenerContainer
* @see KafkaListenerContainerFactory
@@ -97,7 +97,6 @@ public class KafkaListenerEndpointRegistry implements DisposableBean, SmartLifec
* Return the ids of the managed {@link MessageListenerContainer} instance(s).
* @return the ids.
* @see #getListenerContainer(String)
- * @since 1.5.2
*/
public Set getListenerContainerIds() {
return Collections.unmodifiableSet(this.listenerContainers.keySet());
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/MessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/MessageListenerContainer.java
index b80022f1..a9db3d0c 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/MessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/MessageListenerContainer.java
@@ -24,7 +24,6 @@ import org.springframework.context.SmartLifecycle;
*
* @author Stephane Nicoll
* @author Gary Russell
- * @since 1.4
*/
public interface MessageListenerContainer extends SmartLifecycle {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/MethodKafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/MethodKafkaListenerEndpoint.java
index 7f9d8483..f3fabc0a 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/MethodKafkaListenerEndpoint.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/MethodKafkaListenerEndpoint.java
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
*
* @author Stephane Nicoll
* @author Artem Bilan
- * @since 1.4
+ * @author Gary Russell
*/
public class MethodKafkaListenerEndpoint extends AbstractKafkaListenerEndpoint {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/MultiMethodKafkaListenerEndpoint.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/MultiMethodKafkaListenerEndpoint.java
index 52cb3ce6..27c11393 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/MultiMethodKafkaListenerEndpoint.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/MultiMethodKafkaListenerEndpoint.java
@@ -32,8 +32,6 @@ public class MultiMethodKafkaListenerEndpoint extends MethodKafkaListenerE
private final List methods;
- private DelegatingInvocableHandler delegatingHandler;
-
public MultiMethodKafkaListenerEndpoint(List methods, Object bean) {
this.methods = methods;
setBean(bean);
@@ -46,8 +44,9 @@ public class MultiMethodKafkaListenerEndpoint extends MethodKafkaListenerE
invocableHandlerMethods.add(getMessageHandlerMethodFactory()
.createInvocableHandlerMethod(getBean(), method));
}
- this.delegatingHandler = new DelegatingInvocableHandler(invocableHandlerMethods, getBean());
- return new HandlerAdapter(this.delegatingHandler);
+ DelegatingInvocableHandler delegatingHandler =
+ new DelegatingInvocableHandler(invocableHandlerMethods, getBean());
+ return new HandlerAdapter(delegatingHandler);
}
}
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
index 3636b13d..05de7d33 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/AbstractAdaptableMessageListener.java
@@ -29,6 +29,7 @@ import org.springframework.kafka.listener.MessageListener;
*
* @author Stephane Nicoll
* @author Gary Russell
+ *
* @see MessageListener
* @see AcknowledgingMessageListener
*/
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java
index 81564a7b..84b79b5b 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -24,7 +24,6 @@ import org.springframework.messaging.handler.invocation.InvocableHandlerMethod;
* underlying handler.
*
* @author Gary Russell
- * @since 1.5
*
*/
public class HandlerAdapter {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java
index e15fed85..586ce49f 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java
@@ -39,7 +39,6 @@ import org.springframework.messaging.converter.MessageConversionException;
* @author Stephane Nicoll
* @author Gary Russell
* @author Artem Bilan
- * @since 1.4
*/
public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageListener {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaHeaders.java b/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaHeaders.java
index 9971780e..fa364a82 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaHeaders.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaHeaders.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -19,7 +19,6 @@ package org.springframework.kafka.support;
/**
* @author Artem Bilan
* @author Marius Bogoevici
- * @since 1.0
*/
public abstract class KafkaHeaders {
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MessagingMessageConverter.java b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MessagingMessageConverter.java
index 96fa0988..11dcf157 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MessagingMessageConverter.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/support/converter/MessagingMessageConverter.java
@@ -49,7 +49,6 @@ public class MessagingMessageConverter implements MessageConverter {
* Generate {@code timestamp} for produced messages. If set to {@code false}, -1 is
* used instead. By default set to {@code false}.
* @param generateTimestamp true if a timestamp should be generated
- * @since 1.1
*/
public void setGenerateTimestamp(boolean generateTimestamp) {
this.generateTimestamp = generateTimestamp;
diff --git a/spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerTests.java
index d9c1cfc8..635dac8f 100644
--- a/spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerTests.java
+++ b/spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerTests.java
@@ -56,7 +56,6 @@ import org.springframework.kafka.rule.KafkaEmbedded;
/**
* @author Gary Russell
- * @since 2.0
*
*/
public class ConcurrentMessageListenerContainerTests {