diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java index e27879d7ce..bfbd9c49b6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java @@ -43,6 +43,8 @@ public @interface IntegrationComponentScan { * Allows for more concise annotation declarations e.g.: * {@code @ComponentScan("org.my.pkg")} instead of * {@code @ComponentScan(basePackages="org.my.pkg")}. + * + * @return the array of 'basePackages'. */ String[] value() default {}; @@ -50,6 +52,8 @@ public @interface IntegrationComponentScan { * Base packages to scan for annotated components. *
{@link #value()} is an alias for (and mutually exclusive with) this attribute. *
Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names. + * + * @return the array of 'basePackages'. */ String[] basePackages() default {}; @@ -58,6 +62,8 @@ public @interface IntegrationComponentScan { * to scan for annotated components. The package of each class specified will be scanned. *
Consider creating a special no-op marker class or interface in each package * that serves no purpose other than being referenced by this attribute. + * + * @return the array of 'basePackageClasses'. */ Class>[] basePackageClasses() default {}; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/FixedSubscriberChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/FixedSubscriberChannel.java index 0320f63913..70faa93fe9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/FixedSubscriberChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/FixedSubscriberChannel.java @@ -31,7 +31,7 @@ import org.springframework.messaging.SubscribableChannel; * other {@link SubscribableChannel}s where the {@link MessageHandler} is subscribed when the endpoint * is started). This channel does not support interceptors or data types. *
- * Note: Stopping ({@link #unsubscribe(MessageHandler)}) the subscribed ({@link MessageHandler}) has no effect.
+ * Note: Stopping ({@link #unsubscribe(MessageHandler)}) the subscribed ({@link MessageHandler}) has no effect.
*
* @author Gary Russell
* @since 4.0
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java
index 1e0941567b..0ea6d94af1 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java
@@ -42,6 +42,9 @@ public class ExpressionEvaluatingHeaderValueMessageProcessor