diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java similarity index 87% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrier.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java index 485d387536..69b80b1a75 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.router; + +package org.springframework.integration.aggregator; import java.util.ArrayList; import java.util.Collections; @@ -22,6 +23,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.integration.message.Message; /** @@ -51,7 +53,7 @@ public abstract class AbstractMessageBarrier implements MessageBarrier { return this.timestamp; } - protected boolean isComplete(){ + protected boolean isComplete() { return this.complete; } @@ -68,9 +70,9 @@ public abstract class AbstractMessageBarrier implements MessageBarrier { } return null; } - addMessage(message); - this.complete = hasReceivedAllMessages(); - return releaseAvailableMessages(); + this.addMessage(message); + this.complete = this.hasReceivedAllMessages(); + return this.releaseAvailableMessages(); } finally { this.lock.unlock(); @@ -86,14 +88,14 @@ public abstract class AbstractMessageBarrier implements MessageBarrier { } /** - * Subclasses will implement this method to indicate if all possible messages that could be received by - * a given barrier have already been received (e.g. all messages from a given sequence) + * Subclasses must implement this method to indicate if all possible messages that could be received by + * a given barrier have already been received (e.g. all messages from a given sequence). */ protected abstract boolean hasReceivedAllMessages(); /** - * Subclasses will implement this method to return the messages that can be released by this barrier, after + * Subclasses must implement this method to return the messages that can be released by this barrier after * the receipt of a given message. It might be possible that a number of messages are released before the barrier * has ended its work (partial release) and this depends completely on the implementation of the barrier. * However, once hasReceivedAllMessages() is deemed true, only one call to releaseAvailableMessages() shall diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrierHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrierHandler.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java index 62dd197df3..a2e24e89be 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageBarrierHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; import java.util.Map; @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.handler.MessageHandler; @@ -39,9 +40,9 @@ import org.springframework.util.CollectionUtils; /** * Base class for {@link MessageBarrier}-based MessageHandlers. * A {@link MessageHandler} implementation that waits for a group of - * {@link Message Messages} to arrive and process them together. - * Uses a {@link MessageBarrier} to store messages and to decide on how - * the messages can be released. + * {@link Message Messages} to arrive and processes them together. + * Uses a {@link MessageBarrier} to store messages and to decide how + * the messages should be released. *

* Each {@link Message} that is received by this handler will be associated with * a group based upon the 'correlationId' property of its @@ -53,7 +54,7 @@ import org.springframework.util.CollectionUtils; * The default value is 1 minute. If the timeout elapses prior to completion, * then Messages with that timed-out 'correlationId' will be sent to the * 'discardChannel' if provided. - * + * * @author Mark Fisher * @author Marius Bogoevici */ @@ -75,8 +76,8 @@ public abstract class AbstractMessageBarrierHandler implements MessageHandler, I protected volatile long sendTimeout = DEFAULT_SEND_TIMEOUT; - protected final ConcurrentMap barriers - = new ConcurrentHashMap(); + protected final ConcurrentMap barriers = + new ConcurrentHashMap(); private volatile long timeout = DEFAULT_TIMEOUT; @@ -251,6 +252,7 @@ public abstract class AbstractMessageBarrierHandler implements MessageHandler, I } } + private class ReaperTask implements Runnable { public void run() { diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java index 0d50f1d8d2..1b706bdd5c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregationBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/AggregationBarrier.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java index 4d718fafbe..f383803ad6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregationBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/Aggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Aggregator.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/Aggregator.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Aggregator.java index e748e8dc03..7ab2db8ff5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/Aggregator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Aggregator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorAdapter.java similarity index 93% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatorAdapter.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorAdapter.java index 2026bee24a..5e5e43fe69 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AggregatorAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorAdapter.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.List; +import org.springframework.integration.handler.MessageListMethodAdapter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorMessageHandlerCreator.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorMessageHandlerCreator.java index 8556448b60..0b6e8b23f4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/AggregatorMessageHandlerCreator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregatorMessageHandlerCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router.config; +package org.springframework.integration.aggregator; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -27,9 +27,6 @@ import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.config.AbstractMessageHandlerCreator; -import org.springframework.integration.router.AggregatingMessageHandler; -import org.springframework.integration.router.AggregatorAdapter; -import org.springframework.integration.router.CompletionStrategyAdapter; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategy.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java index f5982d6d6f..6b224ae949 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategy.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java similarity index 93% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java index f38a59c3d4..3814637b20 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/CompletionStrategyAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.List; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.handler.MessageListMethodAdapter; import org.springframework.integration.message.Message; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/MessageBarrier.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java index b075c1e27a..354b0074d4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java index 111a3ab544..5e6f27f99c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageSequenceComparator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.Comparator; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageBarrier.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java index 0a2900c405..75a6157998 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.ArrayList; import java.util.Collections; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageHandler.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java index 10b62c5133..9477c8a43e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/ResequencingMessageHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; import java.util.concurrent.ScheduledExecutorService; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java similarity index 96% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java rename to org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java index a39bc6fe72..c64142ed61 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/SequenceSizeCompletionStrategy.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.List; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java index 52095370b5..343e109f9f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Aggregator.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.integration.router.AggregatingMessageHandler; +import org.springframework.integration.aggregator.AggregatingMessageHandler; /** * Indicates that a method is capable of aggregating messages. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java index bb981b82b9..a5ccf0682f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/AggregatorParser.java @@ -21,10 +21,10 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.integration.aggregator.AggregatingMessageHandler; +import org.springframework.integration.aggregator.AggregatorAdapter; +import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.handler.MessageHandler; -import org.springframework.integration.router.AggregatingMessageHandler; -import org.springframework.integration.router.AggregatorAdapter; -import org.springframework.integration.router.CompletionStrategyAdapter; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java index 8fec84e14c..375b3dfafc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/IntegrationNamespaceHandler.java @@ -34,7 +34,6 @@ import org.springframework.integration.channel.config.RendezvousChannelParser; import org.springframework.integration.channel.config.ThreadLocalChannelParser; import org.springframework.integration.config.annotation.AnnotationDrivenParser; import org.springframework.integration.gateway.config.GatewayParser; -import org.springframework.integration.router.config.ResequencerParser; import org.springframework.util.ClassUtils; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/ResequencerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java similarity index 87% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/config/ResequencerParser.java rename to org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java index 16b5565168..11bcede659 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/ResequencerParser.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ResequencerParser.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.springframework.integration.router.config; +package org.springframework.integration.config; import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser; -import org.springframework.integration.config.IntegrationNamespaceUtils; -import org.springframework.integration.router.ResequencingMessageHandler; +import org.springframework.integration.aggregator.ResequencingMessageHandler; /** - * Parser for the <resequencer> tag. + * Parser for the <resequencer> element. * * @author Marius Bogoevici */ diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java index 097cf02b13..fb5f2fff78 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/annotation/HandlerAnnotationPostProcessor.java @@ -29,6 +29,7 @@ import org.springframework.core.OrderComparator; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.aggregator.AggregatorMessageHandlerCreator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.Concurrency; import org.springframework.integration.annotation.Handler; @@ -45,10 +46,9 @@ import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; import org.springframework.integration.handler.config.DefaultMessageHandlerCreator; import org.springframework.integration.handler.config.MessageHandlerCreator; -import org.springframework.integration.router.config.AggregatorMessageHandlerCreator; -import org.springframework.integration.router.config.RouterMessageHandlerCreator; -import org.springframework.integration.router.config.SplitterMessageHandlerCreator; +import org.springframework.integration.router.RouterMessageHandlerCreator; import org.springframework.integration.scheduling.Schedule; +import org.springframework.integration.splitter.SplitterMessageHandlerCreator; import org.springframework.integration.transformer.config.TransformerMessageHandlerCreator; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java similarity index 98% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java rename to org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java index 5fec27ba45..8a3278fc63 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MessageListMethodAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageListMethodAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.handler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerCreator.java similarity index 85% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java rename to org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerCreator.java index 4204bfd9ac..06fc9734b9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/RouterMessageHandlerCreator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RouterMessageHandlerCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2008 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. @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.integration.router.config; +package org.springframework.integration.router; import java.lang.reflect.Method; import java.util.Map; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.config.AbstractMessageHandlerCreator; -import org.springframework.integration.router.RouterMessageHandlerAdapter; /** * Creates a {@link MessageHandler} adapter for router methods. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/SplitterMessageHandlerCreator.java similarity index 93% rename from org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java rename to org.springframework.integration/src/main/java/org/springframework/integration/splitter/SplitterMessageHandlerCreator.java index 7a1fd75453..74b60524b9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/config/SplitterMessageHandlerCreator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/SplitterMessageHandlerCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router.config; +package org.springframework.integration.splitter; import java.lang.reflect.Method; import java.util.Map; @@ -25,7 +25,6 @@ import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.config.AbstractMessageHandlerCreator; -import org.springframework.integration.splitter.SplitterMessageHandler; /** * Creates a {@link MessageHandler} adapter for splitter methods. diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatingMessageHandlerTests.java similarity index 99% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatingMessageHandlerTests.java index fb05fce472..e16b88703e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatingMessageHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java similarity index 92% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java index 25832cafed..5fc4b2e32e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregationBarrierTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,6 +25,8 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.aggregator.AggregationBarrier; +import org.springframework.integration.aggregator.CompletionStrategy; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorAdapterTests.java similarity index 97% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorAdapterTests.java index 42bb1b2c06..5220b70243 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/AggregatorAdapterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorAdapterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.ArrayList; @@ -25,6 +25,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.aggregator.Aggregator; +import org.springframework.integration.aggregator.AggregatorAdapter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java similarity index 96% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java index e534af8e74..0560613194 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/CompletionStrategyAdapterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.ArrayList; @@ -25,6 +25,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.springframework.integration.ConfigurationException; +import org.springframework.integration.aggregator.AggregatorAdapter; +import org.springframework.integration.aggregator.CompletionStrategy; +import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java similarity index 97% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java index c1f18cb1ea..dd477621a0 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MessageSequenceComparatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import static org.junit.Assert.assertEquals; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/ResequencerMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerMessageHandlerTests.java similarity index 97% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/ResequencerMessageHandlerTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerMessageHandlerTests.java index 41f52aa162..d02bff9504 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/ResequencerMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerMessageHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -25,6 +25,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; +import org.springframework.integration.aggregator.ResequencingMessageHandler; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java similarity index 94% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java index 9625398c82..9cff953a10 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/SequenceSizeCompletionStrategyTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.aggregator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,6 +24,7 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.aggregator.SequenceSizeCompletionStrategy; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 9e2486c3f4..882a4e850d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -28,14 +28,14 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.aggregator.AggregatingMessageHandler; +import org.springframework.integration.aggregator.CompletionStrategy; +import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.endpoint.HandlerEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.router.AggregatingMessageHandler; -import org.springframework.integration.router.CompletionStrategy; -import org.springframework.integration.router.CompletionStrategyAdapter; import org.springframework.integration.util.MethodInvoker; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index c82db7213b..d63692dc4b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -26,11 +26,11 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.aggregator.ResequencingMessageHandler; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.router.ResequencingMessageHandler; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java index 51284141c4..e2839194e8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregator.java @@ -22,10 +22,10 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.aggregator.Aggregator; +import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.router.Aggregator; -import org.springframework.integration.router.MessageSequenceComparator; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java index c813b91337..9b513218dd 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java @@ -18,8 +18,8 @@ package org.springframework.integration.config; import java.util.List; +import org.springframework.integration.aggregator.CompletionStrategy; import org.springframework.integration.message.Message; -import org.springframework.integration.router.CompletionStrategy; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index bbabd8b22b..fb9e629b97 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -28,13 +28,13 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.aggregator.AggregatingMessageHandler; +import org.springframework.integration.aggregator.CompletionStrategyAdapter; +import org.springframework.integration.aggregator.SequenceSizeCompletionStrategy; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.config.MessageBusParser; import org.springframework.integration.endpoint.SimpleEndpoint; import org.springframework.integration.handler.MessageHandler; -import org.springframework.integration.router.AggregatingMessageHandler; -import org.springframework.integration.router.CompletionStrategyAdapter; -import org.springframework.integration.router.SequenceSizeCompletionStrategy; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java index 853a9d1958..bdd20109c7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.CompletionStrategy; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.router.MessageSequenceComparator; import org.springframework.stereotype.Component; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java index b4f63d60fa..ba564bd822 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.router.MessageSequenceComparator; import org.springframework.stereotype.Component; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java index ded70cf5c5..ce0c184591 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java @@ -22,11 +22,11 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; -import org.springframework.integration.router.MessageSequenceComparator; import org.springframework.stereotype.Component; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java similarity index 99% rename from org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerTests.java rename to org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java index e1a457e9c2..900531e7b5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/SplitterMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.router; +package org.springframework.integration.splitter; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull;