INT-1806: added ManagedEndpoint for endpoints that are not message sources or message handlers

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java

@@ -18,7 +18,9 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Set;
 
+import javax.management.MBeanOperationInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
@@ -83,6 +85,50 @@ public class MBeanExporterIntegrationTests {
 		assertNotNull(messageChannelsMonitor);
 	}
 
+	@Test
+	public void testLifecycleInEndpointWithMessageSource() throws Exception {		
+		context = new GenericXmlApplicationContext(getClass(), "lifecycle-source.xml");
+		messageChannelsMonitor = context.getBean(IntegrationMBeanExporter.class);
+		assertNotNull(messageChannelsMonitor);
+		MBeanServer server = context.getBean(MBeanServer.class);
+		Set<ObjectName> names = server.queryNames(ObjectName.getInstance("org.springframework.integration:type=ManagedEndpoint,*"), null);
+		assertEquals(0, names.size());
+		names = server.queryNames(ObjectName.getInstance("org.springframework.integration:name=explicit,*"), null);
+		assertEquals(1, names.size());
+		MBeanOperationInfo[] operations = server.getMBeanInfo(names.iterator().next()).getOperations();
+		String startName = null;
+		for (MBeanOperationInfo info : operations) {
+			String name = info.getName();
+			if (name.startsWith("start")) {
+				startName = name;
+			}
+		}
+		// Lifecycle method name
+		assertEquals("start", startName);
+	}
+
+	@Test
+	public void testLifecycleInEndpointWithoutMessageSource() throws Exception {		
+		context = new GenericXmlApplicationContext(getClass(), "lifecycle-no-source.xml");
+		messageChannelsMonitor = context.getBean(IntegrationMBeanExporter.class);
+		assertNotNull(messageChannelsMonitor);
+		MBeanServer server = context.getBean(MBeanServer.class);
+		Set<ObjectName> names = server.queryNames(ObjectName.getInstance("org.springframework.integration:type=ManagedEndpoint,*"), null);
+		assertEquals(1, names.size());
+		names = server.queryNames(ObjectName.getInstance("org.springframework.integration:name=gateway,*"), null);
+		assertEquals(1, names.size());
+		MBeanOperationInfo[] operations = server.getMBeanInfo(names.iterator().next()).getOperations();
+		String startName = null;
+		for (MBeanOperationInfo info : operations) {
+			String name = info.getName();
+			if (name.startsWith("start")) {
+				startName = name;
+			}
+		}
+		// Lifecycle method name
+		assertEquals("start", startName);
+	}
+
 	public static class DateFactoryBean implements FactoryBean<Date> {
 
 		private Date date;
@@ -166,4 +212,23 @@ public class MBeanExporterIntegrationTests {
 
 	}
 
+	public static interface Service {
+		String execute() throws Exception;
+		int getCounter();
+	}
+	
+	public static class SimpleService implements Service {
+		private int counter;
+
+		public String execute() throws Exception {
+			Thread.sleep(10L); // make the duration non-zero
+			counter++;
+			return "count="+counter;
+		}
+
+		public int getCounter() {
+			return counter;
+		}
+	}
+
 }

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceMonitoringIntegrationTests.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009-2010 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. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.springframework.integration.monitor;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.core.PollableChannel;
+
+public class MessageSourceMonitoringIntegrationTests {
+
+	private PollableChannel channel;
+
+	private Service service;
+
+	private IntegrationMBeanExporter exporter;
+	
+	public void setMessageHandlersMonitor(IntegrationMBeanExporter exporter) {
+		this.exporter = exporter;
+	}
+	
+	public void setService(Service service) {
+		this.service = service;
+	}
+
+	@Test
+	public void testSendAndHandleWithEndpointName() throws Exception {
+		// The message source monitor is registered under the endpoint id (since it is explicit)
+		doTest("explicit-source.xml", "input", "explicit");
+	}
+
+	@Test
+	public void testSendAndHandleWithAnonymous() throws Exception {
+		// The message source monitor is registered under the channel name
+		doTest("anonymous-source.xml", "anonymous", "anonymous");
+	}
+
+	private void doTest(String config, String channelName, String monitor) throws Exception {
+
+		ClassPathXmlApplicationContext context = createContext(config, channelName);
+
+		try {
+
+			int before = service.getCounter();
+			channel.receive(1000L);
+			assertTrue(before < service.getCounter());
+
+			int count = exporter.getSourceMessageCount(monitor);
+			assertTrue("No statistics for input channel", count > 0);
+
+		} finally {
+			context.close();
+		}
+
+	}
+
+	private ClassPathXmlApplicationContext createContext(String config, String channelName) {
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config, getClass());
+		context.getAutowireCapableBeanFactory().autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false);
+		channel = context.getBean(channelName, PollableChannel.class);
+		return context;
+	}
+
+	public static interface Service {
+		String execute() throws Exception;
+		int getCounter();
+	}
+	
+	public static class SimpleService implements Service {
+		private int counter;
+
+		public String execute() throws Exception {
+			Thread.sleep(10L); // make the duration non-zero
+			counter++;
+			return "count="+counter;
+		}
+
+		public int getCounter() {
+			return counter;
+		}
+	}
+	
+}

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/anonymous-source.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:int="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<import resource="common-context.xml" />
+
+	<int:channel id="anonymous">
+		<int:queue />
+	</int:channel>
+
+	<int:inbound-channel-adapter ref="service" method="execute" channel="anonymous">
+		<int:poller fixed-rate="200" />
+	</int:inbound-channel-adapter>
+
+	<bean id="service" class="org.springframework.integration.monitor.MessageSourceMonitoringIntegrationTests$SimpleService" />
+
+</beans>

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/explicit-source.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:int="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<import resource="common-context.xml" />
+
+	<int:channel id="input">
+		<int:queue />
+	</int:channel>
+
+	<int:inbound-channel-adapter id="explicit" ref="service" method="execute" channel="input">
+		<int:poller fixed-rate="200" />
+	</int:inbound-channel-adapter>
+
+	<bean id="service" class="org.springframework.integration.monitor.MessageSourceMonitoringIntegrationTests$SimpleService" />
+
+</beans>

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/lifecycle-no-source.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:int="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<import resource="common-context.xml" />
+
+	<int:channel id="input"/>
+
+	<int:gateway id="gateway" service-interface="org.springframework.integration.monitor.MBeanExporterIntegrationTests$Service"
+		default-request-channel="input" />
+
+	<int:service-activator id="explicit" input-channel="input" ref="service" method="execute"/>
+
+	<bean id="service" class="org.springframework.integration.monitor.MBeanExporterIntegrationTests$SimpleService" />
+
+</beans>

spring-integration-jmx/src/test/java/org/springframework/integration/monitor/lifecycle-source.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:int="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<import resource="common-context.xml" />
+
+	<int:channel id="input">
+		<int:queue />
+	</int:channel>
+
+	<int:inbound-channel-adapter id="explicit" ref="service" method="execute" channel="input">
+		<int:poller fixed-rate="200" />
+	</int:inbound-channel-adapter>
+
+	<bean id="service" class="org.springframework.integration.monitor.MBeanExporterIntegrationTests$SimpleService" />
+
+</beans>