Revert to a52facc

Signed-off-by: chickenchickenlove <[email protected]>

Author: chickenchickenlove

spring-kafka-docs/src/main/antora/modules/ROOT/pages/kafka/receiving-messages/class-level-kafkalistener.adoc

@@ -1,8 +1,7 @@
 [[class-level-kafkalistener]]
 = `@KafkaListener` on a Class
 
-When you use `@KafkaListener` at the class-level, if there is only one public method, you do not need to specify `@KafkaHandler`.
-However, if there are multiple public methods, you must specify `@KafkaHandler` at the method level.
+When you use `@KafkaListener` at the class-level, you must specify `@KafkaHandler` at the method level.
 When messages are delivered, the converted message payload type is used to determine which method to call.
 The following example shows how to do so:
 
@@ -59,3 +58,4 @@ void listen(Object in, @Header(KafkaHeaders.RECORD_METADATA) ConsumerRecordMetad
     ...
 }
 ----
+

spring-kafka-docs/src/main/antora/modules/ROOT/pages/whats-new.adoc

@@ -70,10 +70,3 @@ Several deprecated items have been removed:
 
 Spring for Apache Kafka 4.0 supports Kafka 4.0’s new consumer rebalance protocol - https://cwiki.apache.org/confluence/display/KAFKA/KIP-848%3A+The+Next+Generation+of+the+Consumer+Rebalance+Protocol[KIP-848].
 For details, see xref:kafka/receiving-messages/rebalance-listeners.adoc#new-rebalalcne-protocol[New Consumer Rebalace Protocol docs].
-
-[[x40-single-public-method-listener]]
-=== Single Public Method Listener Simplification
-
-Spring for Apache Kafka 4.0 simplifies the use of class-level `@KafkaListener` annotations.
-Previously, when `@KafkaListener` was declared at the class level, each public method intended to handle messages had to be annotated explicitly with `@KafkaHandler`.
-Now, if there is exactly one public method in the class, it will be automatically recognized as the listener method even without the `@KafkaHandler` annotation. For details, see xref:kafka/receiving-messages/class-level-kafkalistener.adoc#class-level-kafkalistener[Class Level Kafka Listener].

spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java

@@ -20,7 +20,6 @@
 import java.io.StringReader;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -412,20 +411,8 @@ public Object postProcessAfterInitialization(final Object bean, final String bea
 					Set<Method> methodsWithHandler = MethodIntrospector.selectMethods(targetClass,
 							(ReflectionUtils.MethodFilter) method ->
 									AnnotationUtils.findAnnotation(method, KafkaHandler.class) != null);
-					Set<Method> publicMethods = MethodIntrospector.selectMethods(targetClass,
-							(ReflectionUtils.MethodFilter) method ->
-									Modifier.isPublic(method.getModifiers()));
-
-					if (methodsWithHandler.isEmpty() && publicMethods.size() == 1 && !hasMethodLevelListeners) {
-						Method method = publicMethods.iterator().next();
-						for (KafkaListener classLevelListener : classLevelListeners) {
-							processKafkaListener(classLevelListener, method, bean, beanName);
-						}
-					}
-					else {
-						List<Method> multiMethods = new ArrayList<>(methodsWithHandler);
-						processMultiMethodListeners(classLevelListeners, multiMethods, targetClass, bean, beanName);
-					}
+					List<Method> multiMethods = new ArrayList<>(methodsWithHandler);
+					processMultiMethodListeners(classLevelListeners, multiMethods, targetClass, bean, beanName);
 				}
 			}
 		}

spring-kafka/src/test/java/org/springframework/kafka/annotation/AliasPropertiesTests.java

@@ -36,7 +36,6 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.kafka.annotation.AliasPropertiesTests.Config.ClassAndMethodLevelListener;
-import org.springframework.kafka.annotation.AliasPropertiesTests.Config.ClassLevelListenerWithPublicMethodWithoutHandlerAnnotation;
 import org.springframework.kafka.annotation.KafkaListenerAnnotationBeanPostProcessor.AnnotationEnhancer;
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
 import org.springframework.kafka.config.KafkaListenerConfigUtils;
@@ -59,7 +58,6 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Soby Chacko
- * @author Sanghyeok An
  *
  * @since 2.2
  *
@@ -83,16 +81,12 @@ public class AliasPropertiesTests {
 	@Autowired
 	private ClassAndMethodLevelListener repeatable;
 
-	@Autowired
-	private ClassLevelListenerWithPublicMethodWithoutHandlerAnnotation withPublicMethod;
-
 	@Test
 	public void testAliasFor() throws Exception {
 		this.template.send("alias.tests", "foo");
 		assertThat(this.config.latch.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(this.classLevel.latch.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(this.repeatable.latch.await(10, TimeUnit.SECONDS)).isTrue();
-		assertThat(this.withPublicMethod.latch.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(this.config.kafkaListenerEndpointRegistry()).isSameAs(this.kafkaListenerEndpointRegistry);
 		assertThat(this.kafkaListenerEndpointRegistry.getListenerContainer("onMethodInConfigClass").getGroupId())
 				.isEqualTo("onMethodInConfigClass.Config.listen1");
@@ -108,8 +102,6 @@ public void testAliasFor() throws Exception {
 				.isEqualTo("onMethodRepeatable2.RepeatableClassAndMethodLevelListener.listen1");
 		assertThat(this.kafkaListenerEndpointRegistry.getListenerContainer("onClassRepeatable2").getGroupId())
 				.isEqualTo("onClassRepeatable2.RepeatableClassAndMethodLevelListener");
-		assertThat(this.kafkaListenerEndpointRegistry.getListenerContainer("onSinglePublicMethod").getGroupId())
-				.isEqualTo("onSinglePublicMethod.ClassLevelListenerWithPublicMethodWithoutHandlerAnnotation");
 		assertThat(Config.orderedCalledFirst.get()).isTrue();
 	}
 
@@ -228,18 +220,6 @@ public void listen1(String in) {
 
 		}
 
-		@Component
-		@MyListener(id = "onSinglePublicMethod", value = "alias.tests")
-		public static class ClassLevelListenerWithPublicMethodWithoutHandlerAnnotation {
-
-			private final CountDownLatch latch = new CountDownLatch(1);
-
-			public void listen(String in) {
-				this.latch.countDown();
-			}
-
-		}
-
 		public static class OrderedEnhancer implements AnnotationEnhancer, Ordered {
 
 			private final AtomicBoolean orderedCalledFirst;