INT-2628 Add ObjectNamingStrategy to IMBE

Allow customization of the generated ObjectName for the
Integration components.

JIRA: https://jira.springsource.org/browse/INT-2628

INT-2628 Polishing

- Address PR comments
- Rename `naming-strategy` to `object-naming-strategy` for consistency with `object-name-static-properties`

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests-context.xml

@@ -18,11 +18,14 @@
 	<jmx:mbean-export id="integratioMbeanExporter" 
 					  server="mbs" 
 					  default-domain="tests.MBeanExpoerterParser"
-					  object-name-static-properties="appProperties"/>
+					  object-name-static-properties="appProperties"
+					  object-naming-strategy="keyNamer"/>
 					  
 	<util:properties id="appProperties">
 		<prop key="foo">foo</prop>
 		<prop key="bar">bar</prop>
 	</util:properties>
 
+	<bean id="keyNamer" class="org.springframework.jmx.export.naming.KeyNamingStrategy" />
+
 </beans>

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java

@@ -18,6 +18,7 @@ package org.springframework.integration.jmx.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Properties;
@@ -57,6 +58,7 @@ public class MBeanExporterParserTests {
 		assertTrue(properties.containsKey("foo"));
 		assertTrue(properties.containsKey("bar"));
 		assertEquals(server, exporter.getServer());
+		assertSame(context.getBean("keyNamer"), TestUtils.getPropertyValue(exporter, "namingStrategy"));
 		exporter.destroy();
 	}
 

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests-context.xml

@@ -0,0 +1,35 @@
+<?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"
+	xmlns:jmx="http://www.springframework.org/schema/integration/jmx"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/context
+			http://www.springframework.org/schema/context/spring-context.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd
+			http://www.springframework.org/schema/integration/jmx
+			http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd">
+
+	<jmx:mbean-export id="integrationMbeanExporter" server="mbs" default-domain="test.MBeanRegistration"
+		object-naming-strategy="namer" />
+
+	<bean id="namer" class="org.springframework.integration.jmx.config.MBeanRegistrationCustomNamingTests$Namer" />
+
+	<context:mbean-server id="mbs" />
+	
+	<int:channel id="testChannel" />
+	
+	<int:service-activator id="service" input-channel="testChannel" method="get">
+		<bean class="org.springframework.integration.jmx.config.MBeanRegistrationCustomNamingTests$Source"/>
+	</int:service-activator>
+	
+	<int:logging-channel-adapter id="logger" channel="testChannel"/>
+	
+	<int:chain id="chain" input-channel="chainin">
+		<int:transformer id="t1" expression="'foo'"/>
+		<int:filter id="f1" expression="true"/>
+	</int:chain>
+
+</beans>

spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013 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.jmx.config;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jmx.export.naming.KeyNamingStrategy;
+import org.springframework.jmx.export.naming.ObjectNamingStrategy;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Dave Syer
+ * @author Gary Russell
+ * @since 3.0
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class MBeanRegistrationCustomNamingTests {
+
+	@Autowired
+	private MBeanServer server;
+
+	@Test
+	public void testHandlerMBeanRegistration() throws Exception {
+		Set<ObjectName> names = server.queryNames(new ObjectName("test.MBeanRegistration:type=Integration,componentType=MessageHandler,*"), null);
+		assertEquals(6, names.size());
+		assertTrue(names.contains(new ObjectName("test.MBeanRegistration:type=Integration,componentType=MessageHandler,name=chain,bean=endpoint")));
+		assertTrue(names.contains(new ObjectName("test.MBeanRegistration:type=Integration,componentType=MessageHandler,name=chain$child.t1,bean=handler")));
+		assertTrue(names.contains(new ObjectName("test.MBeanRegistration:type=Integration,componentType=MessageHandler,name=chain$child.f1,bean=handler")));
+	}
+
+	public static class Source {
+		public String get() {
+			return "foo";
+		}
+	}
+
+	public static class Namer implements ObjectNamingStrategy {
+
+		private final ObjectNamingStrategy realNamer = new KeyNamingStrategy();
+		@Override
+		public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
+			String actualBeanKey = beanKey.replace("type=", "type=Integration,componentType=");
+			return realNamer.getObjectName(managedBean, actualBeanKey);
+		}
+
+	}
+
+}