INT-3189 Fix JavaDocs

Links to classes moved to `spring-messaging`. Also `MessageHeaders` was inadvertently added back in by the last merge. JIRA: https://jira.springsource.org/browse/INT-3189 __NOTE: Merge to 4.0.0-WIP, not master__
lequoctoan · Nov 27, 2013 · 7da027a · 7da027a
1 parent 6fd8d1d
commit 7da027a
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 294 deletions.
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
diff --git a/...org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java b/...org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java
@@ -54,7 +54,7 @@ public void setExpectedType(Class<?> expectedType) {
 
 	/**
 	 * Evaluate the expression provided on the messages (a collection) in the group, and delegate to the
-	 * {@link MessagingTemplate} to send downstream.
+	 * {@link org.springframework.integration.core.MessagingTemplate} to send downstream.
 	 */
 	@Override
 	protected Object aggregatePayloads(MessageGroup group, Map<String, Object> headers) {

diff --git a/...tegration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java b/...tegration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java
@@ -20,10 +20,10 @@
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHeaders;
 import org.springframework.integration.EiMessageHeaderAccessor;
 import org.springframework.integration.util.UpperBound;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
 
 /**
  * A message channel that prioritizes messages based on a {@link Comparator}.
@@ -43,7 +43,7 @@ public class PriorityChannel extends QueueChannel {
 	 * is a non-positive value, the queue will be unbounded. Message priority
 	 * will be determined by the provided {@link Comparator}. If the comparator
 	 * is <code>null</code>, the priority will be based upon the value of
-	 * {@link MessageHeaders#getPriority()}.
+	 * {@link EiMessageHeaderAccessor#getPriority()}.
 	 */
 	public PriorityChannel(int capacity, Comparator<Message<?>> comparator) {
 		super(new PriorityBlockingQueue<Message<?>>(11, new SequenceFallbackComparator(comparator)));
@@ -52,7 +52,7 @@ public PriorityChannel(int capacity, Comparator<Message<?>> comparator) {
 
 	/**
 	 * Create a channel with the specified queue capacity. Message priority
-	 * will be based upon the value of {@link MessageHeaders#getPriority()}.
+	 * will be based upon the value of {@link EiMessageHeaderAccessor#getPriority()}.
 	 */
 	public PriorityChannel(int capacity) {
 		this(capacity, null);
@@ -62,15 +62,15 @@ public PriorityChannel(int capacity) {
 	 * Create a channel with an unbounded queue. Message priority will be
 	 * determined by the provided {@link Comparator}. If the comparator
 	 * is <code>null</code>, the priority will be based upon the value of
-	 * {@link MessageHeaders#getPriority()}.
+	 * {@link EiMessageHeaderAccessor#getPriority()}.
 	 */
 	public PriorityChannel(Comparator<Message<?>> comparator) {
 		this(0, comparator);
 	}
 
 	/**
 	 * Create a channel with an unbounded queue. Message priority will be
-	 * based on the value of {@link MessageHeaders#getPriority()}.
+	 * based on the value of {@link EiMessageHeaderAccessor#getPriority()}.
 	 */
 	public PriorityChannel() {
 		this(0, null);

diff --git a/...n-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/...n-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
@@ -121,7 +121,7 @@ public void setMaxSubscribers(int maxSubscribers) {
 
 	/**
 	 * If at least this number of subscribers receive the message,
-	 * {@link #send(org.springframework.integration.Message)}
+	 * {@link #send(org.springframework.messaging.Message)}
 	 * will return true. Default: 0.
 	 * @param minSubscribers The minimum number of subscribers.
 	 */

diff --git a/...n-core/src/main/java/org/springframework/integration/gateway/MethodArgsMessageMapper.java b/...n-core/src/main/java/org/springframework/integration/gateway/MethodArgsMessageMapper.java
@@ -19,7 +19,7 @@
 
 /**
  * Implementations of this interface are {@link InboundMessageMapper}s
- * that map a {@link MethodArgsHolder} to a {@link org.springframework.integration.Message}.
+ * that map a {@link MethodArgsHolder} to a {@link org.springframework.messaging.Message}.
  *
  * @author Gary Russell
  * @since 3.0

diff --git a/.../springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java b/.../springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java
@@ -19,14 +19,13 @@
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.message.AdviceMessage;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
-import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
-import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.messaging.support.ErrorMessage;
 import org.springframework.util.Assert;
 
@@ -35,7 +34,7 @@
  * Two expressions 'onSuccessExpression' and 'onFailureExpression' are evaluated when
  * appropriate. If the evaluation returns a result, a message is sent to the onSuccessChannel
  * or onFailureChannel as appropriate; the message is the input message with a header
- * {@link MessageHeaders#POSTPROCESS_RESULT} containing the evaluation result.
+ * {@link org.springframework.integration.EiMessageHeaderAccessor#POSTPROCESS_RESULT} containing the evaluation result.
  * The failure expression is NOT evaluated if the success expression throws an exception.
  * @author Gary Russell
  * @since 2.2

diff --git a/...re/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java b/...re/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java
@@ -60,7 +60,7 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter
 
 	/**
 	 * Provide mappings from channel keys to channel names.
-	 * Channel names will be resolved by the {@link ChannelResolver}.
+	 * Channel names will be resolved by the {@link DestinationResolver}.
 	 */
 	public void setChannelMappings(Map<String, String> channelMappings) {
 		Map<String, String> oldChannelMappings = this.channelMappings;

diff --git a/...ation-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/...ation-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
@@ -27,7 +27,7 @@
  * method's return value may be a single MessageChannel instance, a single
  * String to be interpreted as a channel name, or a Collection (or Array) of
  * either type. If the method returns channel names, then a
- * {@link ChannelResolver} is required.
+ * {@link org.springframework.messaging.core.DestinationResolver} is required.
  *
  * @author Mark Fisher
  * @author Artem Bilan