diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventOutboundChannelAdapter.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventOutboundChannelAdapter.java index caefad06a0..449552973c 100644 --- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventOutboundChannelAdapter.java +++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventOutboundChannelAdapter.java @@ -40,7 +40,7 @@ public class ApplicationEventOutboundChannelAdapter extends AbstractMessageCo } @Override - protected void processMessage(Message message) { + protected void onMessageInternal(Message message) { Assert.notNull(this.applicationEventPublisher, "applicationEventPublisher is required"); this.applicationEventPublisher.publishEvent(new MessagingEvent((Message) message)); } diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamOutboundChannelAdapter.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamOutboundChannelAdapter.java index ac3fc01989..1def1bca98 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamOutboundChannelAdapter.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamOutboundChannelAdapter.java @@ -54,7 +54,7 @@ public class ByteStreamOutboundChannelAdapter extends AbstractMessageConsumingEn @Override - public void processMessage(Message message) { + public void onMessageInternal(Message message) { Object payload = message.getPayload(); if (payload == null) { if (logger.isWarnEnabled()) { diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamOutboundChannelAdapter.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamOutboundChannelAdapter.java index cc0cfb7450..9ab3620832 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamOutboundChannelAdapter.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamOutboundChannelAdapter.java @@ -118,7 +118,7 @@ public class CharacterStreamOutboundChannelAdapter extends AbstractMessageConsum } @Override - public void processMessage(Message message) { + public void onMessageInternal(Message message) { Object payload = message.getPayload(); if (payload == null) { if (logger.isWarnEnabled()) { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java index 236fd0aa01..f75dd0e490 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractInOutEndpoint.java @@ -73,7 +73,7 @@ public abstract class AbstractInOutEndpoint extends AbstractMessageConsumingEndp } @Override - protected void processMessage(Message message) { + protected void onMessageInternal(Message message) { for (EndpointInterceptor interceptor : this.interceptors) { message = interceptor.preHandle(message); if (message == null) { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java index 523d187a4d..3f10618b03 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumingEndpoint.java @@ -139,7 +139,7 @@ public abstract class AbstractMessageConsumingEndpoint extends AbstractEndpoint this.logger.debug("endpoint '" + this + "' processing message: " + message); } try { - this.processMessage(message); + this.onMessageInternal(message); } catch (Exception e) { if (e instanceof MessagingException) { @@ -152,6 +152,6 @@ public abstract class AbstractMessageConsumingEndpoint extends AbstractEndpoint } } - protected abstract void processMessage(Message message); + protected abstract void onMessageInternal(Message message); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java index 3f3f437148..40b9c4d5e6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java @@ -40,7 +40,7 @@ public class OutboundChannelAdapter extends AbstractMessageConsumingEndpoint { @Override - protected void processMessage(Message message) { + protected void onMessageInternal(Message message) { if (!this.target.send(message)) { throw new MessageDeliveryException(message, "failed to deliver Message to target"); } diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java index a60daeb981..08c870e7af 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterEndpoint.java @@ -75,7 +75,7 @@ public class RouterEndpoint extends AbstractMessageConsumingEndpoint { } @Override - protected void processMessage(Message message) { + protected void onMessageInternal(Message message) { boolean sent = false; Collection results = this.channelResolver.resolveChannels(message); if (results != null) {