AbstractHandlerEndpointParser's default endpoint type is now SimpleEndpoint instead of HandlerEndpoint. The latter will be removed shortly.

This commit is contained in:
Mark Fisher
2008-08-13 15:03:45 +00:00
parent 5c9ac92f6b
commit a3f6254856
6 changed files with 17 additions and 35 deletions

View File

@@ -27,8 +27,8 @@ import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.ConfigurationException;
import org.springframework.integration.endpoint.HandlerEndpoint;
import org.springframework.integration.endpoint.MessageEndpoint;
import org.springframework.integration.endpoint.SimpleEndpoint;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
@@ -127,7 +127,7 @@ public abstract class AbstractHandlerEndpointParser extends AbstractSingleBeanDe
* Subclasses may override this to return a specific MessageEndpoint class.
*/
protected Class<? extends MessageEndpoint> getEndpointClass() {
return HandlerEndpoint.class;
return SimpleEndpoint.class;
}
protected void postProcessEndpointBean(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) {

View File

@@ -16,8 +16,6 @@
package org.springframework.integration.config;
import org.springframework.integration.endpoint.MessageEndpoint;
import org.springframework.integration.endpoint.SimpleEndpoint;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.router.RouterMessageHandler;
@@ -28,11 +26,6 @@ import org.springframework.integration.router.RouterMessageHandler;
*/
public class RouterParser extends AbstractHandlerEndpointParser {
@Override
protected Class<? extends MessageEndpoint> getEndpointClass() {
return SimpleEndpoint.class;
}
@Override
protected Class<? extends MessageHandler> getHandlerAdapterClass() {
return RouterMessageHandler.class;

View File

@@ -16,8 +16,6 @@
package org.springframework.integration.config;
import org.springframework.integration.endpoint.MessageEndpoint;
import org.springframework.integration.endpoint.SimpleEndpoint;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.handler.DefaultMessageHandler;
@@ -28,11 +26,6 @@ import org.springframework.integration.handler.DefaultMessageHandler;
*/
public class ServiceActivatorParser extends AbstractHandlerEndpointParser {
@Override
protected Class<? extends MessageEndpoint> getEndpointClass() {
return SimpleEndpoint.class;
}
@Override
protected Class<? extends MessageHandler> getHandlerAdapterClass() {
return DefaultMessageHandler.class;

View File

@@ -16,8 +16,6 @@
package org.springframework.integration.config;
import org.springframework.integration.endpoint.MessageEndpoint;
import org.springframework.integration.endpoint.SimpleEndpoint;
import org.springframework.integration.handler.MessageHandler;
import org.springframework.integration.splitter.SplitterMessageHandler;
@@ -28,11 +26,6 @@ import org.springframework.integration.splitter.SplitterMessageHandler;
*/
public class SplitterParser extends AbstractHandlerEndpointParser {
@Override
protected Class<? extends MessageEndpoint> getEndpointClass() {
return SimpleEndpoint.class;
}
@Override
protected Class<? extends MessageHandler> getHandlerAdapterClass() {
return SplitterMessageHandler.class;

View File

@@ -22,8 +22,8 @@ import org.springframework.integration.bus.MessageBusAware;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.endpoint.EndpointRegistry;
import org.springframework.integration.endpoint.HandlerEndpoint;
import org.springframework.integration.endpoint.MessagingGateway;
import org.springframework.integration.endpoint.SimpleEndpoint;
import org.springframework.integration.handler.ReplyMessageCorrelator;
import org.springframework.integration.message.DefaultMessageCreator;
import org.springframework.integration.message.DefaultMessageMapper;
@@ -205,9 +205,9 @@ public class SimpleMessagingGateway extends MessagingGatewaySupport implements M
throw new ConfigurationException("No EndpointRegistry available. Cannot register ReplyMessageCorrelator.");
}
ReplyMessageCorrelator correlator = new ReplyMessageCorrelator(this.replyMapCapacity);
HandlerEndpoint endpoint = new HandlerEndpoint(correlator);
SimpleEndpoint<ReplyMessageCorrelator> endpoint = new SimpleEndpoint<ReplyMessageCorrelator>(correlator);
endpoint.setBeanName("internal.correlator." + this);
endpoint.setSource(this.replyChannel);
endpoint.setName("internal.correlator." + this);
this.endpointRegistry.registerEndpoint(endpoint);
this.replyMessageCorrelator = correlator;
}