INT-1582 if the payload is an ApplicationEvent it is passed as-is (no wrapping in MessagingException). Also, general polishing

spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java

@@ -36,7 +36,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.expression.Expression;
 import org.springframework.integration.Message;
 import org.springframework.integration.core.PollableChannel;
-import org.springframework.integration.event.ApplicationEventInboundChannelAdapter;
+import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer;
 import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.test.context.ContextConfiguration;
@@ -59,7 +59,7 @@ public class EventInboundChannelAdapterParserTests {
 	public void validateEventParser() {
 		Object adapter = context.getBean("eventAdapterSimple");
 		Assert.assertNotNull(adapter);
-		Assert.assertTrue(adapter instanceof ApplicationEventInboundChannelAdapter);
+		Assert.assertTrue(adapter instanceof ApplicationEventListeningMessageProducer);
 		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
 		Assert.assertEquals(context.getBean("input"), adapterAccessor.getPropertyValue("outputChannel"));
 	}
@@ -69,7 +69,7 @@ public class EventInboundChannelAdapterParserTests {
 	public void validateEventParserWithEventTypes() {
 		Object adapter = context.getBean("eventAdapterFiltered");
 		Assert.assertNotNull(adapter);
-		Assert.assertTrue(adapter instanceof ApplicationEventInboundChannelAdapter);
+		Assert.assertTrue(adapter instanceof ApplicationEventListeningMessageProducer);
 		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
 		Assert.assertEquals(context.getBean("inputFiltered"), adapterAccessor.getPropertyValue("outputChannel"));
 		Set<Class<? extends ApplicationEvent>> eventTypes = (Set<Class<? extends ApplicationEvent>>) adapterAccessor.getPropertyValue("eventTypes");
@@ -84,7 +84,7 @@ public class EventInboundChannelAdapterParserTests {
 	public void validateEventParserWithEventTypesAndPlaceholder() {
 		Object adapter = context.getBean("eventAdapterFilteredPlaceHolder");
 		Assert.assertNotNull(adapter);
-		Assert.assertTrue(adapter instanceof ApplicationEventInboundChannelAdapter);
+		Assert.assertTrue(adapter instanceof ApplicationEventListeningMessageProducer);
 		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
 		Assert.assertEquals(context.getBean("inputFilteredPlaceHolder"), adapterAccessor.getPropertyValue("outputChannel"));
 		Set<Class<? extends ApplicationEvent>> eventTypes = (Set<Class<? extends ApplicationEvent>>) adapterAccessor.getPropertyValue("eventTypes");
@@ -113,7 +113,7 @@ public class EventInboundChannelAdapterParserTests {
 	public void validatePayloadExpression() {
 		Object adapter = context.getBean("eventAdapterSpel");
 		Assert.assertNotNull(adapter);
-		Assert.assertTrue(adapter instanceof ApplicationEventInboundChannelAdapter);
+		Assert.assertTrue(adapter instanceof ApplicationEventListeningMessageProducer);
 		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
 		Expression expression = (Expression) adapterAccessor.getPropertyValue("payloadExpression");
 		Assert.assertEquals("source + '-test'", expression.getExpressionString());

spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.integration.event.config;
 
+import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 
 import junit.framework.Assert;
@@ -34,7 +35,7 @@ import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
-import org.springframework.integration.event.ApplicationEventPublishingMessageHandler;
+import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -46,13 +47,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class EventOutboundChannelAdapterParserTests {
+
 	@Autowired
-	private ConfigurableApplicationContext context;
-	
-	private boolean recievedEvent;
-	
+	private volatile ConfigurableApplicationContext context;
+
+	private volatile boolean receivedEvent;
+
+
 	@Test
-	public void validateEventParser(){
+	public void validateEventParser() {
 		EventDrivenConsumer adapter = context.getBean("eventAdapter", EventDrivenConsumer.class);
 		Assert.assertNotNull(adapter);
 		DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter);
@@ -60,16 +63,16 @@ public class EventOutboundChannelAdapterParserTests {
 		Assert.assertTrue(handler instanceof ApplicationEventPublishingMessageHandler);
 		Assert.assertEquals(context.getBean("input"), adapterAccessor.getPropertyValue("inputChannel"));
 	}
+
 	@Test
-	public void validateUsage(){
-		
-		ApplicationListener listener = new ApplicationListener<ApplicationEvent>() {
+	public void validateUsage() {
+		ApplicationListener<?> listener = new ApplicationListener<ApplicationEvent>() {
 			public void onApplicationEvent(ApplicationEvent event) {
 				Object source = event.getSource();
 				if (source instanceof Message){
-					String payload = (String) ((Message)source).getPayload();
-					if (payload.equals("hello")){
-						recievedEvent = true;
+					String payload = (String) ((Message<?>) source).getPayload();
+					if (payload.equals("hello")) {
+						receivedEvent = true;
 					}
 				}
 			}
@@ -77,34 +80,38 @@ public class EventOutboundChannelAdapterParserTests {
 		context.addApplicationListener(listener);
 		DirectChannel channel = context.getBean("input", DirectChannel.class);
 		channel.send(new GenericMessage<String>("hello"));
-		Assert.assertTrue(recievedEvent);
+		Assert.assertTrue(receivedEvent);
 	}
-	
+
 	@Test(timeout=2000)
 	public void validateUsageWithPollableChannel() throws Exception {
-		ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("EventOutboundChannelAdapterParserTestsWithPollable-context.xml", EventOutboundChannelAdapterParserTests.class);
+		ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("EventOutboundChannelAdapterParserTestsWithPollable-context.xml", EventOutboundChannelAdapterParserTests.class);
 		final CyclicBarrier barier = new CyclicBarrier(2);
-		ApplicationListener listener = new ApplicationListener<ApplicationEvent>() {
+		ApplicationListener<?> listener = new ApplicationListener<ApplicationEvent>() {
 			public void onApplicationEvent(ApplicationEvent event) {
 				Object source = event.getSource();
 				if (source instanceof Message){
-					String payload = (String) ((Message)source).getPayload();
+					String payload = (String) ((Message<?>) source).getPayload();
 					if (payload.equals("hello")){
-						recievedEvent = true;
+						receivedEvent = true;
 						try {
 							barier.await();
-						} catch (Exception e) {
-							e.printStackTrace();
-						} 
+						}
+						catch (InterruptedException e) {
+							Thread.currentThread().interrupt();
+						}
+						catch (BrokenBarrierException e) {
+							throw new IllegalStateException("broken barrier", e);
+						}
 					}
 				}
 			}
 		};
-		ac.addApplicationListener(listener);
-		QueueChannel channel = ac.getBean("input", QueueChannel.class);
+		context.addApplicationListener(listener);
+		QueueChannel channel = context.getBean("input", QueueChannel.class);
 		channel.send(new GenericMessage<String>("hello"));
 		barier.await();
-		Assert.assertTrue(recievedEvent);
+		Assert.assertTrue(receivedEvent);
 	}
-	
+
 }

spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTestsWithPollable-context.xml

@@ -15,9 +15,7 @@
 	</int:channel>
 	
 	<int-event:outbound-channel-adapter id="eventAdapter" channel="input">
-		<int:poller max-messages-per-poll="1" task-executor="executor">
-			<int:interval-trigger interval="100" time-unit="MILLISECONDS"/>
-		</int:poller>
+		<int:poller max-messages-per-poll="1" task-executor="executor" fixed-delay="100"/>
 	</int-event:outbound-channel-adapter>
 
 	<task:executor id="executor" pool-size="5"/>

spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java

@@ -14,9 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.event;
+package org.springframework.integration.event.inbound;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
+
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -26,21 +31,19 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.PollableChannel;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer;
 
 /**
  * @author Mark Fisher
  */
-public class ApplicationEventInboundChannelAdapterTests {
+public class ApplicationEventListeningMessageProducerTests {
 
 	@Test
 	public void anyApplicationEventSentByDefault() {
 		QueueChannel channel = new QueueChannel();
-		ApplicationEventInboundChannelAdapter adapter = new ApplicationEventInboundChannelAdapter();
+		ApplicationEventListeningMessageProducer adapter = new ApplicationEventListeningMessageProducer();
 		adapter.setOutputChannel(channel);
+		adapter.start();
 		Message<?> message1 = channel.receive(0);
 		assertNull(message1);
 		adapter.onApplicationEvent(new TestApplicationEvent1());
@@ -57,9 +60,10 @@ public class ApplicationEventInboundChannelAdapterTests {
 	@SuppressWarnings("unchecked")
 	public void onlyConfiguredEventTypesAreSent() {
 		QueueChannel channel = new QueueChannel();
-		ApplicationEventInboundChannelAdapter adapter = new ApplicationEventInboundChannelAdapter();
+		ApplicationEventListeningMessageProducer adapter = new ApplicationEventListeningMessageProducer();
 		adapter.setOutputChannel(channel);
 		adapter.setEventTypes(new Class[]{TestApplicationEvent1.class});
+		adapter.start();
 		Message<?> message1 = channel.receive(0);
 		assertNull(message1);
 		adapter.onApplicationEvent(new TestApplicationEvent1());
@@ -96,9 +100,10 @@ public class ApplicationEventInboundChannelAdapterTests {
 	@Test
 	public void payloadExpressionEvaluatedAgainstApplicationEvent() {
 		QueueChannel channel = new QueueChannel();
-		ApplicationEventInboundChannelAdapter adapter = new ApplicationEventInboundChannelAdapter();
+		ApplicationEventListeningMessageProducer adapter = new ApplicationEventListeningMessageProducer();
 		adapter.setPayloadExpression("'received: ' + source");
 		adapter.setOutputChannel(channel);
+		adapter.start();
 		Message<?> message1 = channel.receive(0);
 		assertNull(message1);
 		adapter.onApplicationEvent(new TestApplicationEvent1());
@@ -118,8 +123,6 @@ public class ApplicationEventInboundChannelAdapterTests {
 		public TestApplicationEvent1() {
 			super("event1");
 		}
-
-		
 	}
 
 

spring-integration-event/src/test/java/org/springframework/integration/event/inbound/applicationEventInboundChannelAdapterTests.xml

@@ -9,7 +9,7 @@
 		<int:queue capacity="5"/>
 	</int:channel>
 
-	<bean id="adapter" class="org.springframework.integration.event.ApplicationEventInboundChannelAdapter">
+	<bean id="adapter" class="org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer">
 		<property name="outputChannel" ref="channel"/>
 	</bean>
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.event;
+package org.springframework.integration.event.outbound;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -24,6 +24,8 @@ import org.junit.Test;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.integration.Message;
+import org.springframework.integration.event.core.MessagingEvent;
+import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler;
 import org.springframework.integration.message.GenericMessage;
 
 /**
@@ -32,8 +34,7 @@ import org.springframework.integration.message.GenericMessage;
 public class ApplicationEventPublishingMessageHandlerTests {
 
 	@Test
-	@SuppressWarnings("unchecked")
-	public void testSendingEvent() throws InterruptedException {
+	public void messagingEvent() throws InterruptedException {
 		TestApplicationEventPublisher publisher = new TestApplicationEventPublisher();
 		ApplicationEventPublishingMessageHandler handler = new ApplicationEventPublishingMessageHandler();
 		handler.setApplicationEventPublisher(publisher);
@@ -45,6 +46,19 @@ public class ApplicationEventPublishingMessageHandlerTests {
 		assertEquals(message, ((MessagingEvent) event).getMessage());
 	}
 
+	@Test
+	public void payloadAsEvent() {
+		TestApplicationEventPublisher publisher = new TestApplicationEventPublisher();
+		ApplicationEventPublishingMessageHandler handler = new ApplicationEventPublishingMessageHandler();
+		handler.setApplicationEventPublisher(publisher);
+		assertNull(publisher.getLastEvent());
+		Message<?> message = new GenericMessage<TestEvent>(new TestEvent("foo"));
+		handler.handleMessage(message);
+		ApplicationEvent event = publisher.getLastEvent();
+		assertEquals(TestEvent.class, event.getClass());
+		assertEquals("foo", ((TestEvent) event).getSource());	
+	}
+
 
 	private static class TestApplicationEventPublisher implements ApplicationEventPublisher {
 
@@ -59,4 +73,13 @@ public class ApplicationEventPublishingMessageHandlerTests {
 		}
 	}
 
+
+	@SuppressWarnings("serial")
+	private static class TestEvent extends ApplicationEvent {
+
+		public TestEvent(String text) {
+			super(text);
+		}
+	}
+
 }