Revert "GH-3880: The DefaultHandler resolves an incorrect value for the parameter annotated with @Header."

This reverts commit 6bffcec.

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

Author: chickenchickenlove

spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/HandlerAdapter.java

@@ -81,7 +81,10 @@ public Object invoke(Message<?> message, @Nullable Object... providedArgs) throw
 		}
 		else if (Objects.requireNonNull(this.delegatingHandler).hasDefaultHandler()) {
 			// Needed to avoid returning raw Message which matches Object
-			return this.delegatingHandler.invoke(message, providedArgs);
+			Object[] args = new Object[providedArgs.length + 1];
+			args[0] = message.getPayload();
+			System.arraycopy(providedArgs, 0, args, 1, providedArgs.length);
+			return this.delegatingHandler.invoke(message, args);
 		}
 		else {
 			return this.delegatingHandler.invoke(message, providedArgs);

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

@@ -184,9 +184,7 @@
  * @author Wang Zhiyang
  * @author Borahm Lee
  * @author Sean Sullivan
- * @author Sanghyeok An
  */
-
 @SpringJUnitConfig
 @DirtiesContext
 @EmbeddedKafka(topics = {"annotated1", "annotated2", "annotated3", "annotated3x",
@@ -201,7 +199,7 @@
 		"annotated29", "annotated30", "annotated30reply", "annotated31", "annotated32", "annotated33",
 		"annotated34", "annotated35", "annotated36", "annotated37", "foo", "manualStart", "seekOnIdle",
 		"annotated38", "annotated38reply", "annotated39", "annotated40", "annotated41", "annotated42",
-		"annotated43", "annotated43reply", "seekToComputeFn", "headerMapTopic", "default33"})
+		"annotated43", "annotated43reply", "seekToComputeFn", "headerMapTopic"})
 @TestPropertySource(properties = "spel.props=fetch.min.bytes=420000,max.poll.records=10")
 public class EnableKafkaIntegrationTests {
 
@@ -295,9 +293,6 @@ public class EnableKafkaIntegrationTests {
 	@Autowired
 	private RecordFilterStrategy<Integer, String> lambdaAll;
 
-	@Autowired
-	private DefaultHandlerListenerBean defaultHandlerListenerBean;
-
 	@Test
 	public void testAnonymous() {
 		assertThat(this.embeddedKafka).isInstanceOf(EmbeddedKafkaKraftBroker.class);
@@ -592,22 +587,7 @@ public void testMultiJson() throws Exception {
 		assertThat(this.multiJsonListener.bar).isInstanceOf(Qux.class);
 		assertThat(this.multiJsonListener.validated).isNotNull();
 		assertThat(this.multiJsonListener.validated.isValidated()).isTrue();
-		assertThat(this.multiJsonListener.validated.valCount).isEqualTo(2);
-	}
-
-	@Test
-	void testDefaultHandler() throws InterruptedException {
-		// GIVEN
-		String topic = "default33";
-		String message = "hello-message";
-
-		// WHEN
-		this.template.send(topic, 1, message);
-
-		// THEN
-		assertThat(this.defaultHandlerListenerBean.latch1.await(10, TimeUnit.SECONDS)).isTrue();
-		assertThat(this.defaultHandlerListenerBean.header).isEqualTo(topic);
-		assertThat(this.defaultHandlerListenerBean.message).isEqualTo(message);
+		assertThat(this.multiJsonListener.validated.valCount).isEqualTo(1);
 	}
 
 	@Test
@@ -1620,11 +1600,6 @@ public HeaderMapListenerBean headerMapListener() {
 			return new HeaderMapListenerBean();
 		}
 
-		@Bean
-		public DefaultHandlerListenerBean defaultHandlerListenerBean() {
-			return new DefaultHandlerListenerBean();
-		}
-
 		@Bean
 		public MultiListenerNoDefault multiNoDefault() {
 			return new MultiListenerNoDefault();
@@ -2822,24 +2797,6 @@ public void defaultHandler(Bar bar) {
 
 	}
 
-	@KafkaListener(id = "defaultHandlerListener", topics = "default33")
-	static class DefaultHandlerListenerBean {
-
-		final CountDownLatch latch1 = new CountDownLatch(1);
-
-		String header;
-
-		String message;
-
-		@KafkaHandler(isDefault = true)
-		public void defaultHandler(@Header("kafka_receivedTopic") String receivedTopic, String message) {
-			this.latch1.countDown();
-			this.header = receivedTopic;
-			this.message = message;
-		}
-
-	}
-
 	@KafkaListener(id = "headerMap", topics = "headerMapTopic")
 	static class HeaderMapListenerBean {