From 064b86b29cb4b9e07ee74cc9d3e73d9cba88d6a3 Mon Sep 17 00:00:00 2001 From: Iwein Fuld Date: Thu, 21 Oct 2010 18:08:20 +0200 Subject: [PATCH] QUALITY: moved ControlBus to avoid cyclic dependency --- .../integration/{control => jmx}/ControlBus.java | 8 +++----- .../integration/jmx/config/ControlBusFactoryBean.java | 2 +- .../control/ControlBusOperationChannelTests.java | 1 + .../integration/control/ControlBusTests.java | 2 +- .../integration/control/ControlBusXmlTests-context.xml | 2 +- .../integration/jmx/config/ControlBusParserTests.java | 2 +- .../ChainWithMessageProducingHandlersTests-context.xml | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) rename spring-integration-jmx/src/main/java/org/springframework/integration/{control => jmx}/ControlBus.java (95%) diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/ControlBus.java similarity index 95% rename from spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java rename to spring-integration-jmx/src/main/java/org/springframework/integration/jmx/ControlBus.java index 53e88a4311..771a62d1a2 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/ControlBus.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.control; - -import javax.management.MBeanServer; +package org.springframework.integration.jmx; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -26,12 +24,12 @@ import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.Message; import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.jmx.JmxHeaders; -import org.springframework.integration.jmx.OperationInvokingMessageHandler; import org.springframework.integration.monitor.ObjectNameLocator; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; +import javax.management.MBeanServer; + /** * JMX-based Control Bus implementation. Routes control messages on an operation channel to the other control points * (channels and handlers) via JMX. To use the control bus send a message to the operation channel with a header diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/ControlBusFactoryBean.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/ControlBusFactoryBean.java index 9e7287f38f..77cb1ef046 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/ControlBusFactoryBean.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/ControlBusFactoryBean.java @@ -17,7 +17,7 @@ package org.springframework.integration.jmx.config; import org.springframework.beans.factory.FactoryBean; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.control.ControlBus; +import org.springframework.integration.jmx.ControlBus; import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.monitor.IntegrationMBeanExporter; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java index 4bafcf3187..83b2e9ec51 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java @@ -29,6 +29,7 @@ import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; +import org.springframework.integration.jmx.ControlBus; import org.springframework.integration.jmx.JmxHeaders; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java index ff28cdec6c..3ad903112a 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java @@ -32,7 +32,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; -import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.Message; @@ -42,6 +41,7 @@ import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.BridgeHandler; +import org.springframework.integration.jmx.ControlBus; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.monitor.LifecycleMessageHandlerMetrics; import org.springframework.integration.monitor.QueueChannelMetrics; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml index ce73230e21..03ac2709fd 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusXmlTests-context.xml @@ -21,7 +21,7 @@ - + diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java index 71c885450f..ac22cf5c22 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.control.ControlBus; +import org.springframework.integration.jmx.ControlBus; import org.springframework.jmx.export.MBeanExporter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml index 481ec54291..27234f27a4 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests-context.xml @@ -8,7 +8,7 @@ - +