From 724f335750a701bd2b8c46ecb66d82c5e64bc34a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 3 Feb 2022 15:29:55 -0500 Subject: [PATCH] Fix @Poller Javadoc * Fix @Poller Javadoc - `receiveTimeout` was added as a property in 5.1. * More javadoc polishing. **cherry-pick to 5.5.x** --- .../org/springframework/integration/annotation/Poller.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Poller.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Poller.java index 5518a6a037..792438061a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Poller.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Poller.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; * for the Messaging annotations for polled endpoints. It is an analogue of the XML * {@code } element, but provides only simple attributes. If the * {@link org.springframework.integration.scheduling.PollerMetadata} requires more options - * (e.g. Transactional and other Advices) or {@code initialDelay, receiveTimeout} etc, the + * (e.g. Transactional and other Advices) or {@code initialDelay} etc., the * {@link org.springframework.integration.scheduling.PollerMetadata} should be configured * as a generic bean and its bean name can be specified as the {@code value} attribute of * this annotation. In that case, the other attributes are not allowed. @@ -87,7 +87,7 @@ public @interface Poller { String cron() default ""; /** - * @return The the bean name of default error channel + * @return The bean name of default error channel * for the underlying {@code MessagePublishingErrorHandler}. * @since 4.3.3 */ @@ -97,7 +97,7 @@ public @interface Poller { * Only applies to polling consumers. * @return the time the poll thread will wait after the trigger for a new message to arrive. * Defaults to 1000 (1 second). - * For polled inbound channel adapters, whether or not the polling thread blocks + * For polled inbound channel adapters, whether the polling thread blocks * is dependent on the message source implementation. * Can be specified as 'property placeholder', e.g. {@code ${my.poller.receiveTimeout}}. * @since 5.1