diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index ac2da02562..3fd7e5e9b9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -446,7 +446,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab } - private static class MethodInvocationGateway extends AbstractMessagingGateway { + private static class MethodInvocationGateway extends MessagingGatewaySupport { private MethodInvocationGateway(GatewayMethodInboundMessageMapper messageMapper) { this.setRequestMapper(messageMapper); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java similarity index 98% rename from spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java rename to spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java index fb875b2f02..b69c549969 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java @@ -45,7 +45,7 @@ import org.springframework.util.Assert; * * @author Mark Fisher */ -public abstract class AbstractMessagingGateway extends AbstractEndpoint implements TrackableComponent { +public abstract class MessagingGatewaySupport extends AbstractEndpoint implements TrackableComponent { private static final long DEFAULT_TIMEOUT = 1000L; @@ -76,7 +76,7 @@ public abstract class AbstractMessagingGateway extends AbstractEndpoint implemen private final Object replyMessageCorrelatorMonitor = new Object(); - public AbstractMessagingGateway() { + public MessagingGatewaySupport() { MessagingTemplate template = new MessagingTemplate(); template.setMessageConverter(this.messageConverter); template.setSendTimeout(DEFAULT_TIMEOUT); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java index 95637d5bb0..8dc7af8632 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java @@ -23,7 +23,7 @@ import org.springframework.integration.Message; * * @author Mark Fisher */ -public abstract class RemotingInboundGatewaySupport extends AbstractMessagingGateway implements RequestReplyExchanger { +public abstract class RemotingInboundGatewaySupport extends MessagingGatewaySupport implements RequestReplyExchanger { private volatile boolean expectReply = true; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java index fba8e139f7..79c19dfe3b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java @@ -48,7 +48,7 @@ import org.springframework.integration.test.util.TestUtils; @SuppressWarnings("unchecked") public class MessagingGatewayTests { - private volatile AbstractMessagingGateway messagingGateway; + private volatile MessagingGatewaySupport messagingGateway; private volatile MessageChannel requestChannel = createMock(MessageChannel.class); @@ -62,7 +62,7 @@ public class MessagingGatewayTests { @Before public void initializeSample() { - this.messagingGateway = new AbstractMessagingGateway() {}; + this.messagingGateway = new MessagingGatewaySupport() {}; this.messagingGateway.setRequestChannel(requestChannel); this.messagingGateway.setReplyChannel(replyChannel); this.messagingGateway.setBeanFactory(TestUtils.createTestApplicationContext()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java index a67bfb6886..bacb204a6f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java @@ -40,7 +40,7 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - final AbstractMessagingGateway innerGateway = new AbstractMessagingGateway() {}; + final MessagingGatewaySupport innerGateway = new MessagingGatewaySupport() {}; innerGateway.setRequestChannel(innerChannel); innerGateway.afterPropertiesSet(); outerChannel.subscribe(new AbstractReplyProducingMessageHandler() { @@ -50,7 +50,7 @@ public class NestedGatewayTests { "pre-" + requestMessage.getPayload()).getPayload() + "-post"; } }); - AbstractMessagingGateway outerGateway = new AbstractMessagingGateway() {}; + MessagingGatewaySupport outerGateway = new MessagingGatewaySupport() {}; outerGateway.setRequestChannel(outerChannel); outerGateway.afterPropertiesSet(); Message reply = outerGateway.sendAndReceiveMessage("test"); @@ -67,7 +67,7 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - AbstractMessagingGateway gateway = new AbstractMessagingGateway() {}; + MessagingGatewaySupport gateway = new MessagingGatewaySupport() {}; gateway.setRequestChannel(requestChannel); gateway.afterPropertiesSet(); Message message = MessageBuilder.withPayload("test") @@ -87,7 +87,7 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - AbstractMessagingGateway gateway = new AbstractMessagingGateway() {}; + MessagingGatewaySupport gateway = new MessagingGatewaySupport() {}; gateway.setRequestChannel(requestChannel); gateway.afterPropertiesSet(); Message message = MessageBuilder.withPayload("test") diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java index e18b765bdf..298f8bfea7 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java @@ -41,7 +41,7 @@ import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; -import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; @@ -75,7 +75,7 @@ import org.springframework.web.servlet.DispatcherServlet; * @author Mark Fisher * @since 2.0 */ -abstract class HttpRequestHandlingEndpointSupport extends AbstractMessagingGateway { +abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewaySupport { private static final boolean jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", HttpRequestHandlingEndpointSupport.class.getClassLoader()); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java index 9620c93074..cb451e4e7e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.integration.Message; -import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnection; @@ -38,7 +38,7 @@ import org.springframework.integration.ip.tcp.connection.TcpSender; * @since 2.0 * */ -public class TcpInboundGateway extends AbstractMessagingGateway implements TcpListener, TcpSender { +public class TcpInboundGateway extends MessagingGatewaySupport implements TcpListener, TcpSender { protected AbstractServerConnectionFactory connectionFactory; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java index 2ab6a1ff60..8dd2cbe3d2 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java @@ -27,7 +27,7 @@ import javax.jms.Session; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.Message; -import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.jms.listener.SessionAwareMessageListener; import org.springframework.jms.support.converter.MessageConverter; @@ -46,7 +46,7 @@ import org.springframework.util.Assert; * @author Juergen Hoeller * @author Oleg Zhurakousky */ -public class ChannelPublishingJmsMessageListener extends AbstractMessagingGateway +public class ChannelPublishingJmsMessageListener extends MessagingGatewaySupport implements SessionAwareMessageListener, InitializingBean { private volatile boolean expectReply; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java index a5c6852a96..41793a3615 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java @@ -26,7 +26,7 @@ import org.springframework.context.SmartLifecycle; import org.springframework.expression.ExpressionException; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessagingException; -import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.oxm.Marshaller; import org.springframework.oxm.Unmarshaller; import org.springframework.scheduling.TaskScheduler; @@ -189,7 +189,7 @@ public class MarshallingWebServiceInboundGateway extends AbstractMarshallingPayl return 0; } - private static class GatewayDelegate extends AbstractMessagingGateway { + private static class GatewayDelegate extends MessagingGatewaySupport { public Object sendAndReceive(Object request) { return super.sendAndReceive(request); diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java index 8f17ba0d2e..f912c1695c 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.springframework.expression.ExpressionException; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; -import org.springframework.integration.gateway.AbstractMessagingGateway; +import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; @@ -45,7 +45,7 @@ import org.springframework.xml.transform.TransformerObjectSupport; * @author Mark Fisher * @since 1.0.2 */ -public class SimpleWebServiceInboundGateway extends AbstractMessagingGateway implements MessageEndpoint { +public class SimpleWebServiceInboundGateway extends MessagingGatewaySupport implements MessageEndpoint { private final TransformerSupportDelegate transformerSupportDelegate = new TransformerSupportDelegate();