INT-1431, added SimpleMessageProducingHandlerMonitor to maintain semantics of some MessageHandlers also being MessageProducers

This commit is contained in:
Oleg Zhurakousky
2010-09-15 13:50:16 -04:00
parent d99739a6bf
commit b2533c0788
6 changed files with 144 additions and 4 deletions

View File

@@ -41,6 +41,7 @@ import org.springframework.context.SmartLifecycle;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.jmx.export.MBeanExporter;
@@ -78,6 +79,7 @@ import org.springframework.util.ReflectionUtils;
*
* @author Dave Syer
* @author Helena Edelson
* @author Oleg Zhurakousky
*/
@ManagedResource
public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostProcessor, BeanFactoryAware,
@@ -162,7 +164,12 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof MessageHandler) {
SimpleMessageHandlerMonitor monitor = new SimpleMessageHandlerMonitor((MessageHandler) bean);
SimpleMessageHandlerMonitor monitor = null;
if (bean instanceof MessageProducer){ // we need to maintain semantics of the handler also being a producer see INT-1431
monitor = new SimpleMessageProducingHandlerMonitor((MessageHandler) bean);
} else {
monitor = new SimpleMessageHandlerMonitor((MessageHandler) bean);
}
handlers.add(monitor);
return monitor;
}

View File

@@ -1,5 +1,17 @@
/**
*
/*
* Copyright 2002-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;

View File

@@ -0,0 +1,38 @@
/*
* Copyright 2002-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 org.springframework.integration.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageProducer;
import org.springframework.jmx.export.annotation.ManagedResource;
/**
* @author Oleg Zhurakousky
* @since 2.0
*
*/
@ManagedResource
public class SimpleMessageProducingHandlerMonitor extends SimpleMessageHandlerMonitor implements MessageProducer {
public SimpleMessageProducingHandlerMonitor(MessageHandler handler) {
super(handler);
}
public void setOutputChannel(MessageChannel outputChannel) {
((MessageProducer)this.getMessageHandler()).setOutputChannel(outputChannel);
}
}