spring-integration-event minor changes

spring-integration-event/src/main/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -30,7 +30,8 @@
  * Spring's {@link ApplicationEvent} used by this adapter to simply wrap the
  * {@link Message}.
  * <p>
- * If the {@link #publishPayload} flag is specified to {@code true}, the {@code payload}
+ * However, if the {@code payload} is an instance of {@link ApplicationEvent}, or
+ * if the {@link #publishPayload} flag is specified to {@code true}, the {@code payload}
  * will be published as is without wrapping to any {@link ApplicationEvent}.
  *
  * @author Mark Fisher
@@ -63,8 +64,8 @@ public void setApplicationEventPublisher(ApplicationEventPublisher applicationEv
 	@Override
 	protected void handleMessageInternal(Message<?> message) {
 		Assert.notNull(this.applicationEventPublisher, "applicationEventPublisher is required");
-		if (message.getPayload() instanceof ApplicationEvent) {
-			this.applicationEventPublisher.publishEvent((ApplicationEvent) message.getPayload());
+		if (message.getPayload() instanceof ApplicationEvent applicationEvent) {
+			this.applicationEventPublisher.publishEvent(applicationEvent);
 		}
 		else if (this.publishPayload) {
 			this.applicationEventPublisher.publishEvent(message.getPayload());

spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -29,6 +29,7 @@
 /**
  * @author Mark Fisher
  * @author Artem Bilan
+ * @author Ma Jiandong
  */
 public class ApplicationEventPublishingMessageHandlerTests {
 
@@ -40,7 +41,7 @@ public void messagingEvent() {
 		assertThat(publisher.getLastEvent()).isNull();
 		Message<?> message = new GenericMessage<>("testing");
 		handler.handleMessage(message);
-		ApplicationEvent event = publisher.getLastEvent();
+		Object event = publisher.getLastEvent();
 		assertThat(event.getClass()).isEqualTo(MessagingEvent.class);
 		assertThat(((MessagingEvent) event).getMessage()).isEqualTo(message);
 	}
@@ -53,27 +54,36 @@ public void payloadAsEvent() {
 		assertThat(publisher.getLastEvent()).isNull();
 		Message<?> message = new GenericMessage<>(new TestEvent("foo"));
 		handler.handleMessage(message);
-		ApplicationEvent event = publisher.getLastEvent();
+		Object event = publisher.getLastEvent();
 		assertThat(event.getClass()).isEqualTo(TestEvent.class);
-		assertThat((event).getSource()).isEqualTo("foo");
+		assertThat(((ApplicationEvent) event).getSource()).isEqualTo("foo");
 	}
 
-	private static class TestApplicationEventPublisher implements ApplicationEventPublisher {
+	@Test
+	public void payloadAsIs() {
+		TestApplicationEventPublisher publisher = new TestApplicationEventPublisher();
+		ApplicationEventPublishingMessageHandler handler = new ApplicationEventPublishingMessageHandler();
+		handler.setApplicationEventPublisher(publisher);
+		handler.setPublishPayload(true);
+		assertThat(publisher.getLastEvent()).isNull();
+		Message<?> message = new GenericMessage<>("testing");
+		handler.handleMessage(message);
+		Object event = publisher.getLastEvent();
+		assertThat(event.getClass()).isEqualTo(String.class);
+		assertThat(((String) event)).isEqualTo("testing");
+	}
 
-		private volatile ApplicationEvent lastEvent;
+	private static class TestApplicationEventPublisher implements ApplicationEventPublisher {
 
-		public ApplicationEvent getLastEvent() {
-			return this.lastEvent;
-		}
+		private volatile Object lastEvent;
 
-		@Override
-		public void publishEvent(ApplicationEvent event) {
-			this.lastEvent = event;
+		public Object getLastEvent() {
+			return lastEvent;
 		}
 
 		@Override
 		public void publishEvent(Object event) {
-
+			this.lastEvent = event;
 		}
 
 	}