From e8df546b043c790cc3ae2294a2c1cd97d8c69160 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 2 Jan 2019 12:26:22 -0500 Subject: [PATCH] Sonar Fixes - Javadoc-only imports --- .../amqp/channel/AbstractAmqpChannel.java | 6 +- .../AbstractMessageListenerContainerSpec.java | 11 ++-- .../dsl/AmqpBaseOutboundEndpointSpec.java | 7 ++- .../dsl/AmqpInboundChannelAdapterSpec.java | 7 ++- .../dsl/AmqpPollableMessageChannelSpec.java | 4 +- ...mqpPublishSubscribeMessageChannelSpec.java | 9 ++- .../inbound/AmqpInboundChannelAdapter.java | 4 +- .../amqp/inbound/AmqpInboundGateway.java | 4 +- .../amqp/inbound/AmqpMessageSource.java | 3 +- .../amqp/support/AmqpHeaderMapper.java | 7 +-- .../MessageDispatchingException.java | 8 +-- .../AbstractCorrelatingMessageHandler.java | 17 +++--- .../integration/annotation/Poller.java | 42 +++++++------- .../PublisherAnnotationBeanPostProcessor.java | 6 +- .../channel/AbstractMessageChannel.java | 4 +- .../channel/AbstractSubscribableChannel.java | 8 +-- .../channel/DefaultHeaderChannelRegistry.java | 5 +- .../integration/channel/ExecutorChannel.java | 4 +- .../interceptor/VetoCapableInterceptor.java | 6 +- .../config/AggregatorFactoryBean.java | 4 +- ...ltConfiguringBeanFactoryPostProcessor.java | 5 +- .../config/EnableIntegrationManagement.java | 6 +- ...criberChannelBeanFactoryPostProcessor.java | 6 +- .../GlobalChannelInterceptorInitializer.java | 4 +- ...ConfigurationBeanFactoryPostProcessor.java | 9 +-- ...tegrationEvaluationContextFactoryBean.java | 10 ++-- .../config/IntegrationRegistrar.java | 5 +- ...ionSimpleEvaluationContextFactoryBean.java | 11 ++-- .../xml/AbstractChannelAdapterParser.java | 8 ++- ...stractCorrelatingMessageHandlerParser.java | 4 +- .../config/xml/IntegrationNamespaceUtils.java | 5 +- .../OrderedAwareCopyOnWriteArraySet.java | 11 ++-- .../dispatcher/UnicastingDispatcher.java | 3 +- .../integration/dsl/ConsumerEndpointSpec.java | 16 ++++-- .../dsl/CorrelationHandlerSpec.java | 6 +- .../integration/dsl/DelayerEndpointSpec.java | 23 ++++---- .../integration/dsl/EndpointSpec.java | 19 +++---- .../dsl/IntegrationFlowDefinition.java | 26 +++++---- .../integration/dsl/IntegrationFlows.java | 4 +- .../integration/dsl/PollerSpec.java | 12 ++-- ...slIntegrationConfigurationInitializer.java | 6 +- .../IntegrationFlowBeanPostProcessor.java | 7 +-- .../IntegrationFlowLifecycleAdvice.java | 19 ++++--- .../StandardIntegrationFlowContext.java | 4 +- .../endpoint/AbstractPollingEndpoint.java | 3 +- .../endpoint/MethodInvokingMessageSource.java | 5 +- .../filter/ExpressionEvaluatingSelector.java | 9 +-- .../filter/MethodInvokingSelector.java | 7 ++- .../gateway/GatewayProxyFactoryBean.java | 9 +-- .../RequestReplyMessageHandlerAdapter.java | 6 +- .../handler/AbstractMessageHandler.java | 3 +- .../integration/handler/DelayHandler.java | 7 +-- .../handler/MessageHandlerChain.java | 4 +- .../handler/MethodInvokingMessageHandler.java | 6 +- .../advice/AbstractRequestHandlerAdvice.java | 10 ++-- ...ressionEvaluatingRequestHandlerAdvice.java | 3 +- .../advice/IdempotentReceiverInterceptor.java | 10 ++-- .../handler/support/MapArgumentResolver.java | 7 ++- .../ResourceRetrievingMessageSource.java | 6 +- .../router/AbstractMappingMessageRouter.java | 6 +- .../router/AbstractMessageRouter.java | 4 +- .../ErrorMessageExceptionTypeRouter.java | 4 +- .../integration/router/PayloadTypeRouter.java | 6 +- .../store/ChannelMessageStore.java | 6 +- .../store/MessageGroupStoreReaper.java | 14 ++++- .../support/DefaultMessageBuilderFactory.java | 6 +- .../integration/support/MutableMessage.java | 8 +-- .../NullAwarePayloadArgumentResolver.java | 4 +- .../leader/LockRegistryLeaderInitiator.java | 7 +-- .../IntegrationManagedResource.java | 6 +- .../MappingMessageRouterManagement.java | 6 +- ...ngTransactionSynchronizationProcessor.java | 4 +- .../transaction/PseudoTransactionManager.java | 10 ++-- .../TransactionHandleMessageAdvice.java | 11 ++-- .../MessageTransformingHandler.java | 5 +- .../util/DynamicPeriodicTrigger.java | 4 +- ...licationEventListeningMessageProducer.java | 7 +-- .../feed/inbound/FeedEntryMessageSource.java | 6 +- .../file/FileReadingMessageSource.java | 18 +++--- .../file/FileWritingMessageHandler.java | 4 +- .../dsl/FileInboundChannelAdapterSpec.java | 28 ++++----- .../dsl/FileWritingMessageHandlerSpec.java | 13 ++--- .../RemoteFileInboundChannelAdapterSpec.java | 8 +-- .../dsl/RemoteFileOutboundGatewaySpec.java | 12 ++-- ...ileStreamingInboundChannelAdapterSpec.java | 12 ++-- .../file/locking/NioFileLocker.java | 7 ++- .../file/remote/ClientCallback.java | 13 ++--- .../file/remote/RemoteFileOperations.java | 4 +- .../FileTransferringMessageHandler.java | 6 +- .../inbound/FtpInboundFileSynchronizer.java | 7 ++- .../integration/ftp/session/FtpFileInfo.java | 6 +- .../metadata/GemfireMetadataStore.java | 6 +- .../outbound/CacheWritingMessageHandler.java | 8 +-- .../gemfire/store/GemfireMessageStore.java | 8 +-- .../groovy/GroovyCommandMessageProcessor.java | 7 ++- .../EnableIntegrationGraphController.java | 18 +++--- .../SerializingHttpMessageConverter.java | 6 +- .../http/dsl/BaseHttpInboundEndpointSpec.java | 7 ++- .../dsl/HttpInboundEndpointSupportSpec.java | 27 +++++---- .../http/inbound/BaseHttpInboundEndpoint.java | 3 +- .../HttpRequestHandlingController.java | 9 ++- .../HttpRequestHandlingEndpointSupport.java | 5 +- .../HttpRequestHandlingMessagingGateway.java | 11 ++-- ...actHttpRequestExecutingMessageHandler.java | 7 +-- .../HttpRequestExecutingMessageHandler.java | 20 +++---- ...InternetProtocolSendingMessageHandler.java | 15 ++--- .../integration/ip/CommonSocketOptions.java | 17 +++--- .../ip/config/IpAdapterParserUtils.java | 6 +- ...dpMulticastOutboundChannelAdapterSpec.java | 6 +- .../UdpUnicastOutboundChannelAdapterSpec.java | 5 +- .../ip/tcp/TcpOutboundGateway.java | 3 +- .../AbstractTcpConnectionSupport.java | 6 +- .../ip/tcp/connection/TcpConnection.java | 12 ++-- .../TcpNetClientConnectionFactory.java | 6 +- .../ip/tcp/connection/TcpNetConnection.java | 10 ++-- .../TcpNioClientConnectionFactory.java | 5 +- .../connection/TcpSocketFactorySupport.java | 10 ++-- .../udp/MulticastSendingMessageHandler.java | 18 +++--- .../jdbc/MessagePreparedStatementSetter.java | 9 +-- .../integration/jdbc/StoredProcExecutor.java | 28 ++++----- .../jdbc/StoredProcMessageHandler.java | 6 +- .../jdbc/StoredProcOutboundGateway.java | 9 ++- .../jdbc/StoredProcPollingChannelAdapter.java | 9 +-- .../jdbc/lock/JdbcLockRegistry.java | 14 ++--- .../jdbc/metadata/JdbcMetadataStore.java | 6 +- .../jdbc/store/JdbcChannelMessageStore.java | 25 ++++---- .../jdbc/store/JdbcMessageStore.java | 6 +- .../ChannelMessageStoreQueryProvider.java | 9 ++- ...racleChannelMessageStoreQueryProvider.java | 12 ++-- .../jms/dsl/JmsMessageChannelSpec.java | 57 +++++++++++-------- ...JmsPublishSubscribeMessageChannelSpec.java | 7 +-- .../jmx/AttributePollingMessageSource.java | 7 +-- .../jmx/MBeanTreePollingMessageSource.java | 6 +- .../integration/jpa/core/JpaExecutor.java | 5 +- .../integration/jpa/core/JpaOperations.java | 23 +++++--- .../jpa/inbound/JpaPollingChannelAdapter.java | 5 +- .../jpa/outbound/JpaOutboundGateway.java | 3 +- .../JpaOutboundGatewayFactoryBean.java | 9 ++- .../BeanPropertyParameterSource.java | 10 +++- .../mail/ImapIdleChannelAdapter.java | 3 +- .../mail/MailReceivingMessageSource.java | 4 +- .../mail/MailSendingMessageHandler.java | 3 +- .../integration/mail/MailTransportUtils.java | 8 +-- .../mail/dsl/ImapIdleChannelAdapterSpec.java | 18 +++--- .../dsl/MailInboundChannelAdapterSpec.java | 14 ++--- .../mongodb/inbound/MongoDbMessageSource.java | 26 +++++---- .../metadata/MongoDbMetadataStore.java | 7 +-- .../MongoDbStoringMessageHandler.java | 4 +- .../ConfigurableMongoDbMessageStore.java | 4 +- .../mongodb/store/MongoDbMessageStore.java | 4 +- .../mqtt/config/xml/MqttParserUtils.java | 3 +- .../inbound/RedisStoreMessageSource.java | 4 +- .../redis/metadata/RedisMetadataStore.java | 10 ++-- .../RedisStoreWritingMessageHandler.java | 14 ++--- .../redis/store/RedisMessageStore.java | 6 +- .../redis/util/RedisLockRegistry.java | 3 +- .../jsr223/DefaultScriptExecutor.java | 7 +-- .../jsr223/PythonScriptExecutor.java | 7 +-- ...yContextPropagationChannelInterceptor.java | 5 +- ...lSecurityInterceptorBeanPostProcessor.java | 5 +- .../sftp/session/SftpFileInfo.java | 5 +- .../StompInboundChannelAdapterParser.java | 6 +- .../stomp/event/StompIntegrationEvent.java | 4 +- .../ByteStreamWritingMessageHandler.java | 4 +- .../CharacterStreamWritingMessageHandler.java | 4 +- .../test/matcher/HeaderMatcher.java | 6 +- .../test/matcher/MockitoMessageMatchers.java | 10 ++-- .../test/matcher/PayloadMatcher.java | 8 +-- .../dsl/WebFluxMessageHandlerSpec.java | 14 +++-- .../inbound/WebFluxInboundEndpoint.java | 6 +- ...tegrationRequestMappingHandlerMapping.java | 14 ++--- ...WebFluxRequestExecutingMessageHandler.java | 9 ++- .../ws/DefaultSoapHeaderMapper.java | 5 +- .../integration/ws/SoapHeaderMapper.java | 8 +-- .../BooleanTestXPathMessageSelector.java | 28 +++++---- .../RegexTestXPathMessageSelector.java | 9 +-- .../StringValueTestXPathMessageSelector.java | 10 ++-- .../xml/splitter/XPathMessageSplitter.java | 3 +- .../transformer/MarshallingTransformer.java | 8 ++- .../transformer/UnmarshallingTransformer.java | 5 +- .../transformer/XsltPayloadTransformer.java | 4 +- .../integration/xml/xpath/XPathUtils.java | 6 +- .../inbound/PresenceListeningEndpoint.java | 6 +- .../xmpp/support/XmppHeaderMapper.java | 6 +- 184 files changed, 820 insertions(+), 805 deletions(-) diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java index fb1f25a88f..32f3b9c2b1 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java @@ -23,7 +23,6 @@ import org.springframework.amqp.rabbit.connection.Connection; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.amqp.support.AmqpHeaders; import org.springframework.beans.factory.DisposableBean; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; @@ -109,7 +108,8 @@ public abstract class AbstractAmqpChannel extends AbstractMessageChannel /** * Set the delivery mode to use if the message has no * {@value org.springframework.amqp.support.AmqpHeaders#DELIVERY_MODE} - * header and the message property was not set by the {@code MessagePropertiesConverter}. + * header and the message property was not set by the + * {@code MessagePropertiesConverter}. * @param defaultDeliveryMode the default delivery mode. * @since 4.3 */ @@ -151,7 +151,7 @@ public abstract class AbstractAmqpChannel extends AbstractMessageChannel * {@link org.springframework.amqp.support.converter.SimpleMessageConverter} with a * String payload that contains json; the converter will set the content type to * {@code text/plain} which can be overridden to {@code application/json} by setting - * the {@link AmqpHeaders#CONTENT_TYPE} message header. + * the {@link org.springframework.amqp.support.AmqpHeaders#CONTENT_TYPE} message header. * Only applies when {@link #setExtractPayload(boolean) extractPayload} is true. * Default: false. * @param headersMappedLast true if headers are mapped after conversion. diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java index 09e2030a9a..b3a6c0b8d7 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 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. @@ -22,11 +22,9 @@ import java.util.concurrent.Executor; import org.aopalliance.aop.Advice; import org.springframework.amqp.core.AcknowledgeMode; -import org.springframework.amqp.core.MessageListener; import org.springframework.amqp.core.MessagePostProcessor; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; -import org.springframework.amqp.rabbit.listener.ListenerContainerIdleEvent; import org.springframework.amqp.rabbit.support.MessagePropertiesConverter; import org.springframework.amqp.support.ConditionalExceptionLogger; import org.springframework.amqp.support.ConsumerTagStrategy; @@ -203,7 +201,8 @@ public abstract class AbstractMessageListenerContainerSpec the target {@link AbstractAmqpOutboundEndpoint} implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -201,7 +201,8 @@ AmqpBaseOutboundEndpointSpec, E ext } /** - * Provide the header names that should be mapped from a request to a {@link MessageHeaders}. + * Provide the header names that should be mapped from a request to a + * {@link org.springframework.messaging.MessageHeaders}. * @param headers The request header names. * @return the spec */ @@ -212,7 +213,7 @@ AmqpBaseOutboundEndpointSpec, E ext /** * Provide the header names that should be mapped to a response - * from a {@link MessageHeaders}. + * from a {@link org.springframework.messaging.MessageHeaders}. * @param headers The reply header names. * @return the spec */ diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java index e3c9eae19c..9d20d69c08 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 the original author or authors. + * Copyright 2014-2018 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. @@ -22,15 +22,16 @@ import java.util.Map; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; import org.springframework.integration.amqp.inbound.AmqpInboundChannelAdapter; import org.springframework.integration.dsl.ComponentsRegistration; -import org.springframework.integration.dsl.MessageProducerSpec; /** - * A {@link MessageProducerSpec} for {@link AmqpInboundChannelAdapter}s. + * A {@link org.springframework.integration.dsl.MessageProducerSpec} for + * {@link AmqpInboundChannelAdapter}s. * * @param the spec type. * @param the container type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java index 5f85c1d40a..4321c21cba 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpPollableMessageChannelSpec.java @@ -19,7 +19,6 @@ package org.springframework.integration.amqp.dsl; import org.springframework.amqp.core.MessageDeliveryMode; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.support.MessagePropertiesConverter; -import org.springframework.amqp.support.AmqpHeaders; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -149,7 +148,8 @@ public class AmqpPollableMessageChannelSpec - * Use proper {@link CorrelationStrategy} for cases when same {@link MessageStore} is used + * Use proper {@link CorrelationStrategy} for cases when same + * {@link org.springframework.integration.store.MessageStore} is used * for multiple handlers to ensure uniqueness of message groups across handlers. * * @author Iwein Fuld @@ -274,10 +274,11 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageP } /** - * Perform a {@link MessageBuilder#popSequenceDetails()} for output message or not. - * Default to true. - * This option removes the sequence information added by the nearest upstream component with - * {@code applySequence=true} (for example splitter). + * Perform a + * {@link org.springframework.integration.support.MessageBuilder#popSequenceDetails()} + * for output message or not. Default to true. This option removes the sequence + * information added by the nearest upstream component with {@code applySequence=true} + * (for example splitter). * @param popSequence the boolean flag to use. * @since 5.1 */ 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 d62f55ac4c..df3d17c49e 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 @@ -20,20 +20,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.integration.scheduling.PollerMetadata; -import org.springframework.scheduling.Trigger; -import org.springframework.scheduling.support.CronTrigger; -import org.springframework.scheduling.support.PeriodicTrigger; - /** - * Provides the {@link PollerMetadata} options 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 {@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. + * Provides the {@link org.springframework.integration.scheduling.PollerMetadata} options + * 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 + * {@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. *

* Non-reference attributes support Property Placeholder resolutions. * @@ -47,12 +42,13 @@ import org.springframework.scheduling.support.PeriodicTrigger; public @interface Poller { /** - * @return The {@link PollerMetadata} bean name. + * @return The {@link org.springframework.integration.scheduling.PollerMetadata} bean + * name. */ String value() default ""; /** - * @return The {@link Trigger} bean name. + * @return The {@link org.springframework.scheduling.Trigger} bean name. */ String trigger() default ""; @@ -69,20 +65,24 @@ public @interface Poller { String maxMessagesPerPoll() default ""; /** - * @return The fixed delay in milliseconds to create the {@link PeriodicTrigger}. - * Can be specified as 'property placeholder', e.g. {@code ${poller.fixedDelay}}. + * @return The fixed delay in milliseconds to create the + * {@link org.springframework.scheduling.support.PeriodicTrigger}. Can be specified as + * 'property placeholder', e.g. {@code ${poller.fixedDelay}}. */ String fixedDelay() default ""; /** - * @return The fixed rate in milliseconds to create the {@link PeriodicTrigger} with {@code fixedRate}. - * Can be specified as 'property placeholder', e.g. {@code ${poller.fixedRate}}. + * @return The fixed rate in milliseconds to create the + * {@link org.springframework.scheduling.support.PeriodicTrigger} with + * {@code fixedRate}. Can be specified as 'property placeholder', e.g. + * {@code ${poller.fixedRate}}. */ String fixedRate() default ""; /** - * @return The cron expression to create the {@link CronTrigger}. - * Can be specified as 'property placeholder', e.g. {@code ${poller.cron}}. + * @return The cron expression to create the + * {@link org.springframework.scheduling.support.CronTrigger}. Can be specified as + * 'property placeholder', e.g. {@code ${poller.cron}}. */ String cron() default ""; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java index 08abfd47f7..acc6cf3287 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -31,11 +31,11 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.Ordered; -import org.springframework.integration.annotation.Publisher; import org.springframework.util.ClassUtils; /** - * Post-processes beans that contain the method-level @{@link Publisher} annotation. + * Post-processes beans that contain the + * method-level @{@link org.springframework.integration.annotation.Publisher} annotation. * * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index 4d9ff4679f..7d23995b95 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -32,7 +32,6 @@ import org.springframework.core.OrderComparator; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.history.MessageHistory; -import org.springframework.integration.support.converter.DefaultDatatypeChannelMessageConverter; import org.springframework.integration.support.management.AbstractMessageChannelMetrics; import org.springframework.integration.support.management.ConfigurableMetricsAware; import org.springframework.integration.support.management.DefaultMessageChannelMetrics; @@ -232,7 +231,8 @@ public abstract class AbstractMessageChannel extends IntegrationObjectSupport * expected that the converter will have fully populated the headers; no * further action is performed by the channel. If {@code null} is returned, * conversion to the next datatype (if any) will be attempted. - * Defaults to a {@link DefaultDatatypeChannelMessageConverter}. + * Defaults to a + * {@link org.springframework.integration.support.converter.DefaultDatatypeChannelMessageConverter}. * @param messageConverter The message converter. */ public void setMessageConverter(MessageConverter messageConverter) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java index 36c2d32dd4..52dbce1cf5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -20,15 +20,15 @@ import org.springframework.integration.MessageDispatchingException; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.support.management.SubscribableChannelManagement; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; /** - * Base implementation of {@link MessageChannel} that invokes the subscribed - * {@link MessageHandler handler(s)} by delegating to a {@link MessageDispatcher}. + * Base implementation of {@link org.springframework.messaging.MessageChannel} that + * invokes the subscribed {@link MessageHandler handler(s)} by delegating to a + * {@link MessageDispatcher}. * * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java index cc4dec6a33..2685b55c34 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/DefaultHeaderChannelRegistry.java @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.AtomicLong; import org.springframework.context.Lifecycle; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.channel.HeaderChannelRegistry; import org.springframework.lang.Nullable; import org.springframework.messaging.MessageChannel; @@ -36,7 +35,9 @@ import org.springframework.util.Assert; /** * Converts a channel to a name, retaining a reference to the channel keyed by the name. - * Allows a downstream {@link BeanFactoryChannelResolver} to find the channel by name + * Allows a downstream + * {@link org.springframework.integration.support.channel.BeanFactoryChannelResolver} + * to find the channel by name * in the event that the flow serialized the message at some point. * Channels are expired after a configurable delay (60 seconds by default). * The actual average expiry time will be 1.5x the delay. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java index 5286854fbb..a21b89d07b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java @@ -24,12 +24,12 @@ import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrateg import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.util.ErrorHandlingTaskExecutor; -import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; /** - * An implementation of {@link MessageChannel} that delegates to an instance of + * An implementation of {@link org.springframework.messaging.MessageChannel} + * that delegates to an instance of * {@link UnicastingDispatcher} which in turn delegates all dispatching * invocations to an {@link Executor}. *

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/VetoCapableInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/VetoCapableInterceptor.java index 9c269fe272..d1120299ee 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/VetoCapableInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/VetoCapableInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 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. @@ -17,10 +17,10 @@ package org.springframework.integration.channel.interceptor; import org.springframework.integration.channel.ChannelInterceptorAware; -import org.springframework.messaging.support.ChannelInterceptor; /** - * {@link ChannelInterceptor}s implementing this interface can veto + * {@link org.springframework.messaging.support.ChannelInterceptor}s implementing this + * interface can veto * global interception of a particular channel. Could be used, for example, * when an interceptor itself writes to an output channel (which should * not be intercepted with this interceptor). diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java index c411283c2c..482b5e1e55 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AggregatorFactoryBean.java @@ -20,7 +20,6 @@ import java.util.List; import org.aopalliance.aop.Advice; -import org.springframework.beans.factory.FactoryBean; import org.springframework.expression.Expression; import org.springframework.integration.aggregator.AggregatingMessageHandler; import org.springframework.integration.aggregator.CorrelationStrategy; @@ -37,7 +36,8 @@ import org.springframework.util.StringUtils; /** - * {@link FactoryBean} to create an {@link AggregatingMessageHandler}. + * {@link org.springframework.beans.factory.FactoryBean} to create an + * {@link AggregatingMessageHandler}. * * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java index 00a410e049..f48bb81384 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java @@ -68,7 +68,6 @@ import org.springframework.integration.support.converter.ConfigurableCompositeMe import org.springframework.integration.support.converter.DefaultDatatypeChannelMessageConverter; import org.springframework.integration.support.json.JacksonPresent; import org.springframework.integration.support.utils.IntegrationUtils; -import org.springframework.messaging.converter.CompositeMessageConverter; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.ClassUtils; @@ -467,8 +466,8 @@ class DefaultConfiguringBeanFactoryPostProcessor } /** - * Register the default {@link CompositeMessageConverter} for argument resolvers - * during handler method invocation. + * Register the default {@link ConfigurableCompositeMessageConverter} for argument + * resolvers during handler method invocation. */ private void registerArgumentResolverMessageConverter() { if (!this.beanFactory.containsBean(IntegrationContextUtils.ARGUMENT_RESOLVER_MESSAGE_CONVERTER_BEAN_NAME)) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java index e98b01799b..ad26ea2bce 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java @@ -23,7 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Import; -import org.springframework.integration.support.management.IntegrationManagement; /** * Enables default configuring of management in Spring Integration components in an existing application. @@ -100,11 +99,12 @@ public @interface EnableIntegrationManagement { * time. *

* Set this to false to disable logging by default in all framework components that implement - * {@link IntegrationManagement} (channels, message handlers etc). This turns off logging such as + * {@link org.springframework.integration.support.management.IntegrationManagement} + * (channels, message handlers etc). This turns off logging such as * "PreSend on channel", "Received message" etc. *

* After the context is initialized, individual components can have their setting changed by invoking - * {@link IntegrationManagement#setLoggingEnabled(boolean)}. + * {@link org.springframework.integration.support.management.IntegrationManagement#setLoggingEnabled(boolean)}. * @return the value; true by default. */ String defaultLoggingEnabled() default "true"; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java index 8fc8bddf3e..2eb2bcf978 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/FixedSubscriberChannelBeanFactoryPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 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. @@ -26,11 +26,11 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.integration.channel.FixedSubscriberChannel; -import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** - * Used to post process candidates for {@link FixedSubscriberChannel} {@link MessageHandler}s. + * Used to post process candidates for {@link FixedSubscriberChannel} + * {@link org.springframework.messaging.MessageHandler}s. * @author Gary Russell * @since 4.0 * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorInitializer.java index 75bbe10cb3..2b09285b1f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptorInitializer.java @@ -28,12 +28,12 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.MethodMetadata; import org.springframework.integration.channel.interceptor.GlobalChannelInterceptorWrapper; -import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.util.CollectionUtils; /** * The {@link IntegrationConfigurationInitializer} to populate {@link GlobalChannelInterceptorWrapper} - * for {@link ChannelInterceptor}s marked with {@link GlobalChannelInterceptor} annotation. + * for {@link org.springframework.messaging.support.ChannelInterceptor}s marked with + * {@link GlobalChannelInterceptor} annotation. *

* {@link org.springframework.context.annotation.Bean} methods are also processed. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigurationBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigurationBeanFactoryPostProcessor.java index 0b8369c56d..ae06c27f8a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigurationBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationConfigurationBeanFactoryPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 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. @@ -19,17 +19,18 @@ package org.springframework.integration.config; import java.util.List; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.core.io.support.SpringFactoriesLoader; /** - * {@link BeanFactoryPostProcessor} to apply external Integration infrastructure configurations - * via loading {@link IntegrationConfigurationInitializer} implementations using {@link SpringFactoriesLoader}. + * {@link BeanDefinitionRegistryPostProcessor} to apply external Integration + * infrastructure configurations via loading {@link IntegrationConfigurationInitializer} + * implementations using {@link SpringFactoriesLoader}. * * @author Artem Bilan + * @author Gary Russell * @since 4.0 */ public class IntegrationConfigurationBeanFactoryPostProcessor implements BeanDefinitionRegistryPostProcessor { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationEvaluationContextFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationEvaluationContextFactoryBean.java index f9bed95651..b776b6a6b3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationEvaluationContextFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationEvaluationContextFactoryBean.java @@ -22,14 +22,11 @@ import java.util.Map.Entry; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.context.expression.MapAccessor; -import org.springframework.core.convert.ConversionService; import org.springframework.expression.BeanResolver; import org.springframework.expression.PropertyAccessor; -import org.springframework.expression.TypeConverter; import org.springframework.expression.TypeLocator; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; /** *

@@ -39,7 +36,8 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; * a {@link BeanFactoryResolver}. * *

  • - * a {@link TypeConverter} based on the {@link ConversionService} from the application context. + * a {@link org.springframework.expression.TypeConverter} based on the + * {@link org.springframework.core.convert.ConversionService} from the application context. *
    • *
  • * a set of provided {@link PropertyAccessor}s including a default {@link MapAccessor}. @@ -50,7 +48,9 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; * *

    * After initialization this factory populates functions and property accessors from - * {@link SpelFunctionFactoryBean}s and {@link SpelPropertyAccessorRegistrar}, respectively. + * {@link SpelFunctionFactoryBean}s and + * {@link org.springframework.integration.expression.SpelPropertyAccessorRegistrar}, + * respectively. * Functions and property accessors are also inherited from any parent context. *

    *

    diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java index 2f55d0b24f..4fb858c60a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationRegistrar.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.ManagedSet; import org.springframework.context.ApplicationContextException; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.integration.aop.PublisherAnnotationBeanPostProcessor; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationProperties; @@ -134,7 +133,9 @@ public class IntegrationRegistrar implements ImportBeanDefinitionRegistrar { } /** - * Register {@link MessagingAnnotationPostProcessor} and {@link PublisherAnnotationBeanPostProcessor}, if necessary. + * Register {@link MessagingAnnotationPostProcessor} and + * {@link org.springframework.integration.aop.PublisherAnnotationBeanPostProcessor}, + * if necessary. * Inject {@code defaultPublishedChannel} from provided {@link AnnotationMetadata}, if any. * @param meta The {@link AnnotationMetadata} to get additional properties for {@link BeanDefinition}s. * @param registry The {@link BeanDefinitionRegistry} to register additional {@link BeanDefinition}s. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java index 3a415205ed..67f1791d02 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java @@ -22,20 +22,19 @@ import java.util.Map.Entry; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.expression.MapAccessor; -import org.springframework.core.convert.ConversionService; import org.springframework.expression.PropertyAccessor; -import org.springframework.expression.TypeConverter; import org.springframework.expression.spel.support.DataBindingPropertyAccessor; import org.springframework.expression.spel.support.SimpleEvaluationContext; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; /** *

    * {@link FactoryBean} to populate {@link SimpleEvaluationContext} instances enhanced with: *

      *
    • - * a {@link TypeConverter} based on the {@link ConversionService} from the application context. + * a {@link org.springframework.expression.TypeConverter} based on the + * {@link org.springframework.core.convert.ConversionService} + * from the application context. *
      • *
    • * a set of provided {@link PropertyAccessor}s including a default {@link MapAccessor}. @@ -46,7 +45,9 @@ import org.springframework.integration.expression.SpelPropertyAccessorRegistrar; *
    *

    * After initialization this factory populates functions and property accessors from - * {@link SpelFunctionFactoryBean}s and {@link SpelPropertyAccessorRegistrar}, respectively. + * {@link SpelFunctionFactoryBean}s and + * {@link org.springframework.integration.expression.SpelPropertyAccessorRegistrar}, + * respectively. * Functions and property accessors are also inherited from any parent context. *

    *

    diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java index e4d375b375..1d9cf725da 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.channel.DirectChannel; import org.springframework.util.StringUtils; /** @@ -33,13 +32,16 @@ import org.springframework.util.StringUtils; *

    * Includes logic to determine {@link org.springframework.messaging.MessageChannel}: * if 'channel' attribute is defined - uses its value as 'channelName'; - * if 'id' attribute is defined - creates {@link DirectChannel} at runtime and uses id's value as 'channelName'; + * if 'id' attribute is defined - creates + * {@link org.springframework.integration.channel.DirectChannel} + * at runtime and uses id's value as 'channelName'; * if current component is defined as nested element inside any other components e.g. <chain> * 'id' and 'channel' attributes will be ignored and this component will not be parsed as * {@link org.springframework.integration.endpoint.AbstractEndpoint}. * * @author Mark Fisher * @author Artem Bilan + * @author Gary Russell */ public abstract class AbstractChannelAdapterParser extends AbstractBeanDefinitionParser { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractCorrelatingMessageHandlerParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractCorrelatingMessageHandlerParser.java index 2d7e9dd93f..47ffcd7ace 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractCorrelatingMessageHandlerParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractCorrelatingMessageHandlerParser.java @@ -22,11 +22,11 @@ import org.springframework.beans.BeanMetadataElement; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.aggregator.AbstractCorrelatingMessageHandler; import org.springframework.util.xml.DomUtils; /** - * Base class for parsers that create an instance of {@link AbstractCorrelatingMessageHandler} + * Base class for parsers that create an instance of + * {@link org.springframework.integration.aggregator.AbstractCorrelatingMessageHandler}. * * @author Oleg Zhurakousky * @author Stefan Ferstl diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java index 26e4946238..5c60e64475 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java @@ -46,7 +46,6 @@ import org.springframework.integration.config.ExpressionFactoryBean; import org.springframework.integration.config.FixedSubscriberChannelBeanFactoryPostProcessor; import org.springframework.integration.config.IntegrationConfigUtils; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.endpoint.AbstractPollingEndpoint; import org.springframework.integration.transaction.TransactionHandleMessageAdvice; import org.springframework.transaction.interceptor.DefaultTransactionAttribute; import org.springframework.transaction.interceptor.MatchAlwaysTransactionAttributeSource; @@ -398,7 +397,7 @@ public abstract class IntegrationNamespaceUtils { * For example, this advisor will be applied on the Polling Task proxy. * @param txElement The transactional element. * @return The bean definition. - * @see AbstractPollingEndpoint + * @see org.springframework.integration.endpoint.AbstractPollingEndpoint */ public static BeanDefinition configureTransactionAttributes(Element txElement) { return configureTransactionAttributes(txElement, false); @@ -413,7 +412,7 @@ public abstract class IntegrationNamespaceUtils { * @param handleMessageAdvice flag if to use {@link TransactionHandleMessageAdvice} * or regular {@link TransactionInterceptor} * @return The bean definition. - * @see AbstractPollingEndpoint + * @see org.springframework.integration.endpoint.AbstractPollingEndpoint */ public static BeanDefinition configureTransactionAttributes(Element txElement, boolean handleMessageAdvice) { BeanDefinition txDefinition = configureTransactionDefinition(txElement); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java index 9ab35d0c64..90b9456d93 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -18,7 +18,6 @@ package org.springframework.integration.dispatcher; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Set; @@ -29,7 +28,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -37,9 +35,10 @@ import org.springframework.util.StringUtils; /** * Special Set that maintains the following semantics: * All elements that are un-ordered (do not implement {@link Ordered} interface or annotated - * {@link Order} annotation) will be stored in the order in which they were added. - * However, for all {@link Ordered} elements a - * {@link Comparator} (instantiated by default) for this implementation of {@link Set}, will be + * {@link org.springframework.core.annotation.Order} annotation) will be stored in the order + * in which they were added. However, for all {@link Ordered} elements a + * {@link java.util.Comparator} (instantiated by default) for this implementation of + * {@link Set}, will be * used. Those elements will have precedence over un-ordered elements. If elements have the same * order but themselves do not equal to one another the more recent addition will be placed to the * right of (appended next to) the existing element with the same order, thus preserving the order diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java index 1908eda247..8a099b81c3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java @@ -24,7 +24,6 @@ import java.util.concurrent.Executor; import org.springframework.integration.MessageDispatchingException; import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.MessageHandlingRunnable; import org.springframework.util.Assert; @@ -36,7 +35,7 @@ import org.springframework.util.Assert; * soon as one of the handlers accepts the Message, the dispatcher will * return true and ignore the rest of its handlers. *

    - * If the dispatcher has no handlers, a {@link MessageDeliveryException} will be + * If the dispatcher has no handlers, a {@link MessageDispatchingException} will be * thrown. If all handlers throw Exceptions, the dispatcher will throw an * {@link AggregateMessageDeliveryException}. *

    diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java index ed41e11c2f..a73a4ecef7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java @@ -32,7 +32,6 @@ import org.springframework.integration.transaction.TransactionInterceptorBuilder import org.springframework.messaging.MessageHandler; import org.springframework.scheduling.TaskScheduler; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.interceptor.DefaultTransactionAttribute; import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.util.Assert; @@ -110,7 +109,8 @@ public abstract class ConsumerEndpointSpec, /** * Specify a {@link TransactionInterceptor} {@link Advice} with the provided - * {@code PlatformTransactionManager} and default {@link DefaultTransactionAttribute} + * {@code PlatformTransactionManager} and default + * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute} * for the {@link MessageHandler}. * @param transactionManager the {@link PlatformTransactionManager} to use. * @return the spec. @@ -121,7 +121,8 @@ public abstract class ConsumerEndpointSpec, /** * Specify a {@link TransactionInterceptor} {@link Advice} with the provided - * {@code PlatformTransactionManager} and default {@link DefaultTransactionAttribute} + * {@code PlatformTransactionManager} and default + * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute} * for the {@link MessageHandler}. * @param transactionManager the {@link PlatformTransactionManager} to use. * @param handleMessageAdvice the flag to indicate the target {@link Advice} type: @@ -148,7 +149,9 @@ public abstract class ConsumerEndpointSpec, /** * Specify a {@link TransactionInterceptor} {@link Advice} with default - * {@code PlatformTransactionManager} and {@link DefaultTransactionAttribute} for the + * {@code PlatformTransactionManager} and + * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute} + * for the * {@link MessageHandler}. * @return the spec. */ @@ -158,8 +161,9 @@ public abstract class ConsumerEndpointSpec, /** * Specify a {@link TransactionInterceptor} {@link Advice} with default - * {@code PlatformTransactionManager} and {@link DefaultTransactionAttribute} for the - * {@link MessageHandler}. + * {@code PlatformTransactionManager} and + * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute} + * for the {@link MessageHandler}. * @param handleMessageAdvice the flag to indicate the target {@link Advice} type: * {@code false} - regular {@link TransactionInterceptor}; {@code true} - * {@link org.springframework.integration.transaction.TransactionHandleMessageAdvice} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java index c4a4010290..ca061ba2be 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/CorrelationHandlerSpec.java @@ -34,7 +34,6 @@ import org.springframework.integration.expression.FunctionExpression; import org.springframework.integration.expression.ValueExpression; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; -import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.locks.LockRegistry; import org.springframework.messaging.MessageChannel; import org.springframework.scheduling.TaskScheduler; @@ -47,6 +46,7 @@ import org.springframework.util.Assert; * @param the {@link AbstractCorrelatingMessageHandler} implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -316,7 +316,9 @@ public abstract class CorrelationHandlerSpec the target {@link ConsumerEndpointSpec} implementation type. * @param the target {@link BeanNameAware} implementation type. - * @param the target {@link MessageHandler} implementation type. + * @param the target {@link org.springframework.messaging.MessageHandler} + * implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -75,7 +74,7 @@ public abstract class EndpointSpec, F extends Be /** * @param pollers the pollers * @return the endpoint spec. - * @see AbstractPollingEndpoint + * @see org.springframework.integration.endpoint.AbstractPollingEndpoint * @see PollerFactory */ public S poller(Function pollers) { @@ -85,7 +84,7 @@ public abstract class EndpointSpec, F extends Be /** * @param pollerMetadataSpec the pollerMetadataSpec * @return the endpoint spec. - * @see AbstractPollingEndpoint + * @see org.springframework.integration.endpoint.AbstractPollingEndpoint * @see PollerSpec */ public S poller(PollerSpec pollerMetadataSpec) { @@ -99,21 +98,21 @@ public abstract class EndpointSpec, F extends Be /** * @param pollerMetadata the pollerMetadata * @return the endpoint spec. - * @see AbstractPollingEndpoint + * @see org.springframework.integration.endpoint.AbstractPollingEndpoint */ public abstract S poller(PollerMetadata pollerMetadata); /** * @param phase the phase. * @return the endpoint spec. - * @see SmartLifecycle + * @see org.springframework.context.SmartLifecycle */ public abstract S phase(int phase); /** * @param autoStartup the autoStartup. * @return the endpoint spec - * @see SmartLifecycle + * @see org.springframework.context.SmartLifecycle */ public abstract S autoStartup(boolean autoStartup); @@ -122,7 +121,7 @@ public abstract class EndpointSpec, F extends Be * Such endpoints can be started/stopped as a group. * @param role the role for this endpoint. * @return the endpoint spec - * @see SmartLifecycle + * @see org.springframework.context.SmartLifecycle * @see org.springframework.integration.support.SmartLifecycleRoleController */ public abstract S role(String role); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java index de364b9c29..8ae48da457 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java @@ -35,7 +35,6 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.aggregator.AggregatingMessageHandler; -import org.springframework.integration.aggregator.BarrierMessageHandler; import org.springframework.integration.channel.ChannelInterceptorAware; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.FixedSubscriberChannel; @@ -65,7 +64,6 @@ import org.springframework.integration.handler.LambdaMessageProcessor; import org.springframework.integration.handler.LoggingHandler; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.handler.MessageTriggerAction; -import org.springframework.integration.handler.MethodInvokingMessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.router.AbstractMessageRouter; import org.springframework.integration.router.ErrorMessageExceptionTypeRouter; @@ -81,7 +79,6 @@ import org.springframework.integration.store.MessageStore; import org.springframework.integration.support.MapBuilder; import org.springframework.integration.transformer.ClaimCheckInTransformer; import org.springframework.integration.transformer.ClaimCheckOutTransformer; -import org.springframework.integration.transformer.ContentEnricher; import org.springframework.integration.transformer.ExpressionEvaluatingTransformer; import org.springframework.integration.transformer.GenericTransformer; import org.springframework.integration.transformer.HeaderFilter; @@ -959,7 +956,7 @@ public abstract class IntegrationFlowDefinition @@ -1250,7 +1248,8 @@ public abstract class IntegrationFlowDefinition>headerFunction("foo", m -> m.getPayload().get("name"))) * } * - * @param enricherConfigurer the {@link Consumer} to provide {@link ContentEnricher} options. + * @param enricherConfigurer the {@link Consumer} to provide + * {@link org.springframework.integration.transformer.ContentEnricher} options. * @return the current {@link IntegrationFlowDefinition}. * @see EnricherSpec */ @@ -2882,7 +2881,8 @@ public abstract class IntegrationFlowDefinition barrierConfigurer) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java index 8860a236af..adac682722 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java @@ -28,7 +28,6 @@ import org.springframework.integration.dsl.support.FixedSubscriberChannelPrototy import org.springframework.integration.dsl.support.MessageChannelReference; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.endpoint.MethodInvokingMessageSource; -import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.gateway.AnnotationGatewayProxyFactoryBean; import org.springframework.integration.gateway.GatewayProxyFactoryBean; import org.springframework.integration.gateway.MessagingGatewaySupport; @@ -163,7 +162,8 @@ public final class IntegrationFlows { /** * Provides {@link Supplier} as source of messages to the integration flow. - * which will be triggered by a provided {@link SourcePollingChannelAdapter}. + * which will be triggered by a provided + * {@link org.springframework.integration.endpoint.SourcePollingChannelAdapter}. * @param messageSource the {@link Supplier} to populate. * @param endpointConfigurer the {@link Consumer} to provide more options for the * {@link org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java index 5678da6373..19e9f00c78 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PollerSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -32,7 +32,6 @@ import org.springframework.integration.transaction.TransactionSynchronizationFac import org.springframework.messaging.MessageChannel; import org.springframework.scheduling.Trigger; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.interceptor.DefaultTransactionAttribute; import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.util.ErrorHandler; @@ -145,7 +144,8 @@ public final class PollerSpec extends IntegrationComponentSpec In most cases an associated internal {@link StandardIntegrationFlow} - * exposes an {@code inputChannel} bean for the target {@link IntegrationFlow}, + * exposes an {@code inputChannel} bean for the target + * {@link org.springframework.integration.dsl.IntegrationFlow}, * which doesn't start from the channel, e.g. instantiated from lambda. * This way the advice first tries to obtain an {@code inputChannel} from the - * target {@link IntegrationFlow} and then falls back to the {@link #delegate}. + * target {@link org.springframework.integration.dsl.IntegrationFlow} + * and then falls back to the {@link #delegate}. * *

    Another aspect of this advice is to control and delegate {@link SmartLifecycle} - * of the target {@link IntegrationFlow} and associated {@link #delegate}. + * of the target {@link org.springframework.integration.dsl.IntegrationFlow} and associated {@link #delegate}. * The {@link SmartLifecycle#start()} and {@link SmartLifecycle#stop()} operations * are delegated to the {@link StandardIntegrationFlow} as is because that instance * isn't controlled by the standard application context lifecycle. * The {@link SmartLifecycle#isAutoStartup()}, {@link SmartLifecycle#getPhase()} * and {@link SmartLifecycle#isRunning()} are called on the {@link #delegate} * only in case when {@link MethodInvocation#proceed()} returns {@code null} - * or isn't called at all, e.g. when target {@link IntegrationFlow} doesn't + * or isn't called at all, e.g. when the target + * {@link org.springframework.integration.dsl.IntegrationFlow} doesn't * implement {@link SmartLifecycle}. * * @author Artem Bilan + * @author Gary Russell * * @since 5.1 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java index 065fb533fe..97234a5fc0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/context/StandardIntegrationFlowContext.java @@ -34,7 +34,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.support.context.NamedComponent; -import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -192,7 +191,8 @@ public final class StandardIntegrationFlowContext implements IntegrationFlowCont * Obtain a {@link MessagingTemplate} with its default destination set to the input channel * of the {@link IntegrationFlow} for provided {@code flowId}. *

    Any {@link IntegrationFlow} bean (not only manually registered) can be used for this method. - *

    If {@link IntegrationFlow} doesn't start with the {@link MessageChannel}, the + *

    If {@link IntegrationFlow} doesn't start with the + * {@link org.springframework.messaging.MessageChannel}, the * {@link IllegalStateException} is thrown. * @param flowId the bean name to obtain the input channel from * @return the {@link MessagingTemplate} instance diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java index 07e7bf3ae7..3460adb05e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java @@ -35,7 +35,6 @@ import org.springframework.core.task.SyncTaskExecutor; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.support.MessagingExceptionWrapper; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; import org.springframework.integration.transaction.IntegrationResourceHolder; import org.springframework.integration.transaction.IntegrationResourceHolderSynchronization; import org.springframework.integration.transaction.PassThroughTransactionSynchronizationFactory; @@ -441,7 +440,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement /** * Return the key under which the resource will be made available as an * attribute on the {@link IntegrationResourceHolder}. The default - * {@link ExpressionEvaluatingTransactionSynchronizationProcessor} + * {@link org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor} * makes this attribute available as a variable in SpEL expressions. * @return The key, or null (default) if the resource shouldn't be * made available as a attribute. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java index a335eb5e9a..b3b2f7cef7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java @@ -20,14 +20,13 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.Lifecycle; -import org.springframework.integration.core.MessageSource; import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; /** - * A {@link MessageSource} implementation that invokes a no-argument method so - * that its return value may be sent to a channel. + * A {@link org.springframework.integration.core.MessageSource} implementation that + * invokes a no-argument method so that its return value may be sent to a channel. * * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java index 31ef2e739c..49dba34249 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/ExpressionEvaluatingSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -20,15 +20,16 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; /** - * A {@link MessageSelector} implementation that evaluates a SpEL expression. - * The evaluation result of the expression must be a boolean value. + * A {@link org.springframework.integration.core.MessageSelector} implementation that + * evaluates a SpEL expression. The evaluation result of the expression must be a boolean + * value. * * @author Mark Fisher * @author Liujiong + * @author Gary Russell * @since 2.0 */ public class ExpressionEvaluatingSelector extends AbstractMessageProcessingSelector { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java index c78c3e1c50..1f4e473cb5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2018 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. @@ -19,16 +19,17 @@ package org.springframework.integration.filter; import java.lang.reflect.Method; import org.springframework.integration.annotation.Filter; -import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.handler.MethodInvokingMessageProcessor; import org.springframework.util.Assert; /** - * A method-invoking implementation of {@link MessageSelector}. + * A method-invoking implementation of + * {@link org.springframework.integration.core.MessageSelector}. * * @author Mark Fisher * @author Artem Bilan + * @author Gary Russell */ public class MethodInvokingSelector extends AbstractMessageProcessingSelector { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 4a9b7b7de2..f51e013f97 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -45,7 +45,6 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.FactoryBean; import org.springframework.core.MethodParameter; -import org.springframework.core.convert.ConversionService; import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.SimpleAsyncTaskExecutor; @@ -62,7 +61,6 @@ import org.springframework.integration.expression.ValueExpression; import org.springframework.integration.support.DefaultMessageBuilderFactory; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.management.TrackableComponent; -import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -85,8 +83,11 @@ import reactor.core.publisher.Mono; * Generates a proxy for the provided service interface to enable interaction * with messaging components without application code being aware of them allowing * for POJO-style interaction. - * This component is also aware of the {@link ConversionService} set on the enclosing {@link BeanFactory} - * under the name {@link IntegrationUtils#INTEGRATION_CONVERSION_SERVICE_BEAN_NAME} to + * This component is also aware of the + * {@link org.springframework.core.convert.ConversionService} set on the enclosing {@link BeanFactory} + * under the name + * {@link org.springframework.integration.support.utils.IntegrationUtils#INTEGRATION_CONVERSION_SERVICE_BEAN_NAME} + * to * perform type conversions when necessary (thanks to Jon Schneider's contribution and suggestion in INT-1230). * * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java index 90c2c685af..a7da989796 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -18,11 +18,11 @@ package org.springframework.integration.gateway; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** - * Adapts a {@link RequestReplyExchanger} to the {@link MessageHandler} interface. + * Adapts a {@link RequestReplyExchanger} to the + * {@link org.springframework.messaging.MessageHandler} interface. * * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 52e809ccd3..78233062f1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -39,7 +39,6 @@ import org.springframework.integration.support.management.metrics.TimerFacade; import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; -import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import reactor.core.CoreSubscriber; @@ -48,7 +47,7 @@ import reactor.core.CoreSubscriber; * Base class for MessageHandler implementations that provides basic validation * and error handling capabilities. Asserts that the incoming Message is not * null and that it does not contain a null payload. Converts checked exceptions - * into runtime {@link MessagingException}s. + * into runtime {@link org.springframework.messaging.MessagingException}s. * * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 27cb05b624..7b7fc70d27 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -36,7 +36,6 @@ import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationException; import org.springframework.expression.Expression; import org.springframework.integration.IntegrationMessageHeaderAccessor; -import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -51,7 +50,6 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.scheduling.TaskScheduler; -import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; @@ -126,9 +124,10 @@ public class DelayHandler extends AbstractReplyProducingMessageHandler implement * Create a DelayHandler with the given 'messageGroupId' that is used as 'key' for * {@link MessageGroup} to store delayed Messages in the {@link MessageGroupStore}. * The sending of Messages after the delay will be handled by registered in the - * ApplicationContext default {@link ThreadPoolTaskScheduler}. + * ApplicationContext default + * {@link org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler}. * @param messageGroupId The message group identifier. - * @see IntegrationObjectSupport#getTaskScheduler() + * @see #getTaskScheduler() */ public DelayHandler(String messageGroupId) { Assert.notNull(messageGroupId, "'messageGroupId' must not be null"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java index a06fc70946..20aaef3cb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java @@ -23,7 +23,6 @@ import java.util.concurrent.locks.ReentrantLock; import org.springframework.context.Lifecycle; import org.springframework.integration.core.MessageProducer; -import org.springframework.integration.filter.MessageFilter; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; @@ -41,7 +40,8 @@ import org.springframework.util.Assert; * It is expected that each handler will produce reply messages and send them to * its output channel, although this is not enforced. It is possible to filter * messages in the middle of the chain, for example using a - * {@link MessageFilter}. A {@link MessageHandler} returning null will have the + * {@link org.springframework.integration.filter.MessageFilter}. + * A {@link MessageHandler} returning null will have the * same effect, although this option is less expressive. *

    * This component can be used from the namespace to improve the readability of diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java index 34c2cfc380..18a06bf4a9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -21,12 +21,12 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.Lifecycle; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** - * A {@link MessageHandler} that invokes the specified method on the provided object. + * A {@link org.springframework.messaging.MessageHandler} that invokes the specified + * method on the provided object. * * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java index fff3c6714e..ff3cc4dae1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -25,14 +25,14 @@ import org.apache.commons.logging.LogFactory; import org.springframework.aop.ProxyMethodInvocation; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; /** - * Base class for {@link MessageHandler} advice classes. Subclasses should provide - * an implementation for {@link #doInvoke(ExecutionCallback, Object, Message)}. - * Used to advise the handleRequestMessage method for {@link AbstractReplyProducingMessageHandler} or + * Base class for {@link MessageHandler} advice classes. Subclasses should provide an + * implementation for {@link #doInvoke(ExecutionCallback, Object, Message)}. Used to + * advise the handleRequestMessage method for + * {@link org.springframework.integration.handler.AbstractReplyProducingMessageHandler} or * {@link MessageHandler#handleMessage(Message)} for other message handlers. * * @author Gary Russell diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java index a83818ea92..ea14ec3528 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java @@ -25,12 +25,11 @@ 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.MessagingException; import org.springframework.messaging.support.ErrorMessage; /** - * Used to advise {@link MessageHandler}s. + * Used to advise {@link org.springframework.messaging.MessageHandler}s. * 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 an {@link AdviceMessage} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java index cf05a4f5fc..b2c18dea5a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java @@ -16,7 +16,6 @@ package org.springframework.integration.handler.advice; -import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.integration.IntegrationMessageHeaderAccessor; @@ -25,15 +24,15 @@ import org.springframework.integration.core.MessageSelector; import org.springframework.integration.core.MessagingTemplate; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** - * The {@link MethodInterceptor} implementation for the + * The {@link org.aopalliance.intercept.MethodInterceptor} implementation for the * Idempotent Receiver * E.I. Pattern. *

    - * This {@link MethodInterceptor} works like a {@code MessageFilter} if {@link #discardChannel} + * This {@link org.aopalliance.intercept.MethodInterceptor} works like a + * {@code MessageFilter} if {@link #discardChannel} * is provided or {@link #throwExceptionOnRejection} is set to {@code true}. * However if those properties aren't provided, this interceptor will create an new {@link Message} * with a {@link IntegrationMessageHeaderAccessor#DUPLICATE_MESSAGE} header when the @@ -41,7 +40,8 @@ import org.springframework.util.Assert; *

    * The {@code idempotent filtering} logic depends on the provided {@link MessageSelector}. *

    - * This class is designed to be used only for the {@link MessageHandler#handleMessage}, + * This class is designed to be used only for the + * {@link org.springframework.messaging.MessageHandler#handleMessage}, * method. * * @author Artem Bilan diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MapArgumentResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MapArgumentResolver.java index 5c251c6095..c107663ed2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MapArgumentResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/MapArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 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. @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Properties; import org.springframework.core.MethodParameter; -import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.integration.util.AbstractExpressionEvaluator; import org.springframework.messaging.Message; @@ -38,9 +37,11 @@ import org.springframework.messaging.handler.invocation.HandlerMethodArgumentRes *

    * If {@link MethodParameter} is of {@link Properties} type and {@link Message#getPayload()} * is a {@link String} containing {@code =} symbol, the {@link MapArgumentResolver} uses - * {@link ConversionService} trying to convert that {@link String} to the {@link Properties} object. + * the {@link org.springframework.core.convert.ConversionService} trying to convert that + * {@link String} to a {@link Properties} object. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java index 1762d621c8..70e1db5ae1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java @@ -22,7 +22,6 @@ import java.util.Collection; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.MessageSource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; import org.springframework.integration.endpoint.AbstractMessageSource; @@ -33,8 +32,9 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; /** - * Implementation of {@link MessageSource} based on {@link ResourcePatternResolver} which will - * attempt to resolve {@link Resource}s based on the pattern specified. + * Implementation of {@link org.springframework.integration.core.MessageSource} based on + * {@link ResourcePatternResolver} which will attempt to resolve {@link Resource}s based + * on the pattern specified. * * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java index ac3ec4bde4..db22abdb1d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -36,7 +36,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessagingException; import org.springframework.messaging.core.DestinationResolutionException; -import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -79,7 +78,8 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter /** * Provide mappings from channel keys to channel names. - * Channel names will be resolved by the {@link DestinationResolver}. + * Channel names will be resolved by the + * {@link org.springframework.messaging.core.DestinationResolver}. * @param channelMappings The channel mappings. */ @Override diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index 43523bfcd6..3d7b8337cf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -21,7 +21,6 @@ import java.util.UUID; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.integration.channel.NullChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.support.management.IntegrationManagedResource; @@ -63,7 +62,8 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler imple * resolution fails to return any channels, the router will throw an * {@link MessageDeliveryException}. *

    - * If messages shall be ignored (dropped) instead, please provide a {@link NullChannel}. + * If messages shall be ignored (dropped) instead, please provide a + * {@link org.springframework.integration.channel.NullChannel}. * @param defaultOutputChannel The default output channel. */ public void setDefaultOutputChannel(MessageChannel defaultOutputChannel) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java index 0a6fe20e42..895859e192 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java @@ -26,12 +26,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; /** - * A Message Router that resolves the target {@link MessageChannel} for + * A Message Router that resolves the target + * {@link org.springframework.messaging.MessageChannel} for * messages whose payload is a {@link Throwable}. * The channel resolution is based upon the most specific cause * of the error for which a channel-mapping exists. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java index c755a0ae8a..23cf0a6d6c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -21,11 +21,11 @@ import java.util.Collections; import java.util.List; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.util.CollectionUtils; /** - * A Message Router that resolves the {@link MessageChannel} based on the + * A Message Router that resolves the {@link org.springframework.messaging.MessageChannel} + * based on the * {@link Message Message's} payload type. * * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/ChannelMessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/ChannelMessageStore.java index 548610cd30..03a1306898 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/ChannelMessageStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/ChannelMessageStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 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. @@ -16,11 +16,9 @@ package org.springframework.integration.store; -import org.springframework.integration.channel.QueueChannel; - /** * A marker interface that indicates this message store has optimizations for - * use in a {@link QueueChannel}. + * use in a {@link org.springframework.integration.channel.QueueChannel}. * * @author Gary Russell * @since 4.0 diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStoreReaper.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStoreReaper.java index 0c7de6ece8..31c2712eda 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStoreReaper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStoreReaper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationContext; import org.springframework.context.SmartLifecycle; import org.springframework.util.Assert; @@ -63,7 +62,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia /** * Flag to indicate that the stores should be expired when this component is destroyed (i.e. usually when its - * enclosing {@link ApplicationContext} is closed). + * enclosing {@link org.springframework.context.ApplicationContext} is closed). * * @param expireOnDestroy the flag value to set */ @@ -90,10 +89,12 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia this.messageGroupStore = messageGroupStore; } + @Override public void afterPropertiesSet() throws Exception { Assert.state(this.messageGroupStore != null, "A MessageGroupStore must be provided"); } + @Override public void destroy() throws Exception { if (this.expireOnDestroy) { if (this.isRunning()) { @@ -110,6 +111,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia * Expire all message groups older than the {@link #setTimeout(long) timeout} provided. Normally this method would * be executed by a scheduled task. */ + @Override public void run() { if (this.timeout >= 0 && this.isRunning()) { if (logger.isDebugEnabled()) { @@ -120,6 +122,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia } } + @Override public final void start() { this.lifecycleLock.lock(); try { @@ -135,6 +138,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia } } + @Override public void stop() { this.lifecycleLock.lock(); try { @@ -154,6 +158,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia } } + @Override public final boolean isRunning() { this.lifecycleLock.lock(); try { @@ -164,6 +169,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia } } + @Override public int getPhase() { return this.phase; } @@ -172,6 +178,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia this.phase = phase; } + @Override public boolean isAutoStartup() { return this.autoStartup; } @@ -180,6 +187,7 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia this.autoStartup = autoStartup; } + @Override public void stop(Runnable callback) { this.lifecycleLock.lock(); try { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultMessageBuilderFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultMessageBuilderFactory.java index 87a4558d4a..aff3ecb933 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultMessageBuilderFactory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/DefaultMessageBuilderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 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. @@ -19,7 +19,6 @@ package org.springframework.integration.support; import java.util.Arrays; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; /** * @author Gary Russell @@ -35,7 +34,8 @@ public class DefaultMessageBuilderFactory implements MessageBuilderFactory { * Specify a list of headers which should be considered as a read only * and prohibited from the population to the message. * @param readOnlyHeaders the list of headers for {@code readOnly} mode. - * Defaults to {@link MessageHeaders#ID} and {@link MessageHeaders#TIMESTAMP}. + * Defaults to {@link org.springframework.messaging.MessageHeaders#ID} + * and {@link org.springframework.messaging.MessageHeaders#TIMESTAMP}. * @since 4.3.2 */ public void setReadOnlyHeaders(String... readOnlyHeaders) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java index 0083a57bc0..0f48418651 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MutableMessage.java @@ -20,19 +20,19 @@ import java.io.Serializable; import java.util.Map; import java.util.UUID; -import org.springframework.integration.store.SimpleMessageStore; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import org.springframework.messaging.support.GenericMessage; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; /** * An implementation of {@link Message} with a generic payload. Unlike - * {@link GenericMessage}, this message (or its headers) can be modified after creation. + * {@link org.springframework.messaging.support.GenericMessage}, + * this message (or its headers) can be modified after creation. * Great care must be taken, when mutating messages, that some other element/thread is not * concurrently using the message. Also note that any in-memory stores (such as - * {@link SimpleMessageStore}) may have a reference to the message and changes will be + * {@link org.springframework.integration.store.SimpleMessageStore}) + * may have a reference to the message and changes will be * reflected there too. * *

    diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/NullAwarePayloadArgumentResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/support/NullAwarePayloadArgumentResolver.java index 29f32fc7c6..3c480a0579 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/NullAwarePayloadArgumentResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/NullAwarePayloadArgumentResolver.java @@ -17,13 +17,13 @@ package org.springframework.integration.support; import org.springframework.messaging.converter.MessageConverter; -import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.handler.annotation.support.PayloadArgumentResolver; import org.springframework.validation.Validator; /** * A {@link PayloadArgumentResolver} that treats KafkaNull payloads as null. - * {@link Payload @Paylaod} annotation must have required = false. + * {@link org.springframework.messaging.handler.annotation.Payload @Paylaod} + * annotation must have required = false. * * @author Gary Russell * @since 5.1 diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java b/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java index f67403959a..d10f9ae77f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiator.java @@ -35,8 +35,6 @@ import org.springframework.integration.leader.Context; import org.springframework.integration.leader.DefaultCandidate; import org.springframework.integration.leader.event.DefaultLeaderEventPublisher; import org.springframework.integration.leader.event.LeaderEventPublisher; -import org.springframework.integration.leader.event.OnGrantedEvent; -import org.springframework.integration.leader.event.OnRevokedEvent; import org.springframework.integration.support.locks.LockRegistry; import org.springframework.scheduling.concurrent.CustomizableThreadFactory; import org.springframework.util.Assert; @@ -80,8 +78,9 @@ public class LockRegistryLeaderInitiator implements SmartLifecycle, DisposableBe /** * Candidate for leader election. User injects this to receive callbacks on leadership - * events. Alternatively applications can listen for the {@link OnGrantedEvent} and - * {@link OnRevokedEvent}, as long as the + * events. Alternatively applications can listen for the + * {@link org.springframework.integration.leader.event.OnGrantedEvent} and + * {@link org.springframework.integration.leader.event.OnRevokedEvent}, as long as the * {@link #setLeaderEventPublisher(LeaderEventPublisher) leaderEventPublisher} is set. */ private final Candidate candidate; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagedResource.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagedResource.java index 0292040602..4c8209b057 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagedResource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagedResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 the original author or authors. + * Copyright 2015-2018 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. @@ -24,10 +24,10 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.core.annotation.AliasFor; -import org.springframework.jmx.export.annotation.ManagedResource; /** - * Clone of {@link ManagedResource} limiting beans thus annotated so that they + * Clone of {@link org.springframework.jmx.export.annotation.ManagedResource} + * limiting beans thus annotated so that they * will only be exported by the {@code IntegrationMBeanExporter} and prevented * from being exported by other MBeanExporters (if present). * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/MappingMessageRouterManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MappingMessageRouterManagement.java index 9ad51be164..f9dcdb0552 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/MappingMessageRouterManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/MappingMessageRouterManagement.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -22,7 +22,6 @@ import java.util.Properties; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedOperation; -import org.springframework.messaging.core.DestinationResolver; /** * Exposes channel mapping operations when the router is proxied. @@ -68,7 +67,8 @@ public interface MappingMessageRouterManagement { /** * Provide mappings from channel keys to channel names. - * Channel names will be resolved by the {@link DestinationResolver}. + * Channel names will be resolved by the + * {@link org.springframework.messaging.core.DestinationResolver}. * @param channelMappings The channel mappings. * @since 4.0 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java index 55055e8d99..1d8705e887 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java @@ -26,13 +26,13 @@ import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.util.Assert; /** * This implementation of {@link TransactionSynchronizationFactory} * allows you to configure SpEL expressions, with their execution being coordinated - * (synchronized) with a transaction - see {@link TransactionSynchronization}. + * (synchronized) with a transaction - see + * {@link org.springframework.transaction.support.TransactionSynchronization}. * Expressions for {@code before-commit}, {@code after-commit}, and {@code after-rollback} * are supported, together with a {@code channel} for each where the evaluation result * (if any) will be sent. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java index c69056cc5e..b4c304d04c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -16,15 +16,15 @@ package org.springframework.integration.transaction; -import org.springframework.integration.core.MessageSource; -import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; import org.springframework.transaction.support.AbstractPlatformTransactionManager; import org.springframework.transaction.support.DefaultTransactionStatus; /** - * An implementation of {@link PlatformTransactionManager} that provides transaction-like semantics to - * {@link MessageSource}s that are not inherently transactional. It does not make such + * An implementation of {@link org.springframework.transaction.PlatformTransactionManager} + * that provides transaction-like semantics to + * {@link org.springframework.integration.core.MessageSource}s that are not inherently + * transactional. It does not make such * sources transactional; rather, together with a {@link TransactionSynchronizationFactory}, it provides * the ability to synchronize operations after a flow completes, via beforeCommit, afterCommit and * afterRollback operations. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java index 1f28cfea40..2868bea889 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2018 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. @@ -18,10 +18,7 @@ package org.springframework.integration.transaction; import java.util.Properties; -import org.aopalliance.aop.Advice; - import org.springframework.integration.handler.advice.HandleMessageAdvice; -import org.springframework.messaging.MessageHandler; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.interceptor.TransactionAttributeSource; import org.springframework.transaction.interceptor.TransactionInterceptor; @@ -29,8 +26,9 @@ import org.springframework.transaction.interceptor.TransactionInterceptor; /** * A {@link TransactionInterceptor} extension with {@link HandleMessageAdvice} marker. *

    - * When this {@link Advice} is used from the {@code request-handler-advice-chain}, it is applied - * to the {@link MessageHandler#handleMessage} + * When this {@link org.aopalliance.aop.Advice} + * is used from the {@code request-handler-advice-chain}, it is applied + * to the {@link org.springframework.messaging.MessageHandler#handleMessage} * (not to the * {@link org.springframework.integration.handler.AbstractReplyProducingMessageHandler.RequestHandler#handleRequestMessage}), * therefore the entire downstream process is wrapped to the transaction. @@ -38,6 +36,7 @@ import org.springframework.transaction.interceptor.TransactionInterceptor; * In any other cases it is operated as a regular {@link TransactionInterceptor}. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java index 93d1f63fd9..43d1a0b36d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java @@ -23,17 +23,18 @@ import org.springframework.context.Lifecycle; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.context.NamedComponent; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** - * A reply-producing {@link MessageHandler} that delegates to a + * A reply-producing {@link org.springframework.messaging.MessageHandler} + * that delegates to a * {@link Transformer} instance to modify the received {@link Message} * and sends the result to its output channel. * * @author Mark Fisher * @author Oleg Zhurakousky * @author Artem Bilan + * @author Gary Russell */ public class MessageTransformingHandler extends AbstractReplyProducingMessageHandler implements Lifecycle { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java b/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java index 922b9407e7..68f2cf9c27 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/DynamicPeriodicTrigger.java @@ -22,13 +22,13 @@ import java.util.concurrent.TimeUnit; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; -import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.Assert; /** * This is a dynamically changeable {@link Trigger}. It is based on the - * {@link PeriodicTrigger} implementations. However, the fields of this dynamic + * {@link org.springframework.scheduling.support.PeriodicTrigger} + * implementations. However, the fields of this dynamic * trigger are not final and the properties can be inspected and set via * explicit getters and setters. Changes to the trigger take effect after the * next execution. diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java index 25169fea68..37a446db33 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -20,7 +20,6 @@ import java.util.HashSet; import java.util.Set; import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationListener; import org.springframework.context.PayloadApplicationEvent; import org.springframework.context.event.ApplicationEventMulticaster; import org.springframework.context.event.ContextClosedEvent; @@ -34,7 +33,7 @@ import org.springframework.messaging.Message; import org.springframework.util.Assert; /** - * An inbound Channel Adapter that implements {@link ApplicationListener} and + * An inbound Channel Adapter that implements {@link GenericApplicationListener} and * passes Spring {@link ApplicationEvent ApplicationEvents} within messages. * If a {@link #setPayloadExpression payloadExpression} is provided, it will be evaluated against * the ApplicationEvent instance to create the Message payload. Otherwise, the event itself will be the payload. @@ -64,7 +63,7 @@ public class ApplicationEventListeningMessageProducer extends ExpressionMessageP * Set the list of event types (classes that extend ApplicationEvent) that * this adapter should send to the message channel. By default, all event * types will be sent. - * In addition, this method re-registers the current instance as a {@link ApplicationListener} + * In addition, this method re-registers the current instance as a {@link GenericApplicationListener} * with the {@link ApplicationEventMulticaster} which clears the listener cache. The cache will be * refreshed on the next appropriate {@link ApplicationEvent}. * diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java index dd64c31f71..ee37333562 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.io.Resource; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.integration.metadata.MetadataStore; import org.springframework.integration.metadata.SimpleMetadataStore; @@ -43,8 +42,9 @@ import com.rometools.rome.io.SyndFeedInput; import com.rometools.rome.io.XmlReader; /** - * This implementation of {@link MessageSource} will produce individual - * {@link SyndEntry}s for a feed identified with the 'feedUrl' attribute. + * This implementation of {@link org.springframework.integration.core.MessageSource} will + * produce individual {@link SyndEntry}s for a feed identified with the 'feedUrl' + * attribute. * * @author Josh Long * @author Mario Gray diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java index c33dd0f450..18f5aad27d 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java @@ -42,10 +42,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import org.springframework.context.Lifecycle; -import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor; -import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.AbstractMessageSource; -import org.springframework.integration.file.filters.AcceptOnceFileListFilter; import org.springframework.integration.file.filters.DiscardAwareFileListFilter; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.filters.ResettableFileListFilter; @@ -54,17 +51,21 @@ import org.springframework.messaging.Message; import org.springframework.util.Assert; /** - * {@link MessageSource} that creates messages from a file system directory. + * {@link org.springframework.integration.core.MessageSource} that creates messages + * from a file system directory. * To prevent messages for certain files, you may supply a {@link FileListFilter}. - * By default, an {@link AcceptOnceFileListFilter} is used. + * By default, when configuring with XML or the DSL, + * an {@link org.springframework.integration.file.filters.AcceptOnceFileListFilter} is used. * It ensures files are picked up only once from the directory. *

    * A common problem with reading files is that a file may be detected before it - * is ready. The default {@link AcceptOnceFileListFilter} + * is ready. The default + * {@link org.springframework.integration.file.filters.AcceptOnceFileListFilter} * does not prevent this. In most cases, this can be prevented if the * file-writing process renames each file as soon as it is ready for reading. A * pattern-matching filter that accepts only files that are ready (e.g. based on - * a known suffix), composed with the default {@link AcceptOnceFileListFilter} + * a known suffix), composed with the default + * {@link org.springframework.integration.file.filters.AcceptOnceFileListFilter} * would allow for this. *

    * If a external {@link DirectoryScanner} is used, then the {@link FileLocker} @@ -74,7 +75,8 @@ import org.springframework.util.Assert; *

    * A {@link Comparator} can be used to ensure internal ordering of the Files in * a {@link PriorityBlockingQueue}. This does not provide the same guarantees as - * a {@link ResequencingMessageGroupProcessor}, but in cases where writing files + * a {@link org.springframework.integration.aggregator.ResequencingMessageGroupProcessor}, + * but in cases where writing files * and failure downstream are rare it might be sufficient. *

    * FileReadingMessageSource is fully thread-safe under concurrent diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java index 6be70aeef0..9092aa5bff 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java @@ -61,7 +61,6 @@ import org.springframework.integration.support.locks.LockRegistry; import org.springframework.integration.support.locks.PassThruLockRegistry; import org.springframework.integration.util.WhileLockedProcessor; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandlingException; import org.springframework.scheduling.TaskScheduler; import org.springframework.util.Assert; @@ -69,7 +68,8 @@ import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; /** - * A {@link MessageHandler} implementation that writes the Message payload to a + * A {@link org.springframework.messaging.MessageHandler} implementation + * that writes the Message payload to a * file. If the payload is a File object, it will copy the File to the specified * destination directory. If the payload is a byte array, a String or an * InputStream it will be written directly. Otherwise, the payload type is diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileInboundChannelAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileInboundChannelAdapterSpec.java index e2e6af4d7f..30157bd3f1 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileInboundChannelAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileInboundChannelAdapterSpec.java @@ -30,13 +30,8 @@ import org.springframework.integration.file.DirectoryScanner; import org.springframework.integration.file.FileLocker; import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.integration.file.config.FileListFilterFactoryBean; -import org.springframework.integration.file.filters.AcceptAllFileListFilter; -import org.springframework.integration.file.filters.AcceptOnceFileListFilter; import org.springframework.integration.file.filters.ExpressionFileListFilter; import org.springframework.integration.file.filters.FileListFilter; -import org.springframework.integration.file.filters.IgnoreHiddenFileListFilter; -import org.springframework.integration.file.filters.RegexPatternFileListFilter; -import org.springframework.integration.file.filters.SimplePatternFileListFilter; import org.springframework.integration.file.locking.NioFileLocker; import org.springframework.util.Assert; @@ -144,9 +139,12 @@ public class FileInboundChannelAdapterSpec } /** - * Configure an {@link AcceptOnceFileListFilter} if {@code preventDuplicates == true}, - * otherwise - {@link AcceptAllFileListFilter}. - * @param preventDuplicates true to configure an {@link AcceptOnceFileListFilter}. + * Configure an + * {@link org.springframework.integration.file.filters.AcceptOnceFileListFilter} if + * {@code preventDuplicates == true}, otherwise - + * {@link org.springframework.integration.file.filters.AcceptAllFileListFilter}. + * @param preventDuplicates true to configure an + * {@link org.springframework.integration.file.filters.AcceptOnceFileListFilter}. * @return the spec. */ public FileInboundChannelAdapterSpec preventDuplicates(boolean preventDuplicates) { @@ -156,9 +154,11 @@ public class FileInboundChannelAdapterSpec } /** - /** - * Configure an {@link IgnoreHiddenFileListFilter} if {@code ignoreHidden == true}. - * @param ignoreHidden true to configure an {@link IgnoreHiddenFileListFilter}. + * Configure an + * {@link org.springframework.integration.file.filters.IgnoreHiddenFileListFilter} if + * {@code ignoreHidden == true}. + * @param ignoreHidden true to configure an + * {@link org.springframework.integration.file.filters.IgnoreHiddenFileListFilter}. * @return the spec. */ public FileInboundChannelAdapterSpec ignoreHidden(boolean ignoreHidden) { @@ -168,7 +168,8 @@ public class FileInboundChannelAdapterSpec } /** - * Configure a {@link SimplePatternFileListFilter}. + * Configure a + * {@link org.springframework.integration.file.filters.SimplePatternFileListFilter}. * @param pattern The pattern. * @return the spec. * @see FileReadingMessageSource#setFilter(FileListFilter) @@ -181,7 +182,8 @@ public class FileInboundChannelAdapterSpec } /** - * Configure a {@link RegexPatternFileListFilter}. + * Configure a + * {@link org.springframework.integration.file.filters.RegexPatternFileListFilter}. * @param regex The regex. * @return the spec. * @see FileReadingMessageSource#setFilter(FileListFilter) diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileWritingMessageHandlerSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileWritingMessageHandlerSpec.java index ea826c2a06..dd16f7d03e 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileWritingMessageHandlerSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/FileWritingMessageHandlerSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -26,7 +26,6 @@ import org.springframework.integration.dsl.ComponentsRegistration; import org.springframework.integration.dsl.MessageHandlerSpec; import org.springframework.integration.expression.FunctionExpression; import org.springframework.integration.file.DefaultFileNameGenerator; -import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.FileWritingMessageHandler; import org.springframework.integration.file.support.FileExistsMode; @@ -136,11 +135,11 @@ public class FileWritingMessageHandlerSpec } /** - * Specify whether to delete source Files after writing to the destination - * directory. The default is false. When set to true, it - * will only have an effect if the inbound Message has a File payload or - * a {@link FileHeaders#ORIGINAL_FILE} header value containing either a - * File instance or a String representing the original file path. + * Specify whether to delete source Files after writing to the destination directory. + * The default is false. When set to true, it will only have an + * effect if the inbound Message has a File payload or a + * {@link org.springframework.integration.file.FileHeaders#ORIGINAL_FILE} header value + * containing either a File instance or a String representing the original file path. * @param deleteSourceFiles true to delete the source files. * @return the current Spec */ diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java index d4a32beeab..bd07946a73 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileInboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -25,7 +25,6 @@ import org.springframework.expression.Expression; import org.springframework.integration.dsl.ComponentsRegistration; import org.springframework.integration.dsl.MessageSourceSpec; import org.springframework.integration.expression.FunctionExpression; -import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.integration.file.filters.ExpressionFileListFilter; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer; @@ -39,6 +38,7 @@ import org.springframework.integration.file.remote.synchronizer.AbstractInboundF * @param the target {@link AbstractInboundFileSynchronizingMessageSource} implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -176,7 +176,7 @@ public abstract class RemoteFileInboundChannelAdapterSpec filterFunction) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java index 77dd829394..04457166b0 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileOutboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -25,7 +25,6 @@ import org.springframework.expression.Expression; import org.springframework.integration.dsl.ComponentsRegistration; import org.springframework.integration.dsl.MessageHandlerSpec; import org.springframework.integration.expression.FunctionExpression; -import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.integration.file.filters.ExpressionFileListFilter; import org.springframework.integration.file.filters.FileListFilter; @@ -42,6 +41,7 @@ import org.springframework.messaging.Message; * @param the target {@link RemoteFileOutboundGatewaySpec} implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -181,7 +181,7 @@ public abstract class RemoteFileOutboundGatewaySpec filterFunction) { @@ -248,7 +248,7 @@ public abstract class RemoteFileOutboundGatewaySpec filterFunction) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileStreamingInboundChannelAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileStreamingInboundChannelAdapterSpec.java index 3db9c5d62c..561687d48f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileStreamingInboundChannelAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/RemoteFileStreamingInboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -24,19 +24,17 @@ import org.springframework.expression.Expression; import org.springframework.integration.dsl.ComponentsRegistration; import org.springframework.integration.dsl.MessageSourceSpec; import org.springframework.integration.expression.FunctionExpression; -import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.integration.file.filters.ExpressionFileListFilter; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.remote.AbstractRemoteFileStreamingMessageSource; -import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizingMessageSource; import org.springframework.messaging.Message; /** - * A {@link MessageSourceSpec} for an {@link AbstractInboundFileSynchronizingMessageSource}. + * A {@link MessageSourceSpec} for an {@link AbstractRemoteFileStreamingMessageSource}. * * @param the target file type. * @param the target {@link RemoteFileStreamingInboundChannelAdapterSpec} implementation type. - * @param the target {@link AbstractInboundFileSynchronizingMessageSource} implementation type. + * @param the target {@link AbstractRemoteFileStreamingMessageSource} implementation type. * * @author Gary Russell * @@ -106,7 +104,7 @@ public abstract class RemoteFileStreamingInboundChannelAdapterSpec filterFunction) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java index 1039ef8081..b8e5a88a71 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -22,19 +22,20 @@ import java.nio.channels.FileLock; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.file.FileReadingMessageSource; import org.springframework.messaging.MessagingException; /** * File locking strategy that uses java.nio. The locks taken by FileChannel are shared with all the threads in a single * JVM, so this locking strategy does not prevent files being picked up multiple times within the same JVM. - * {@link FileReadingMessageSource}s sharing a Locker will not pick up the same files. + * {@link org.springframework.integration.file.FileReadingMessageSource}s sharing a + * Locker will not pick up the same files. *

    * This implementation will acquire or create a {@link FileLock} for the given file. Caching locks might be expensive, * so this locking strategy is not recommended for scenarios where many files are accessed in parallel. * * @author Iwein Fuld * @author Mark Fisher + * @author Gary Russell * @since 2.0 */ public class NioFileLocker extends AbstractFileLockerFilter { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/ClientCallback.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/ClientCallback.java index 4ee8901899..19be058708 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/ClientCallback.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/ClientCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 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. @@ -16,8 +16,6 @@ package org.springframework.integration.file.remote; -import org.springframework.integration.file.remote.session.Session; - /** * {@code RemoteFileTemplate} callback with the underlying client instance providing * access to lower level methods. @@ -33,10 +31,11 @@ import org.springframework.integration.file.remote.session.Session; public interface ClientCallback { /** - * Called within the context of a {@link Session}. - * Perform some operation(s) on the client instance underlying the session. The caller will take - * care of closing the session after this method exits. However, the implementation - * is required to perform any clean up required by the client after performing + * Called within the context of a + * {@link org.springframework.integration.file.remote.session.Session}. Perform some + * operation(s) on the client instance underlying the session. The caller will take + * care of closing the session after this method exits. However, the implementation is + * required to perform any clean up required by the client after performing * operations. * @param client The client instance. * @return The return value. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java index 3dd03e05c1..f28c217095 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/RemoteFileOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2016 the original author or authors. + * Copyright 2013-2018 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. @@ -177,7 +177,7 @@ public interface RemoteFileOperations { * @since 5.1 */ @FunctionalInterface - public interface OperationsCallback { + interface OperationsCallback { /** * Execute any number of operations using a dedicated remote diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java index ce8d225d75..b58395a1f6 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java @@ -17,7 +17,6 @@ package org.springframework.integration.file.remote.handler; import org.springframework.expression.Expression; -import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.remote.RemoteFileTemplate; import org.springframework.integration.file.remote.session.SessionFactory; @@ -138,8 +137,9 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler { } /** - * Set the file name generator used to generate the remote filename to be used when transferring - * files to the remote system. Default {@link DefaultFileNameGenerator}. + * Set the file name generator used to generate the remote filename to be used when + * transferring files to the remote system. Default + * {@link org.springframework.integration.file.DefaultFileNameGenerator}. * @param fileNameGenerator the file name generator. * @see RemoteFileTemplate#setFileNameGenerator(FileNameGenerator) */ diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java index b44b04fda0..b2aa82e756 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -19,7 +19,6 @@ package org.springframework.integration.ftp.inbound; import org.apache.commons.net.ftp.FTPFile; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer; import org.springframework.integration.ftp.filters.FtpPersistentAcceptOnceFileListFilter; @@ -32,12 +31,14 @@ import org.springframework.integration.metadata.SimpleMetadataStore; * @author Josh Long * @author Mark Fisher * @author Artem Bilan + * @author Gary Russell * @since 2.0 */ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer { /** - * Create a synchronizer with the {@link SessionFactory} used to acquire {@link Session} instances. + * Create a synchronizer with the {@link SessionFactory} used to acquire + * {@link org.springframework.integration.file.remote.session.Session} instances. * @param sessionFactory The session factory. */ public FtpInboundFileSynchronizer(SessionFactory sessionFactory) { diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpFileInfo.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpFileInfo.java index 377f6b8f52..b143a5edf7 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpFileInfo.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/FtpFileInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -19,11 +19,11 @@ package org.springframework.integration.ftp.session; import org.apache.commons.net.ftp.FTPFile; import org.springframework.integration.file.remote.AbstractFileInfo; -import org.springframework.integration.file.remote.FileInfo; import org.springframework.util.Assert; /** - * A {@link FileInfo} implementation for FTP/FTPS. + * A {@link org.springframework.integration.file.remote.FileInfo} implementation for + * FTP/FTPS. * * @author Gary Russell * @since 2.1 diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/metadata/GemfireMetadataStore.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/metadata/GemfireMetadataStore.java index bbceb9cd03..4c8a6fb55a 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/metadata/GemfireMetadataStore.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/metadata/GemfireMetadataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 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. @@ -26,19 +26,19 @@ import org.apache.geode.cache.Region; import org.apache.geode.cache.Scope; import org.apache.geode.cache.util.CacheListenerAdapter; -import org.springframework.integration.metadata.ConcurrentMetadataStore; import org.springframework.integration.metadata.ListenableMetadataStore; import org.springframework.integration.metadata.MetadataStoreListener; import org.springframework.util.Assert; /** - * Gemfire implementation of {@link ConcurrentMetadataStore}. + * Gemfire implementation of {@link ListenableMetadataStore}. * Use this {@link org.springframework.integration.metadata.MetadataStore} * to achieve meta-data persistence shared across application instances and * restarts. * * @author Artem Bilan * @author Venil Noronha + * @author Gary Russell * * @since 4.0 */ diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java index b9de15cd60..d99a9b2e75 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java @@ -33,17 +33,17 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** - * A {@link MessageHandler} implementation that writes to a GemFire Region. The - * Message's payload must be an instance of {@link Map} or {@link #cacheEntryExpressions} - * must be provided. + * A {@link org.springframework.messaging.MessageHandler} implementation that writes to a + * GemFire Region. The Message's payload must be an instance of {@link Map} or + * {@link #cacheEntryExpressions} must be provided. * * @author Mark Fisher * @author David Turanski * @author Artem Bilan + * @author Gary Russell * * @since 2.1 */ diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java index 46d1022042..fa15eca775 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/GemfireMessageStore.java @@ -23,19 +23,19 @@ import java.util.List; import org.apache.geode.cache.Region; import org.springframework.integration.store.AbstractKeyValueMessageStore; -import org.springframework.integration.store.MessageGroupStore; -import org.springframework.integration.store.MessageStore; import org.springframework.util.Assert; import org.springframework.util.PatternMatchUtils; /** - * Gemfire implementation of the key/value style {@link MessageStore} and - * {@link MessageGroupStore} + * Gemfire implementation of the key/value style + * {@link org.springframework.integration.store.MessageStore} and + * {@link org.springframework.integration.store.MessageGroupStore} * * @author Mark Fisher * @author Oleg Zhurakousky * @author David Turanski * @author Artem Bilan + * @author Gary Russell * * @since 2.1 */ diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java index 4fbf392119..cd5ced54b3 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.UUID; import org.springframework.integration.scripting.AbstractScriptExecutingMessageProcessor; -import org.springframework.integration.scripting.DefaultScriptVariableGenerator; import org.springframework.integration.scripting.ScriptVariableGenerator; import org.springframework.messaging.Message; import org.springframework.scripting.ScriptSource; @@ -51,7 +50,8 @@ public class GroovyCommandMessageProcessor extends AbstractScriptExecutingMessag /** - * Creates a {@link GroovyCommandMessageProcessor} that will use the {@link DefaultScriptVariableGenerator}. + * Creates a {@link GroovyCommandMessageProcessor} that will use the + * {@link org.springframework.integration.scripting.DefaultScriptVariableGenerator}. */ public GroovyCommandMessageProcessor() { super(); @@ -67,7 +67,8 @@ public class GroovyCommandMessageProcessor extends AbstractScriptExecutingMessag } /** - * Creates a {@link GroovyCommandMessageProcessor} that will use the {@link DefaultScriptVariableGenerator} + * Creates a {@link GroovyCommandMessageProcessor} that will use the + * {@link org.springframework.integration.scripting.DefaultScriptVariableGenerator} * and provided {@link Binding}. * Provided 'binding' will be used in the {@link BindingOverwriteGroovyObjectCustomizerDecorator} to overwrite * original Groovy Script 'binding'. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java index 2630c3391e..59cf3120cc 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java @@ -24,10 +24,10 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; -import org.springframework.integration.http.management.IntegrationGraphController; /** - * Enables the {@link IntegrationGraphController} if + * Enables the + * {@link org.springframework.integration.http.management.IntegrationGraphController} if * {@code org.springframework.web.servlet.DispatcherServlet} or * {@code org.springframework.web.reactive.DispatcherHandler} is present in the classpath. * @@ -35,7 +35,7 @@ import org.springframework.integration.http.management.IntegrationGraphControlle * * @since 4.3 * - * @see IntegrationGraphController + * @see org.springframework.integration.http.management.IntegrationGraphController */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -44,17 +44,21 @@ import org.springframework.integration.http.management.IntegrationGraphControlle public @interface EnableIntegrationGraphController { /** - * Specify the Request Mapping path for the {@link IntegrationGraphController}. + * Specify the Request Mapping path for the + * {@link org.springframework.integration.http.management.IntegrationGraphController}. * Defaults to {@value HttpContextUtils#GRAPH_CONTROLLER_DEFAULT_PATH}. - * @return The Request Mapping path for the {@link IntegrationGraphController} + * @return The Request Mapping path for the + * {@link org.springframework.integration.http.management.IntegrationGraphController} */ @AliasFor("path") String value() default HttpContextUtils.GRAPH_CONTROLLER_DEFAULT_PATH; /** - * Specify the Request Mapping path for the {@link IntegrationGraphController}. + * Specify the Request Mapping path for the + * {@link org.springframework.integration.http.management.IntegrationGraphController}. * Defaults to {@value HttpContextUtils#GRAPH_CONTROLLER_DEFAULT_PATH}. - * @return The Request Mapping path for the {@link IntegrationGraphController} + * @return The Request Mapping path for the + * {@link org.springframework.integration.http.management.IntegrationGraphController} */ @AliasFor("value") String path() default HttpContextUtils.GRAPH_CONTROLLER_DEFAULT_PATH; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/converter/SerializingHttpMessageConverter.java b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/SerializingHttpMessageConverter.java index 54a3fcd93c..d927f1817d 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/converter/SerializingHttpMessageConverter.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/SerializingHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -26,11 +26,11 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; import org.springframework.http.converter.AbstractHttpMessageConverter; -import org.springframework.http.converter.HttpMessageConverter; import org.springframework.util.FileCopyUtils; /** - * An {@link HttpMessageConverter} implementation for {@link Serializable} instances. + * An {@link org.springframework.http.converter.HttpMessageConverter} implementation for + * {@link Serializable} instances. * * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/BaseHttpInboundEndpointSpec.java b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/BaseHttpInboundEndpointSpec.java index d04c096b62..f9161043f8 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/BaseHttpInboundEndpointSpec.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/BaseHttpInboundEndpointSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -19,17 +19,18 @@ package org.springframework.integration.http.dsl; import java.util.Arrays; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.dsl.MessagingGatewaySpec; import org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport; import org.springframework.web.multipart.MultipartResolver; /** - * A base {@link MessagingGatewaySpec} for the {@link HttpRequestHandlingEndpointSupport} implementations. + * A base {@link org.springframework.integration.dsl.MessagingGatewaySpec} for the + * {@link HttpRequestHandlingEndpointSupport} implementations. * * @param the target {@link BaseHttpInboundEndpointSpec} implementation type. * @param the target {@link HttpRequestHandlingEndpointSupport} implementation type. * * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java index bd8c2b62e5..4b8f139a55 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java @@ -28,13 +28,11 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.RequestEntity; -import org.springframework.http.converter.HttpMessageConverter; import org.springframework.integration.dsl.ComponentsRegistration; import org.springframework.integration.dsl.MessagingGatewaySpec; import org.springframework.integration.expression.FunctionExpression; import org.springframework.integration.http.inbound.BaseHttpInboundEndpoint; import org.springframework.integration.http.inbound.CrossOrigin; -import org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport; import org.springframework.integration.http.inbound.RequestMapping; import org.springframework.integration.http.support.DefaultHttpHeaderMapper; import org.springframework.integration.mapping.HeaderMapper; @@ -43,6 +41,7 @@ import org.springframework.web.bind.annotation.RequestMethod; /** * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ @@ -94,7 +93,7 @@ public abstract class HttpInboundEndpointSupportSpec the expected HTTP request body type. * @return the spec - * @see HttpRequestHandlingEndpointSupport#setPayloadExpression(Expression) + * @see org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport#setPayloadExpression(Expression) */ public

    S payloadFunction(Function, ?> payloadFunction) { return payloadExpression(new FunctionExpression<>(payloadFunction)); @@ -126,7 +125,7 @@ public abstract class HttpInboundEndpointSupportSpec headerExpressions) { Assert.notNull(headerExpressions, "'headerExpressions' must not be null"); @@ -140,7 +139,7 @@ public abstract class HttpInboundEndpointSupportSpec the expected HTTP body type. * @return the current Spec. - * @see HttpRequestHandlingEndpointSupport#setHeaderExpressions(Map) + * @see org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport#setHeaderExpressions(Map) */ public

    S headerFunction(String header, Function, ?> headerFunction) { return headerExpression(header, new FunctionExpression<>(headerFunction)); @@ -211,7 +210,7 @@ public abstract class HttpInboundEndpointSupportSpecbyte[].class. * @param requestPayloadType The payload type. @@ -224,7 +223,7 @@ public abstract class HttpInboundEndpointSupportSpecbyte[].class. * @param requestPayloadType The payload type. @@ -252,7 +251,7 @@ public abstract class HttpInboundEndpointSupportSpec, ?> statusCodeFunction) { return statusCodeExpression(new FunctionExpression<>(statusCodeFunction)); diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/BaseHttpInboundEndpoint.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/BaseHttpInboundEndpoint.java index 6d02a5508e..5abaca61ea 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/BaseHttpInboundEndpoint.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/BaseHttpInboundEndpoint.java @@ -35,7 +35,6 @@ import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.http.support.DefaultHttpHeaderMapper; import org.springframework.integration.mapping.HeaderMapper; -import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -241,7 +240,7 @@ public class BaseHttpInboundEndpoint extends MessagingGatewaySupport implements * {@link #BaseHttpInboundEndpoint(boolean) expectReply} is true) resolves * an {@link HttpStatus} from the * {@link org.springframework.integration.http.HttpHeaders#STATUS_CODE} reply - * {@link Message} header. + * {@link org.springframework.messaging.Message} header. * @param statusCodeExpression The status code Expression. * @since 4.1 * @see #setReplyTimeout(long) diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java index fd9840fe62..f398b7a319 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java @@ -23,7 +23,6 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.springframework.context.MessageSource; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; @@ -33,7 +32,6 @@ import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.validation.Errors; import org.springframework.validation.MapBindingResult; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; @@ -112,8 +110,8 @@ public class HttpRequestHandlingController extends HttpRequestHandlingEndpointSu } /** - * The key used to expose {@link Errors} in the core, in the case that message handling fails. Defaults to - * "errors". + * The key used to expose {@link org.springframework.validation.Errors} in the core, + * in the case that message handling fails. Defaults to "errors". * @param errorsKey The key value to set. */ public void setErrorsKey(String errorsKey) { @@ -122,7 +120,8 @@ public class HttpRequestHandlingController extends HttpRequestHandlingEndpointSu /** * The error code to use to signal an error in the message handling. In the case of an error this code will be - * provided in an object error to be optionally translated in the standard MVC way using a {@link MessageSource}. + * provided in an object error to be optionally translated in the standard MVC way using a + * {@link org.springframework.context.MessageSource}. * The default value is spring.integration.http.handler.error. Three arguments are provided: the * exception, its message and its stack trace as a String. * @param errorCode The error code to set. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java index 41c679ce6f..9b929e4271 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java @@ -53,7 +53,6 @@ import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.http.converter.MultipartAwareFormHttpMessageConverter; import org.springframework.integration.http.multipart.MultipartHttpInputMessage; -import org.springframework.integration.mapping.HeaderMapper; import org.springframework.integration.support.AbstractIntegrationMessageBuilder; import org.springframework.integration.support.json.JacksonPresent; import org.springframework.messaging.Message; @@ -81,8 +80,8 @@ import org.springframework.web.servlet.HandlerMapping; * {@link #setMessageConverters(List)}. *

    * To customize the mapping of request headers to the MessageHeaders, provide a - * reference to a {@code HeaderMapper} implementation - * to the {@link #setHeaderMapper(HeaderMapper)} method. + * reference to a {@code org.springframework.integration.mapping.HeaderMapper} implementation + * to the {@link #setHeaderMapper(org.springframework.integration.mapping.HeaderMapper)} method. *

    * The behavior is "request/reply" by default. Pass {@code false} to the constructor * to force send-only as opposed to sendAndReceive. Send-only means that as soon as diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java index 83fc9c9454..d167a665db 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java @@ -31,11 +31,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; -import org.springframework.integration.http.converter.MultipartAwareFormHttpMessageConverter; import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.util.CollectionUtils; -import org.springframework.util.MultiValueMap; import org.springframework.web.HttpRequestHandler; /** @@ -47,11 +45,14 @@ import org.springframework.web.HttpRequestHandler; *

    * The default supported request methods are GET and POST, but the list of values can be configured with the * {@link RequestMapping#methods} property. The payload generated from a GET request (or HEAD or OPTIONS if supported) will - * be a {@link MultiValueMap} containing the parameter values. For a request containing a body (e.g. a POST), the type + * be a {@link org.springframework.util.MultiValueMap} containing the parameter values. For a request containing a body + * (e.g. a POST), the type * of the payload is determined by the {@link #setRequestPayloadTypeClass(Class)} request payload type}. *

    * If the HTTP request is a multipart and a "multipartResolver" bean has been defined in the context, then it will be - * converted by the {@link MultipartAwareFormHttpMessageConverter} as long as the default message converters have not + * converted by the + * {@link org.springframework.integration.http.converter.MultipartAwareFormHttpMessageConverter} as long as the default + * message converters have not * been overwritten (although providing a customized instance of the Multipart-aware converter is also an option). *

    * By default a number of {@link HttpMessageConverter}s are already configured. The list can be overridden by calling @@ -60,6 +61,7 @@ import org.springframework.web.HttpRequestHandler; * @author Mark Fisher * @author Oleg Zhurakousky * @author Artem Bilan + * @author Gary Russell * * @since 2.0 */ @@ -93,6 +95,7 @@ public class HttpRequestHandlingMessagingGateway extends HttpRequestHandlingEndp * 'expectReply' property is true, it will also generate a response from the reply Message once received. That * response will be written by the {@link HttpMessageConverter}s. */ + @Override public final void handleRequest(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/AbstractHttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/AbstractHttpRequestExecutingMessageHandler.java index ef67b8c2ca..9b15bf60d1 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/AbstractHttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/AbstractHttpRequestExecutingMessageHandler.java @@ -56,7 +56,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; @@ -115,10 +114,10 @@ public abstract class AbstractHttpRequestExecutingMessageHandler extends Abstrac /** * Specify whether the real URI should be encoded after uriVariables - * expanding and before send request via {@link RestTemplate}. The default value is true. - * + * expanding and before send request via + * {@link org.springframework.web.client.RestTemplate}. The default value is + * true. * @param encodeUri true if the URI should be encoded. - * * @see UriComponentsBuilder */ public void setEncodeUri(boolean encodeUri) { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java index 978c23eb43..3d19da8574 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -20,20 +20,16 @@ import java.net.URI; import java.util.List; import java.util.function.Supplier; -import org.springframework.beans.factory.BeanFactory; import org.springframework.core.ParameterizedTypeReference; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.integration.expression.ValueExpression; -import org.springframework.integration.mapping.HeaderMapper; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandlingException; import org.springframework.util.Assert; import org.springframework.web.client.ResponseErrorHandler; @@ -41,14 +37,18 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; /** - * A {@link MessageHandler} implementation that executes HTTP requests by delegating + * A {@link org.springframework.messaging.MessageHandler} + * implementation that executes HTTP requests by delegating * to a {@link RestTemplate} instance. If the 'expectReply' flag is set to true (the default) * then a reply Message will be generated from the HTTP response. If that response contains * a body, it will be used as the reply Message's payload. Otherwise the reply Message's - * payload will contain the response status as an instance of the {@link HttpStatus} enum. - * When there is a response body, the {@link HttpStatus} enum instance will instead be + * payload will contain the response status as an instance of the + * {@link org.springframework.http.HttpStatus} enum. + * When there is a response body, the {@link org.springframework.http.HttpStatus} enum + * instance will instead be * copied to the MessageHeaders of the reply. In both cases, the response headers will - * be mapped to the reply Message's headers by this handler's {@link HeaderMapper} instance. + * be mapped to the reply Message's headers by this handler's + * {@link org.springframework.integration.mapping.HeaderMapper} instance. * * @author Mark Fisher * @author Oleg Zhurakousky @@ -108,7 +108,7 @@ public class HttpRequestExecutingMessageHandler extends AbstractHttpRequestExecu /** * Create a handler that will send requests to the provided URI using a provided RestTemplate * @param uriExpression A SpEL Expression that can be resolved against the message object and - * {@link BeanFactory}. + * {@link org.springframework.beans.factory.BeanFactory}. * @param restTemplate The rest template. */ public HttpRequestExecutingMessageHandler(Expression uriExpression, RestTemplate restTemplate) { diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java index 57230521e2..6d200317fd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -16,9 +16,7 @@ package org.springframework.integration.ip; -import java.net.DatagramSocket; import java.net.InetSocketAddress; -import java.net.Socket; import java.net.SocketAddress; import org.springframework.context.Lifecycle; @@ -26,7 +24,7 @@ import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; /** - * Base class for all TCP/UDP MessageHandlers. + * Base class for UDP MessageHandlers. * * @author Gary Russell * @since 2.0 @@ -55,8 +53,7 @@ public abstract class AbstractInternetProtocolSendingMessageHandler extends Abst /** - * @see Socket#setSoTimeout(int) - * @see DatagramSocket#setSoTimeout(int) + * @see java.net.DatagramSocket#setSoTimeout(int) * @param timeout The timeout. */ @Override @@ -65,8 +62,7 @@ public abstract class AbstractInternetProtocolSendingMessageHandler extends Abst } /** - * @see Socket#setReceiveBufferSize(int) - * @see DatagramSocket#setReceiveBufferSize(int) + * @see java.net.DatagramSocket#setReceiveBufferSize(int) * @param size The receive buffer size. */ @Override @@ -74,8 +70,7 @@ public abstract class AbstractInternetProtocolSendingMessageHandler extends Abst } /** - * @see Socket#setSendBufferSize(int) - * @see DatagramSocket#setSendBufferSize(int) + * @see java.net.DatagramSocket#setSendBufferSize(int) * @param size The send buffer size. */ @Override diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java index 74010c4c3a..4932e2ea9a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2014 the original author or authors. + * Copyright 2001-2018 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. @@ -16,9 +16,6 @@ package org.springframework.integration.ip; -import java.net.DatagramSocket; -import java.net.Socket; - /** * @author Gary Russell * @since 2.0 @@ -26,24 +23,24 @@ import java.net.Socket; public interface CommonSocketOptions { /** - * @see Socket#setSoTimeout(int) - * @see DatagramSocket#setSoTimeout(int) + * @see java.net.Socket#setSoTimeout(int) + * @see java.net.DatagramSocket#setSoTimeout(int) * * @param soTimeout The timeout. */ void setSoTimeout(int soTimeout); /** - * @see Socket#setReceiveBufferSize(int) - * @see DatagramSocket#setReceiveBufferSize(int) + * @see java.net.Socket#setReceiveBufferSize(int) + * @see java.net.DatagramSocket#setReceiveBufferSize(int) * * @param soReceiveBufferSize The receive buffer size. */ void setSoReceiveBufferSize(int soReceiveBufferSize); /** - * @see Socket#setSendBufferSize(int) - * @see DatagramSocket#setSendBufferSize(int) + * @see java.net.Socket#setSendBufferSize(int) + * @see java.net.DatagramSocket#setSendBufferSize(int) * * @param soSendBufferSize The send buffer size. */ diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java index 57a615dcc4..11fa0524b9 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -18,7 +18,6 @@ package org.springframework.integration.ip.config; import org.w3c.dom.Element; -import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.IntegrationNamespaceUtils; @@ -198,7 +197,8 @@ public abstract class IpAdapterParserUtils { * @param element The element. * @param parserContext The parser context. * @return The value of the attribute. - * @throws BeanCreationException if attribute is not provided. + * @throws org.springframework.beans.factory.BeanCreationException if attribute is not + * provided. */ static String getPort(Element element, ParserContext parserContext) { String port = element.getAttribute(IpAdapterParserUtils.PORT); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpMulticastOutboundChannelAdapterSpec.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpMulticastOutboundChannelAdapterSpec.java index c3ee63b3ab..0cb7391f71 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpMulticastOutboundChannelAdapterSpec.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpMulticastOutboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -18,13 +18,13 @@ package org.springframework.integration.ip.dsl; import java.util.function.Function; -import org.springframework.integration.dsl.MessageHandlerSpec; import org.springframework.integration.expression.FunctionExpression; import org.springframework.integration.ip.udp.MulticastSendingMessageHandler; import org.springframework.messaging.Message; /** - * A {@link MessageHandlerSpec} for {@link MulticastSendingMessageHandler}s. + * A {@link org.springframework.integration.dsl.MessageHandlerSpec} for + * {@link MulticastSendingMessageHandler}s. * * @author Gary Russell * @since 5.0 diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpUnicastOutboundChannelAdapterSpec.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpUnicastOutboundChannelAdapterSpec.java index a009a6fb05..a92d92ab7a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpUnicastOutboundChannelAdapterSpec.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpUnicastOutboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 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. @@ -18,11 +18,10 @@ package org.springframework.integration.ip.dsl; import java.util.function.Function; -import org.springframework.integration.dsl.MessageHandlerSpec; import org.springframework.messaging.Message; /** - * A {@link MessageHandlerSpec} for + * A {@link org.springframework.integration.dsl.MessageHandlerSpec} for * {@link org.springframework.integration.ip.udp.UnicastSendingMessageHandler}s. * * @author Gary Russell diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java index 780e91a209..9cf63078cb 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.Lifecycle; -import org.springframework.context.SmartLifecycle; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; @@ -53,7 +52,7 @@ import org.springframework.util.Assert; * (or times out). Asynchronous requests/responses over the same connection are not * supported - use a pair of outbound/inbound adapters for that use case. *

    - * {@link SmartLifecycle} methods delegate to the underlying {@link AbstractConnectionFactory} + * {@link Lifecycle} methods delegate to the underlying {@link AbstractConnectionFactory} * * * @author Gary Russell diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionSupport.java index 9ea107902e..f53867249a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 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. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import java.io.PushbackInputStream; - /** * Base class for TCP Connection Support implementations. * @@ -37,7 +35,7 @@ public abstract class AbstractTcpConnectionSupport { /** * Set to true to cause wrapping of the connection's input stream in a - * {@link PushbackInputStream}, enabling deserializers to "unread" data. + * {@link java.io.PushbackInputStream}, enabling deserializers to "unread" data. * @param pushbackCapable true to enable. */ public void setPushbackCapable(boolean pushbackCapable) { diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java index abcc399c4f..e573d4ad99 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import java.net.Socket; -import java.nio.channels.SocketChannel; - import javax.net.ssl.SSLSession; import org.springframework.core.serializer.Deserializer; @@ -27,10 +24,9 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.Message; /** - * An abstraction over {@link Socket} and {@link SocketChannel} that - * sends {@link Message} objects by serializing the payload - * and streaming it to the destination. Requires a {@link TcpListener} - * to receive incoming messages. + * An abstraction over {@link java.net.Socket} and {@link java.nio.channels.SocketChannel} + * that sends {@link Message} objects by serializing the payload and streaming it to the + * destination. Requires a {@link TcpListener} to receive incoming messages. * * @author Gary Russell * @since 2.0 @@ -131,7 +127,7 @@ public interface TcpConnection extends Runnable { SSLSession getSslSession(); /** - * Provides getters for {@link Socket} properties. + * Provides getters for {@link java.net.Socket} properties. * @return the socketInfo - may be null, for example in interceptors; interceptors * should override and delegate to the actual TcpConnection. * @since 4.3 diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java index c45b71d0ab..097ead06fe 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -20,8 +20,6 @@ import java.io.IOException; import java.net.Socket; import java.net.SocketException; -import javax.net.SocketFactory; - import org.springframework.util.Assert; /** @@ -77,7 +75,7 @@ public class TcpNetClientConnectionFactory extends /** * Create a new {@link Socket}. This default implementation uses the default - * {@link SocketFactory}. Override to use some other mechanism + * {@link javax.net.SocketFactory}. Override to use some other mechanism * * @param host The host. * @param port The port. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java index 999d692a8b..bc25cb6fc2 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java @@ -28,7 +28,6 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException; import org.springframework.lang.Nullable; @@ -164,11 +163,10 @@ public class TcpNetConnection extends TcpConnectionSupport implements Scheduling } /** - * If there is no listener, - * this method exits. When there is a listener, the method runs in a - * loop reading input from the connection's stream, data is converted - * to an object using the {@link Deserializer} and the listener's - * {@link TcpListener#onMessage(Message)} method is called. + * If there is no listener, this method exits. When there is a listener, the method + * runs in a loop reading input from the connection's stream, data is converted to an + * object using the {@link org.springframework.core.serializer.Deserializer} and the + * listener's {@link TcpListener#onMessage(Message)} method is called. */ @Override public void run() { diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java index 123c40308c..0a7764971a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioClientConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -18,7 +18,6 @@ package org.springframework.integration.ip.tcp.connection; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.ByteBuffer; import java.nio.channels.CancelledKeyException; import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedSelectorException; @@ -107,7 +106,7 @@ public class TcpNioClientConnectionFactory extends * When set to true, connections created by this factory attempt * to use direct buffers where possible. * @param usingDirectBuffers The usingDirectBuffers to set. - * @see ByteBuffer + * @see java.nio.ByteBuffer */ public void setUsingDirectBuffers(boolean usingDirectBuffers) { this.usingDirectBuffers = usingDirectBuffers; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java index 13eb85f69e..4817d8cbd8 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import java.net.ServerSocket; -import java.net.Socket; - import javax.net.ServerSocketFactory; import javax.net.SocketFactory; @@ -32,13 +29,14 @@ public interface TcpSocketFactorySupport { /** * Supplies the {@link ServerSocketFactory} to be used to create new - * {@link ServerSocket}s. + * {@link java.net.ServerSocket}s. * @return the ServerSocketFactory */ ServerSocketFactory getServerSocketFactory(); /** - * Supplies the {@link SocketFactory} to be used to create new {@link Socket}s. + * Supplies the {@link SocketFactory} to be used to create new + * {@link java.net.Socket}s. * @return the SocketFactory */ SocketFactory getSocketFactory(); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java index 1c68ca314a..113c739012 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java @@ -21,21 +21,17 @@ import java.net.DatagramSocket; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.MulticastSocket; -import java.net.SocketAddress; -import java.net.URI; import org.springframework.expression.Expression; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandler; /** - * A {@link MessageHandler} implementation that maps a Message into - * a UDP datagram packet and sends that to the specified multicast address + * A {@link org.springframework.messaging.MessageHandler} implementation that maps a + * Message into a UDP datagram packet and sends that to the specified multicast address * (224.0.0.0 to 239.255.255.255) and port. * - * The only difference between this and its super class is the - * ability to specify how many acknowledgments are required to - * determine success. + * The only difference between this and its super class is the ability to specify how many + * acknowledgments are required to determine success. * * @author Gary Russell * @since 2.0 @@ -106,7 +102,8 @@ public class MulticastSendingMessageHandler extends UnicastSendingMessageHandler * Construct MulticastSendingMessageHandler based on the destination SpEL expression to * determine the target destination at runtime against requestMessage. * @param destinationExpression the SpEL expression to evaluate the target destination - * at runtime. Must evaluate to {@link String}, {@link URI} or {@link SocketAddress}. + * at runtime. Must evaluate to {@link String}, {@link java.net.URI} or + * {@link java.net.SocketAddress}. * @since 5.0 */ public MulticastSendingMessageHandler(Expression destinationExpression) { @@ -117,7 +114,8 @@ public class MulticastSendingMessageHandler extends UnicastSendingMessageHandler * Construct MulticastSendingMessageHandler based on the destination SpEL expression to * determine the target destination at runtime against requestMessage. * @param destinationExpression the SpEL expression to evaluate the target destination - * at runtime. Must evaluate to {@link String}, {@link URI} or {@link SocketAddress}. + * at runtime. Must evaluate to {@link String}, {@link java.net.URI} or + * {@link java.net.SocketAddress}. * @since 5.0 */ public MulticastSendingMessageHandler(String destinationExpression) { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/MessagePreparedStatementSetter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/MessagePreparedStatementSetter.java index cb3135458e..c0a9b41741 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/MessagePreparedStatementSetter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/MessagePreparedStatementSetter.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 the original author or authors. + * Copyright 2015-2018 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. @@ -19,20 +19,21 @@ package org.springframework.integration.jdbc; import java.sql.PreparedStatement; import java.sql.SQLException; -import org.springframework.jdbc.core.PreparedStatementSetter; import org.springframework.messaging.Message; /** * The callback to be used with the {@link JdbcMessageHandler} * as an alternative to the {@link SqlParameterSourceFactory}. *

    - * Plays the same role as standard {@link PreparedStatementSetter}, + * Plays the same role as standard + * {@link org.springframework.jdbc.core.PreparedStatementSetter}, * but with {@code Message requestMessage} context during {@code handleMessage} * process in the {@link JdbcMessageHandler}. * * @author Artem Bilan + * @author Gary Russell * @since 4.2 - * @see PreparedStatementSetter + * @see org.springframework.jdbc.core.PreparedStatementSetter */ @FunctionalInterface public interface MessagePreparedStatementSetter { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java index 35bfc3435c..5fdce4bce0 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java @@ -16,7 +16,6 @@ package org.springframework.integration.jdbc; -import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -30,17 +29,12 @@ import javax.sql.DataSource; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.expression.BeanResolver; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; -import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.SqlInOutParameter; -import org.springframework.jdbc.core.SqlOutParameter; import org.springframework.jdbc.core.SqlParameter; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcCall; @@ -50,7 +44,6 @@ import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -106,7 +99,7 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { * If this variable is set to true then all results from a stored procedure call * that don't have a corresponding SqlOutParameter declaration will be bypassed. * - * The value is set on the underlying {@link JdbcTemplate}. + * The value is set on the underlying {@link org.springframework.jdbc.core.JdbcTemplate}. * * Value defaults to true. */ @@ -115,8 +108,9 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { /** * If your database system is not fully supported by Spring and thus obtaining * parameter definitions from the JDBC Meta-data is not possible, you must define - * the {@link SqlParameter} explicitly. See also {@link SqlOutParameter} and - * {@link SqlInOutParameter}. + * the {@link SqlParameter} explicitly. See also + * {@link org.springframework.jdbc.core.SqlOutParameter} and + * {@link org.springframework.jdbc.core.SqlInOutParameter}. */ private volatile List sqlParameters = new ArrayList(0); @@ -457,7 +451,7 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { * {@link StoredProcExecutor#setStoredProcedureNameExpression(Expression)}. * * E.g., that way you can specify the name of the Stored Procedure or Stored Function - * through {@link MessageHeaders}. + * through {@link org.springframework.messaging.MessageHeaders}. * * @param storedProcedureName Must not be null and must not be empty * @@ -545,14 +539,15 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { /** * If this variable is set to true then all results from a stored - * procedure call that don't have a corresponding {@link SqlOutParameter} + * procedure call that don't have a corresponding + * {@link org.springframework.jdbc.core.SqlOutParameter} * declaration will be bypassed. * * E.g. Stored Procedures may return an update count value, even though your * Stored Procedure only declared a single result parameter. The exact behavior * depends on the used database. * - * The value is set on the underlying {@link JdbcTemplate}. + * The value is set on the underlying {@link org.springframework.jdbc.core.JdbcTemplate}. * * Only few developers will probably ever like to process update counts, thus * the value defaults to true. @@ -566,7 +561,7 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { /** * If the Stored Procedure returns ResultSets you may provide a map of - * {@link RowMapper} to convert the {@link ResultSet} to meaningful objects. + * {@link RowMapper} to convert the {@link java.sql.ResultSet} to meaningful objects. * * @param returningResultSetRowMappers The map may not be null and must not contain null values. */ @@ -647,8 +642,9 @@ public class StoredProcExecutor implements BeanFactoryAware, InitializingBean { /** * Allows to set the optional {@link BeanFactory} which is used to add a - * {@link BeanResolver} to the {@link StandardEvaluationContext}. If not set - * this property defaults to null. + * {@link org.springframework.expression.BeanResolver} to the + * {@link org.springframework.expression.spel.support.StandardEvaluationContext}. + * If not set this property defaults to null. * * @param beanFactory If set must not be null. */ diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java index 414000f7d0..d31da51ebd 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -20,7 +20,6 @@ import java.util.Map; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.handler.AbstractMessageHandler; -import org.springframework.integration.jdbc.storedproc.ProcedureParameter; import org.springframework.messaging.Message; import org.springframework.util.Assert; @@ -33,7 +32,8 @@ import org.springframework.util.Assert; * Procedure. * * This may be sufficient for basic use cases. For more sophisticated options - * consider passing in one or more {@link ProcedureParameter}. + * consider passing in one or more + * {@link org.springframework.integration.jdbc.storedproc.ProcedureParameter}. * * If you need to handle the return parameters of the called stored procedure * explicitly, please consider using a {@link StoredProcOutboundGateway} instead. diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java index 8ca248e6a7..8402a32189 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -16,13 +16,11 @@ package org.springframework.integration.jdbc; -import java.sql.CallableStatement; import java.util.Map; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; -import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** @@ -62,10 +60,11 @@ public class StoredProcOutboundGateway extends AbstractReplyProducingMessageHand * the Stored Procedure/Function Call. If set to {@code true}, a {@code resultMap} that contains * only 1 element, will have that 1 element extracted and returned as payload. *

    If the {@code resultMap} contains more than 1 element and {@code expectSingleResult == true}, - * then a {@link MessagingException} is thrown. + * then a {@link org.springframework.messaging.MessagingException} is thrown. *

    Otherwise the complete {@code resultMap} is returned as the {@link Message} payload. *

    Important Note: Several databases such as H2 are not fully supported. - * The H2 database, for example, does not fully support the {@link CallableStatement} + * The H2 database, for example, does not fully support the + * {@link java.sql.CallableStatement} * semantics and when executing function calls against H2, a result list is * returned rather than a single value. *

    Therefore, even if you set {@code expectSingleResult = true}, you may end up with diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java index 393fcbd22a..70f3b30366 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java @@ -16,11 +16,9 @@ package org.springframework.integration.jdbc; -import java.sql.CallableStatement; import java.util.Map; import org.springframework.integration.endpoint.AbstractMessageSource; -import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; @@ -32,6 +30,7 @@ import org.springframework.util.Assert; * * @author Gunnar Hillert * @author Artem Bilan + * @author Gary Russell * * @since 2.1 */ @@ -57,9 +56,11 @@ public class StoredProcPollingChannelAdapter extends AbstractMessageSourceorg/springframework/integration/jdbc/schema-*.sql, * where * is the target database type. *

    - * The transaction management is required to use this {@link MetadataStore}. + * The transaction management is required to use this {@link ConcurrentMetadataStore}. * * @author Bojan Vukasovic * @author Artem Bilan + * @author Gary Russell * * @since 5.0 */ diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java index c06412dc83..f9cb2ff164 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java @@ -41,17 +41,12 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.integration.jdbc.store.channel.ChannelMessageStorePreparedStatementSetter; import org.springframework.integration.jdbc.store.channel.ChannelMessageStoreQueryProvider; import org.springframework.integration.jdbc.store.channel.MessageRowMapper; -import org.springframework.integration.jdbc.store.channel.OracleChannelMessageStoreQueryProvider; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupFactory; -import org.springframework.integration.store.MessageGroupStore; -import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.PriorityCapableChannelMessageStore; import org.springframework.integration.store.SimpleMessageGroupFactory; import org.springframework.integration.support.converter.WhiteListDeserializingConverter; -import org.springframework.integration.transaction.TransactionSynchronizationFactory; import org.springframework.integration.util.UUIDConverter; -import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; @@ -66,7 +61,8 @@ import org.springframework.util.StringUtils; /** *

    - * Channel-specific implementation of {@link MessageGroupStore} using a relational + * Channel-specific implementation of + * {@link org.springframework.integration.store.MessageGroupStore} using a relational * database via JDBC. * * This message store shall be used for message channels only. @@ -176,7 +172,8 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto } /** - * Create a {@link MessageStore} with all mandatory properties. The passed-in + * Create a {@link org.springframework.integration.store.MessageStore} + * with all mandatory properties. The passed-in * {@link DataSource} is used to instantiate a {@link JdbcTemplate} * with {@link JdbcTemplate#setFetchSize(int)} set to 1 * and with {@link JdbcTemplate#setMaxRows(int)} set to 1. @@ -223,12 +220,13 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto } /** - * The {@link JdbcOperations} to use when interacting with the database. Either + * The {@link org.springframework.jdbc.core.JdbcOperations} + * to use when interacting with the database. Either * this property can be set or the {@link #setDataSource(DataSource) dataSource}. * Please consider passing in a {@link JdbcTemplate} with a fetchSize property * of 1. This is particularly important for Oracle to ensure First In, First Out (FIFO) * message retrieval characteristics. - * @param jdbcTemplate a {@link JdbcOperations} + * @param jdbcTemplate a {@link org.springframework.jdbc.core.JdbcOperations} */ public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { Assert.notNull(jdbcTemplate, "The provided jdbcTemplate must not be null."); @@ -320,14 +318,16 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto * oldest entry for a giving channel (groupKey) and region ({@link #setRegion(String)}). * If you do that with multiple threads and you are using transactions, other * threads may be waiting for that same locked row.

    - *

    If using the provided {@link OracleChannelMessageStoreQueryProvider}, don't set {@link #usingIdCache} + *

    If using the provided + * {@link org.springframework.integration.jdbc.store.channel.OracleChannelMessageStoreQueryProvider}, + * don't set {@link #usingIdCache} * to true, as the Oracle query will ignore locked rows.

    *

    Using the id cache, the {@link JdbcChannelMessageStore} will store each * message id in an in-memory collection for the duration of processing. With * that, any polling threads will explicitly exclude those messages from * being polled.

    *

    For this to work, you must setup the corresponding - * {@link TransactionSynchronizationFactory}:

    + * {@link org.springframework.integration.transaction.TransactionSynchronizationFactory}:

    * 
     	 * {@code
 	 * 
@@ -336,7 +336,8 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto
 	 * 
 	 * }
 	 *
    - * This {@link TransactionSynchronizationFactory} is then referenced in the + * This {@link org.springframework.integration.transaction.TransactionSynchronizationFactory} + * is then referenced in the * transaction configuration of the poller: * 
     	 * {@code
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java
index 2db6b50850..3f31ee309c 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -53,7 +53,6 @@ import org.springframework.jdbc.support.lob.DefaultLobHandler;
 import org.springframework.jdbc.support.lob.LobHandler;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageChannel;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -62,7 +61,8 @@ import org.springframework.util.StringUtils;
  * tables are packaged as org/springframework/integration/jdbc/schema-*.sql, where * is the
  * target database type.
  * 
    
- * If you intend backing a {@link MessageChannel} using a JDBC-based Message Store,
+ * If you intend backing a {@link org.springframework.messaging.MessageChannel}
+ * using a JDBC-based Message Store,
  * please consider using the channel-specific {@link JdbcChannelMessageStore} instead.
  * This implementation is intended for correlation components (e.g. {@code }),
  * {@code } and similar.
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java
index ceb809c7db..b201b6409a 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -16,15 +16,14 @@
 
 package org.springframework.integration.jdbc.store.channel;
 
-import org.springframework.integration.jdbc.store.JdbcChannelMessageStore;
-
-
 /**
  * Common interface used in order to configure the
- * {@link JdbcChannelMessageStore} to provide database-specific queries.
+ * {@link org.springframework.integration.jdbc.store.JdbcChannelMessageStore} to provide
+ * database-specific queries.
  *
  * @author Gunnar Hillert
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 2.2
  */
 public interface ChannelMessageStoreQueryProvider {
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java
index da8f52887d..fd12c0ff31 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java
@@ -16,14 +16,14 @@
 
 package org.springframework.integration.jdbc.store.channel;
 
-import org.springframework.integration.jdbc.store.JdbcChannelMessageStore;
-import org.springframework.jdbc.core.JdbcTemplate;
-
 /**
- * Contains Oracle-specific queries for the {@link JdbcChannelMessageStore}.
- * Please ensure that the used {@link JdbcTemplate}'s fetchSize property is 1.
+ * Contains Oracle-specific queries for the
+ * {@link org.springframework.integration.jdbc.store.JdbcChannelMessageStore}. Please
+ * ensure that the used {@link org.springframework.jdbc.core.JdbcTemplate}'s fetchSize
+ * property is 1.
  * 
    
- * Fore more details, please see: http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked
+ * Fore more details, please see:
+ * http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked
  *
  * @author Gunnar Hillert
  * @author Artem Bilan
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageChannelSpec.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageChannelSpec.java
index 6d9beef280..4cae18216f 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageChannelSpec.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageChannelSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 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.
@@ -20,20 +20,19 @@ import java.util.concurrent.Executor;
 
 import javax.jms.ConnectionFactory;
 
-import org.springframework.integration.jms.AbstractJmsChannel;
-import org.springframework.integration.jms.SubscribableJmsChannel;
 import org.springframework.integration.jms.config.JmsChannelFactoryBean;
 import org.springframework.jms.listener.AbstractMessageListenerContainer;
-import org.springframework.jms.listener.DefaultMessageListenerContainer;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.ErrorHandler;
 
 /**
- * A {@link JmsMessageChannelSpec} for subscribable {@link AbstractJmsChannel}s.
+ * A {@link JmsMessageChannelSpec} for subscribable
+ * {@link org.springframework.integration.jms.AbstractJmsChannel}s.
  *
  * @param  the target {@link JmsMessageChannelSpec} implementation type.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 5.0
  */
 public class JmsMessageChannelSpec> extends JmsPollableMessageChannelSpec {
@@ -45,7 +44,7 @@ public class JmsMessageChannelSpec> extends J
 	/**
 	 * Configure the type of the container.
 	 * {@link AbstractMessageListenerContainer}. Defaults to
-	 * {@link DefaultMessageListenerContainer}.
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param containerType the containerType.
 	 * @return the current {@link JmsMessageChannelSpec}.
 	 */
@@ -55,11 +54,12 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}
 	 * or a {@link org.springframework.jms.listener.SimpleMessageListenerContainer}.
 	 * @param concurrentConsumers the concurrentConsumers.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setConcurrentConsumers(int)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setConcurrentConsumers(int)
 	 * @see org.springframework.jms.listener.SimpleMessageListenerContainer#setConcurrentConsumers(int)
 	 */
 	public S concurrentConsumers(int concurrentConsumers) {
@@ -70,7 +70,7 @@ public class JmsMessageChannelSpec> extends J
 	/**
 	 * @param maxSubscribers the maxSubscribers.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see SubscribableJmsChannel#setMaxSubscribers(int)
+	 * @see org.springframework.integration.jms.SubscribableJmsChannel#setMaxSubscribers(int)
 	 */
 	public S maxSubscribers(int maxSubscribers) {
 		this.jmsChannelFactoryBean.setMaxSubscribers(maxSubscribers);
@@ -128,10 +128,11 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param idleTaskExecutionLimit the idleTaskExecutionLimit.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setIdleTaskExecutionLimit(int)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setIdleTaskExecutionLimit(int)
 	 */
 	public S idleTaskExecutionLimit(int idleTaskExecutionLimit) {
 		this.jmsChannelFactoryBean.setIdleTaskExecutionLimit(idleTaskExecutionLimit);
@@ -139,10 +140,11 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param maxMessagesPerTask the maxMessagesPerTask.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setMaxMessagesPerTask(int)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setMaxMessagesPerTask(int)
 	 */
 	public S maxMessagesPerTask(int maxMessagesPerTask) {
 		this.jmsChannelFactoryBean.setMaxMessagesPerTask(maxMessagesPerTask);
@@ -150,10 +152,10 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param recoveryInterval the recoveryInterval.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setRecoveryInterval(long)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setRecoveryInterval(long)
 	 */
 	public S recoveryInterval(long recoveryInterval) {
 		this.jmsChannelFactoryBean.setRecoveryInterval(recoveryInterval);
@@ -161,11 +163,12 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}
 	 * or a {@link org.springframework.jms.listener.SimpleMessageListenerContainer}.
 	 * @param taskExecutor the taskExecutor.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setTaskExecutor(Executor)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setTaskExecutor(Executor)
 	 * @see org.springframework.jms.listener.SimpleMessageListenerContainer#setTaskExecutor(Executor)
 	 */
 	public S taskExecutor(Executor taskExecutor) {
@@ -174,10 +177,11 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param transactionManager the transactionManager.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setTransactionManager(PlatformTransactionManager)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setTransactionManager(PlatformTransactionManager)
 	 */
 	public S transactionManager(PlatformTransactionManager transactionManager) {
 		this.jmsChannelFactoryBean.setTransactionManager(transactionManager);
@@ -185,10 +189,11 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param transactionName the transactionName.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setTransactionName(String)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setTransactionName(String)
 	 */
 	public S transactionName(String transactionName) {
 		this.jmsChannelFactoryBean.setTransactionName(transactionName);
@@ -196,10 +201,11 @@ public class JmsMessageChannelSpec> extends J
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}.
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
 	 * @param transactionTimeout the transactionTimeout.
 	 * @return the current {@link JmsMessageChannelSpec}.
-	 * @see DefaultMessageListenerContainer#setTransactionTimeout(int)
+	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setTransactionTimeout(int)
 	 */
 	public S transactionTimeout(int transactionTimeout) {
 		this.jmsChannelFactoryBean.setTransactionTimeout(transactionTimeout);
@@ -208,8 +214,9 @@ public class JmsMessageChannelSpec> extends J
 
 	/**
 	 * Only applies if the {@link #containerType(Class)} is a
-	 * {@link DefaultMessageListenerContainer}.
-	 * @param cacheLevel the value for {@code DefaultMessageListenerContainer.cacheLevel}
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}.
+	 * @param cacheLevel the value for
+	 * {@code org.springframework.jms.listener.DefaultMessageListenerContainer.cacheLevel}
 	 * @return the current {@link JmsMessageChannelSpec}.
 	 * @see org.springframework.jms.listener.DefaultMessageListenerContainer#setCacheLevel(int)
 	 */
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPublishSubscribeMessageChannelSpec.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPublishSubscribeMessageChannelSpec.java
index b492513ba7..51d847e9f9 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPublishSubscribeMessageChannelSpec.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPublishSubscribeMessageChannelSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 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.
@@ -18,8 +18,6 @@ package org.springframework.integration.jms.dsl;
 
 import javax.jms.ConnectionFactory;
 
-import org.springframework.jms.listener.DefaultMessageListenerContainer;
-
 /**
  * A {@link JmsMessageChannelSpec} for a {@link org.springframework.integration.jms.SubscribableJmsChannel}
  * configured with a topic.
@@ -66,7 +64,8 @@ public class JmsPublishSubscribeMessageChannelSpec
 	}
 
 	/**
-	 * Only applies if the {@link #containerType(Class)} is a {@link DefaultMessageListenerContainer}
+	 * Only applies if the {@link #containerType(Class)} is a
+	 * {@link org.springframework.jms.listener.DefaultMessageListenerContainer}
 	 * or a {@link org.springframework.jms.listener.SimpleMessageListenerContainer}.
 	 * @param pubSubNoLocal the pubSubNoLocal.
 	 * @return the current {@link JmsPublishSubscribeMessageChannelSpec}.
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java
index 489d0ed10a..f59d9b0f48 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -20,15 +20,14 @@ import javax.management.MBeanServerConnection;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.jmx.support.ObjectNameManager;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
 
 /**
- * A {@link MessageSource} implementation that retrieves the current
- * value of a JMX attribute each time {@link #receive()} is invoked.
+ * A {@link org.springframework.integration.core.MessageSource} implementation that
+ * retrieves the current value of a JMX attribute each time {@link #receive()} is invoked.
  *
  * @author Mark Fisher
  * @author Gary Russell
diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java
index 1c9f2ad13a..e9df68f3a6 100644
--- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java
+++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -26,13 +26,13 @@ import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
 
-import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
 
 /**
- * A {@link MessageSource} implementation that retrieves a snapshot of a filtered subset of the MBean tree.
+ * A {@link org.springframework.integration.core.MessageSource} implementation that
+ * retrieves a snapshot of a filtered subset of the MBean tree.
  *
  * @author Stuart Williams
  * @author Gary Russell
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java
index ef7da8bfd0..c171a0f4c5 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java
@@ -20,7 +20,6 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -327,7 +326,7 @@ public class JpaExecutor implements InitializingBean, BeanFactoryAware {
 	 * Set the expression that will be evaluated to get the first result in the query executed.
 	 * If a null expression is set, all the results in the result set will be retrieved
 	 * @param firstResultExpression The first result expression.
-	 * @see Query#setFirstResult(int)
+	 * @see javax.persistence.Query#setFirstResult(int)
 	 */
 	public void setFirstResultExpression(Expression firstResultExpression) {
 		this.firstResultExpression = firstResultExpression;
@@ -357,7 +356,7 @@ public class JpaExecutor implements InitializingBean, BeanFactoryAware {
 	 * Set the max number of results to retrieve from the database. Defaults to
 	 * 0, which means that all possible objects shall be retrieved.
 	 * @param maxNumberOfResults Must not be negative.
-	 * @see Query#setMaxResults(int)
+	 * @see javax.persistence.Query#setMaxResults(int)
 	 */
 	public void setMaxNumberOfResults(int maxNumberOfResults) {
 		this.setMaxResultsExpression(new LiteralExpression("" + maxNumberOfResults));
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java
index 83c1596145..f8c136d95b 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -18,8 +18,6 @@ package org.springframework.integration.jpa.core;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
-
 import org.springframework.integration.jpa.support.parametersource.ParameterSource;
 
 /**
@@ -28,6 +26,7 @@ import org.springframework.integration.jpa.support.parametersource.ParameterSour
  *
  * @author Amol Nayak
  * @author Gunnar Hillert
+ * @author Gary Russell
  * @since 2.2
  *
  */
@@ -149,9 +148,11 @@ public interface JpaOperations {
 	Object getSingleResultForQuery(String query, ParameterSource source);
 
 	/**
-	 * The entity to be merged with the {@link EntityManager}. The provided object can
+	 * The entity to be merged with the {@link javax.persistence.EntityManager}.
+	 * The provided object can
 	 * also be an {@link Iterable} in which case each object of the {@link Iterable}
-	 * is treated as an entity and merged with the {@link EntityManager}. {@code Null}
+	 * is treated as an entity and merged with the
+	 * {@link javax.persistence.EntityManager}. {@code Null}
 	 * values returned while iterating over the {@link Iterable} are ignored.
 	 *
 	 * @param entity Must not be null.
@@ -160,9 +161,11 @@ public interface JpaOperations {
 	Object merge(Object entity);
 
 	/**
-	 * The entity to be merged with the {@link EntityManager}. The provided object can
+	 * The entity to be merged with the {@link javax.persistence.EntityManager}.
+	 * The provided object can
 	 * also be an {@link Iterable} in which case each object of the {@link Iterable}
-	 * is treated as an entity and merged with the {@link EntityManager}.
+	 * is treated as an entity and merged with the
+	 * {@link javax.persistence.EntityManager}.
 	 * In addition the {@link javax.persistence.EntityManager#flush()} is called after the merge
 	 * and after each batch, as it is specified using {@code flushSize} parameter and if
 	 * provided object is {@link Iterable}.
@@ -180,7 +183,8 @@ public interface JpaOperations {
 	/**
 	 * Persists the entity. The provided object can also be an {@link Iterable}
 	 * in which case each object of the {@link Iterable} is treated as an entity
-	 * and persisted with the {@link EntityManager}. {@code Null} values returned
+	 * and persisted with the {@link javax.persistence.EntityManager}.
+	 * {@code Null} values returned
 	 * while iterating over the {@link Iterable} are ignored.
 	 *
 	 * @param entity Must not be null
@@ -191,7 +195,8 @@ public interface JpaOperations {
 	/**
 	 * Persists the entity. The provided object can also be an {@link Iterable}
 	 * in which case each object of the {@link Iterable} is treated as an entity
-	 * and persisted with the {@link EntityManager}. {@code Null} values returned
+	 * and persisted with the {@link javax.persistence.EntityManager}.
+	 * {@code Null} values returned
 	 * while iterating over the {@link Iterable} are ignored.
 	 * In addition the {@link javax.persistence.EntityManager#flush()} is called after the persist
 	 * and after each batch, as it is specified using {@code flushSize} parameter and if
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java
index 75b8fb3ba8..e849ac89a5 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java
@@ -18,7 +18,6 @@ package org.springframework.integration.jpa.inbound;
 
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.integration.jpa.core.JpaExecutor;
-import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
 /**
@@ -44,6 +43,7 @@ import org.springframework.util.Assert;
  * @author Amol Nayak
  * @author Gunnar Hillert
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 2.2
  *
@@ -74,7 +74,8 @@ public class JpaPollingChannelAdapter extends AbstractMessageSource {
 	/**
 	 * Use {@link JpaExecutor#poll()} to executes the JPA operation.
 	 * If {@link JpaExecutor#poll()} returns null, this method will return
-	 * null. Otherwise, a new {@link Message} is constructed and returned.
+	 * null. Otherwise, a new {@link org.springframework.messaging.Message}
+	 * is constructed and returned.
 	 */
 	@Override
 	protected Object doReceive() {
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java
index 6de879fdf1..88ac1f295b 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -40,6 +40,7 @@ import org.springframework.util.Assert;
  * @author Gunnar Hillert
  * @author Amol Nayak
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 2.2
  *
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java
index 3f9bf7155d..052943e30c 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java
@@ -21,19 +21,18 @@ import java.util.List;
 import org.aopalliance.aop.Advice;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.integration.jpa.core.JpaExecutor;
 import org.springframework.integration.jpa.support.OutboundGatewayType;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
-import org.springframework.transaction.interceptor.TransactionInterceptor;
 
 /**
  * The {@link JpaOutboundGatewayFactoryBean} creates instances of the
- * {@link JpaOutboundGateway}. Optionally this {@link FactoryBean} will add Aop
- * Advices (e.g. {@link TransactionInterceptor} to the {@link JpaOutboundGateway}
- * instance.
+ * {@link JpaOutboundGateway}. Optionally this
+ * {@link org.springframework.beans.factory.FactoryBean} will add Aop Advices (e.g.
+ * {@link org.springframework.transaction.interceptor.TransactionInterceptor} to the
+ * {@link JpaOutboundGateway} instance.
  *
  * @author Amol Nayak
  * @author Gunnar Hillert
diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
index da7a1f6464..8283141606 100644
--- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
+++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/parametersource/BeanPropertyParameterSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -22,12 +22,13 @@ import java.util.List;
 
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.NotReadablePropertyException;
-import org.springframework.beans.PropertyAccessor;
 import org.springframework.beans.PropertyAccessorFactory;
 
 /**
  *
  * @author Gunnar Hillert
+ * @author Gary Russell
+ *
  * @since 2.2
  *
  */
@@ -47,10 +48,12 @@ public class BeanPropertyParameterSource implements ParameterSource {
 	}
 
 
+	@Override
 	public boolean hasValue(String paramName) {
 		return this.beanWrapper.isReadableProperty(paramName);
 	}
 
+	@Override
 	public Object getValue(String paramName) {
 		try {
 			return this.beanWrapper.getPropertyValue(paramName);
@@ -62,7 +65,8 @@ public class BeanPropertyParameterSource implements ParameterSource {
 
 	/**
 	 * Provide access to the property names of the wrapped bean.
-	 * Uses support provided in the {@link PropertyAccessor} interface.
+	 * Uses support provided in the {@link org.springframework.beans.PropertyAccessor}
+	 * interface.
 	 * @return an array containing all the known property names
 	 */
 	public String[] getReadablePropertyNames() {
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
index bdd107a07c..21cc27bc03 100755
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java
@@ -24,7 +24,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
 
 import javax.mail.Folder;
-import javax.mail.FolderClosedException;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 
@@ -117,7 +116,7 @@ public class ImapIdleChannelAdapter extends MessageProducerSupport implements Be
 
 	/**
 	 * Specify whether the IDLE task should reconnect automatically after
-	 * catching a {@link FolderClosedException} while waiting for messages. The
+	 * catching a {@link javax.mail.FolderClosedException} while waiting for messages. The
 	 * default value is true.
 	 * @param shouldReconnectAutomatically true to reconnect.
 	 */
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
index bd3019b999..4fffbdf87f 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
@@ -20,14 +20,14 @@ import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
 
 /**
- * {@link MessageSource} implementation that delegates to a
+ * {@link org.springframework.integration.core.MessageSource} implementation that
+ * delegates to a
  * {@link MailReceiver} to poll a mailbox. Each poll of the mailbox may
  * return more than one message which will then be stored in a queue.
  *
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
index f6e9cd143b..d6e896ac59 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
@@ -29,7 +29,6 @@ import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMailMessage;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.util.Assert;
@@ -37,7 +36,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * A {@link MessageHandler} implementation for sending mail.
+ * A {@link org.springframework.messaging.MessageHandler} implementation for sending mail.
  *
  * 
    If the Message is an instance of {@link MailMessage}, it will be passed
  * as-is. If the Message payload is a byte array, it will be passed as an
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java
index e134265f8f..30b7358b52 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2014 the original author or authors.
+ * Copyright 2007-2018 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.
@@ -19,8 +19,6 @@ package org.springframework.integration.mail;
 import javax.mail.Folder;
 import javax.mail.MessagingException;
 import javax.mail.Service;
-import javax.mail.Store;
-import javax.mail.Transport;
 import javax.mail.URLName;
 
 import org.apache.commons.logging.Log;
@@ -44,8 +42,8 @@ public abstract class MailTransportUtils {
 	 * blocks in manual JavaMail code.
 	 *
 	 * @param service the JavaMail Service to close (may be null)
-	 * @see Transport
-	 * @see Store
+	 * @see javax.mail.Transport
+	 * @see javax.mail.Store
 	 */
 	public static void closeService(Service service) {
 		if (service != null) {
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java
index a0d7b71160..e0bd9a7bd3 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 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.
@@ -27,8 +27,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 
 import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.Part;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
 
@@ -46,7 +44,6 @@ import org.springframework.integration.support.PropertiesBuilder;
 import org.springframework.integration.transaction.TransactionInterceptorBuilder;
 import org.springframework.integration.transaction.TransactionSynchronizationFactory;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.util.Assert;
 
@@ -253,9 +250,10 @@ public class ImapIdleChannelAdapterSpec
 	}
 
 	/**
-	 * When a header mapper is provided determine whether an embedded {@link Part} (e.g
-	 * {@link Message} or {@link javax.mail.Multipart} content is rendered as a byte[] in
-	 * the payload. Otherwise, leave as a {@link Part}. These objects are not suitable for
+	 * When a header mapper is provided determine whether an embedded
+	 * {@link javax.mail.Part} (e.g {@link javax.mail.Message} or
+	 * {@link javax.mail.Multipart} content is rendered as a byte[] in the payload.
+	 * Otherwise, leave as a {@link javax.mail.Part}. These objects are not suitable for
 	 * downstream serialization. Default: true.
 	 * 
    
 	 * This has no effect if there is no header mapper, in that case the payload is the
@@ -296,7 +294,8 @@ public class ImapIdleChannelAdapterSpec
 
 	/**
 	 * Specify a {@link TransactionInterceptor} {@link Advice} with the provided
-	 * {@code PlatformTransactionManager} and default {@link DefaultTransactionAttribute}
+	 * {@code PlatformTransactionManager} and default
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute}
 	 * for the downstream flow.
 	 * @param transactionManager the {@link PlatformTransactionManager} to use.
 	 * @return the spec.
@@ -320,7 +319,8 @@ public class ImapIdleChannelAdapterSpec
 
 	/**
 	 * Specify a {@link TransactionInterceptor} {@link Advice} with default
-	 * {@code PlatformTransactionManager} and {@link DefaultTransactionAttribute} for the
+	 * {@code PlatformTransactionManager} and
+	 * {@link org.springframework.transaction.interceptor.DefaultTransactionAttribute} for the
 	 * downstream flow.
 	 * @return the spec.
 	 */
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/MailInboundChannelAdapterSpec.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/MailInboundChannelAdapterSpec.java
index bfe1544d0e..d32e180ef1 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/MailInboundChannelAdapterSpec.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/MailInboundChannelAdapterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2018 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.
@@ -23,8 +23,6 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 
 import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.Part;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
 
@@ -224,11 +222,13 @@ MailInboundChannelAdapterSpec, R e
 	}
 
 	/**
-	 * When a header mapper is provided determine whether an embedded {@link Part} (e.g
-	 * {@link Message} or {@link javax.mail.Multipart} content is rendered as a byte[] in the
-	 * payload. Otherwise, leave as a {@link Part}. These objects are not suitable for
+	 * When a header mapper is provided determine whether an embedded
+	 * {@link javax.mail.Part} (e.g {@link javax.mail.Message} or
+	 * {@link javax.mail.Multipart} content is rendered as a byte[] in the payload.
+	 * Otherwise, leave as a {@link javax.mail.Part}. These objects are not suitable for
 	 * downstream serialization. Default: true.
-	 * 
    This has no effect if there is no header mapper, in that case the payload is the
+	 * 
    
+	 * This has no effect if there is no header mapper, in that case the payload is the
 	 * {@link MimeMessage}.
 	 * @param embeddedPartsAsBytes the embeddedPartsAsBytes to set.
 	 * @return the spec.
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java
index df79f8c470..1e69641c34 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java
@@ -29,13 +29,11 @@ import org.springframework.expression.TypeLocator;
 import org.springframework.expression.common.LiteralExpression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.support.StandardTypeLocator;
-import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.AbstractMessageSource;
 import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.mongodb.support.MongoHeaders;
 import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
 import org.springframework.integration.transaction.IntegrationResourceHolder;
-import org.springframework.messaging.Message;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -43,14 +41,15 @@ import org.springframework.util.CollectionUtils;
 import com.mongodb.DBObject;
 
 /**
- * An instance of {@link MessageSource} which returns a {@link Message} with a payload
- * which is the result of execution of a {@link Query}. When expectSingleResult is false
- * (default),
- * the MongoDb {@link Query} is executed using {@link MongoOperations#find(Query, Class)}
- * method which returns a {@link List}. The returned {@link List} will be used as
- * the payoad of the {@link Message} returned by the {{@link #receive()} method.
- * An empty {@link List} is treated as null, thus resulting in no {@link Message} returned
- * by the {{@link #receive()} method.
+ * An instance of {@link org.springframework.integration.core.MessageSource} which returns
+ * a {@link org.springframework.messaging.Message} with a payload which is the result of
+ * execution of a {@link Query}. When expectSingleResult is false (default), the MongoDb
+ * {@link Query} is executed using {@link MongoOperations#find(Query, Class)} method which
+ * returns a {@link List}. The returned {@link List} will be used as the payoad of the
+ * {@link org.springframework.messaging.Message} returned by the {{@link #receive()}
+ * method. An empty {@link List} is treated as null, thus resulting in no
+ * {@link org.springframework.messaging.Message} returned by the {{@link #receive()}
+ * method.
  * 
    
  * When expectSingleResult is true, the {@link MongoOperations#findOne(Query, Class)} is
  * used instead, and the message payload will be the single object returned from the
@@ -60,6 +59,7 @@ import com.mongodb.DBObject;
  * @author Oleg Zhurakousky
  * @author Yaron Yamin
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 2.2
  */
@@ -133,7 +133,8 @@ public class MongoDbMessageSource extends AbstractMessageSource {
 	 * Default is 'false', which means the {@link #receive()} method will use
 	 * the {@link MongoTemplate#find(Query, Class)} method. If set to 'true',
 	 * {@link #receive()} will use {@link MongoTemplate#findOne(Query, Class)},
-	 * and the payload of the returned {@link Message} will be the returned target Object of type
+	 * and the payload of the returned {@link org.springframework.messaging.Message}
+	 * will be the returned target Object of type
 	 * identified by {{@link #entityClass} instead of a List.
 	 * @param expectSingleResult true if a single result is expected.
 	 */
@@ -189,7 +190,8 @@ public class MongoDbMessageSource extends AbstractMessageSource {
 	 * The payload can be either {@link List} of elements of objects of type
 	 * identified by {{@link #entityClass}, or a single element of type identified by {{@link #entityClass}
 	 * based on the value of {{@link #expectSingleResult} attribute which defaults to 'false' resulting
-	 * {@link Message} with payload of type {@link List}. The collection name used in the
+	 * {@link org.springframework.messaging.Message} with payload of type
+	 * {@link List}. The collection name used in the
 	 * query will be provided in the {@link MongoHeaders#COLLECTION_NAME} header.
 	 */
 	@Override
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java
index 8af664b589..5474fe4627 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015-2018 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.
@@ -30,8 +30,6 @@ import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.integration.metadata.ConcurrentMetadataStore;
 import org.springframework.util.Assert;
 
-import com.mongodb.DBCollection;
-
 /**
  * MongoDbMetadataStore implementation of {@link ConcurrentMetadataStore}.
  * Use this {@link org.springframework.integration.metadata.MetadataStore} to
@@ -40,6 +38,7 @@ import com.mongodb.DBCollection;
  *
  * @author Senthil Arumugam, Samiraj Panneer Selvam
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 4.2
  *
  */
@@ -104,7 +103,7 @@ public class MongoDbMetadataStore implements ConcurrentMetadataStore {
 	 * @param key the metadata entry key
 	 * @param value the metadata entry value
 	 * @see MongoTemplate#execute(String, org.springframework.data.mongodb.core.CollectionCallback)
-	 * @see DBCollection#save
+	 * @see com.mongodb.DBCollection#save
 	 */
 	@Override
 	public void put(String key, String value) {
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java
index e9802f6f44..3321efbb56 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java
@@ -26,10 +26,10 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.util.Assert;
 /**
- * Implementation of {@link MessageHandler} which writes Message payload into a MongoDb collection
+ * Implementation of {@link org.springframework.messaging.MessageHandler}
+ * which writes Message payload into a MongoDb collection
  * identified by evaluation of the {@link #collectionNameExpression}.
  *
  * @author Amol Nayak
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java
index ff086f0896..b18f65ea2f 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java
@@ -32,7 +32,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.integration.store.MessageGroup;
-import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.integration.store.MessageStore;
 import org.springframework.integration.store.SimpleMessageGroup;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
@@ -40,7 +39,8 @@ import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 
 /**
- * An alternate MongoDB {@link MessageStore} and {@link MessageGroupStore} which allows the user to
+ * An alternate MongoDB {@link MessageStore} and
+ * {@link org.springframework.integration.store.MessageGroupStore} which allows the user to
  * configure the instance of {@link MongoTemplate}. The mechanism of storing the messages/group of messages
  * in the store is and is different from {@link MongoDbMessageStore}. Since the store uses serialization of the
  * messages by default, all the headers, and the payload of the Message must implement {@link java.io.Serializable}
diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
index c2ee94aaf5..6356033bb3 100644
--- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
+++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
@@ -64,7 +64,6 @@ import org.springframework.integration.history.MessageHistory;
 import org.springframework.integration.message.AdviceMessage;
 import org.springframework.integration.store.AbstractMessageGroupStore;
 import org.springframework.integration.store.MessageGroup;
-import org.springframework.integration.store.MessageGroupStore;
 import org.springframework.integration.store.MessageMetadata;
 import org.springframework.integration.store.MessageStore;
 import org.springframework.integration.store.SimpleMessageGroup;
@@ -85,7 +84,8 @@ import com.mongodb.DBObject;
 
 
 /**
- * An implementation of both the {@link MessageStore} and {@link MessageGroupStore}
+ * An implementation of both the {@link MessageStore} and
+ * {@link org.springframework.integration.store.MessageGroupStore}
  * strategies that relies upon MongoDB for persistence.
  *
  * @author Mark Fisher
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
index 15c338f2a6..e70dc6e166 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
@@ -18,7 +18,6 @@ package org.springframework.integration.mqtt.config.xml;
 
 import org.w3c.dom.Element;
 
-import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -30,7 +29,7 @@ import org.springframework.util.StringUtils;
 /**
  * Contains various utility methods for parsing Mqtt Adapter
  * specific namespace elements as well as for the generation of the the
- * respective {@link BeanDefinition}s.
+ * respective {@link org.springframework.beans.factory.config.BeanDefinition}s.
  *
  * @author Gary Russell
  * @author Artem Bilan
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java
index afa516831f..e23748c915 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java
@@ -21,7 +21,6 @@ import java.util.Collection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean.CollectionType;
 import org.springframework.data.redis.support.collections.RedisStore;
@@ -77,7 +76,8 @@ public class RedisStoreMessageSource extends AbstractMessageSource {
 	 * Creates an instance with the provided {@link RedisConnectionFactory} and SpEL expression
 	 * which should resolve to a 'key' name of the collection to be used.
 	 * It will create and initialize an instance of {@link StringRedisTemplate} that uses
-	 * {@link StringRedisSerializer} for all serialization.
+	 * {@link org.springframework.data.redis.serializer.StringRedisSerializer} for all
+	 * serialization.
 	 * The 'keyExpression' will be evaluated on every call to the {@link #receive()} method.
 	 * @param connectionFactory The connection factory.
 	 * @param keyExpression The key expression.
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/metadata/RedisMetadataStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/metadata/RedisMetadataStore.java
index 1f8d3f9b9f..edd4cd01cf 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/metadata/RedisMetadataStore.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/metadata/RedisMetadataStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -22,12 +22,12 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.support.collections.RedisProperties;
 import org.springframework.integration.metadata.ConcurrentMetadataStore;
-import org.springframework.integration.metadata.MetadataStore;
 import org.springframework.util.Assert;
 
 /**
- * Redis implementation of {@link MetadataStore}. Use this {@link MetadataStore} to
- * achieve meta-data persistence across application restarts.
+ * Redis implementation of {@link ConcurrentMetadataStore}. Use this
+ * {@link ConcurrentMetadataStore} to achieve meta-data persistence across application
+ * restarts.
  * 
    
  * This implementation is based on the {@link RedisProperties} and its
  * {@link #replace(String, String, String)}; it can't currently be used with a Redis
@@ -45,7 +45,7 @@ public class RedisMetadataStore implements ConcurrentMetadataStore {
 	private final RedisProperties properties;
 
 	/**
-	 * Specifies the {@link RedisProperties} backend for this {@link MetadataStore}.
+	 * Specifies the {@link RedisProperties} backend for this {@link ConcurrentMetadataStore}.
 	 *
 	 * @param properties The properties.
 	 */
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java
index 29c673d73b..fc3aba27bd 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java
@@ -28,7 +28,6 @@ import org.springframework.data.redis.core.BoundZSetOperations;
 import org.springframework.data.redis.core.RedisConnectionUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean.CollectionType;
@@ -46,21 +45,20 @@ import org.springframework.integration.expression.FunctionExpression;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.redis.support.RedisHeaders;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 
 /**
- * Implementation of {@link MessageHandler} which writes Message data into a Redis store
- * identified by a key {@link String}.
+ * Implementation of {@link org.springframework.messaging.MessageHandler} which writes
+ * Message data into a Redis store identified by a key {@link String}.
  *
  * It supports the collection types identified by {@link CollectionType}.
  *
  * It supports batch updates or single item entry.
  *
- * "Batch updates" means that the payload of the Message may be a Map or Collection.
- * With such a payload, individual items from it are added to the corresponding Redis store.
+ * "Batch updates" means that the payload of the Message may be a Map or Collection. With
+ * such a payload, individual items from it are added to the corresponding Redis store.
  * See {@link #handleMessageInternal(Message)} for more details.
  *
  * You can instead choose to persist such a payload as a single item if the
@@ -119,7 +117,9 @@ public class RedisStoreWritingMessageHandler extends AbstractMessageHandler {
 	 * Constructs an instance using the provided {@link RedisConnectionFactory}.
 	 * It will use either a {@link StringRedisTemplate} if {@link #extractPayloadElements} is
 	 * true (default) or a {@link RedisTemplate} with {@link StringRedisSerializer}s for
-	 * keys and hash keys and {@link JdkSerializationRedisSerializer}s for values and
+	 * keys and hash keys and
+	 * {@link org.springframework.data.redis.serializer.JdkSerializationRedisSerializer}s
+	 * for values and
 	 * hash values, when it is false.
 	 * @param connectionFactory The connection factory.
 	 * @see #setExtractPayloadElements(boolean)
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
index 431432fa93..9ecf6d7e71 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
@@ -28,12 +28,12 @@ import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.integration.redis.util.RedisUtils;
 import org.springframework.integration.store.AbstractKeyValueMessageStore;
-import org.springframework.integration.store.MessageGroupStore;
-import org.springframework.integration.store.MessageStore;
 import org.springframework.util.Assert;
 
 /**
- * Redis implementation of the key/value style {@link MessageStore} and {@link MessageGroupStore}
+ * Redis implementation of the key/value style
+ * {@link org.springframework.integration.store.MessageStore} and
+ * {@link org.springframework.integration.store.MessageGroupStore}
  *
  * @author Oleg Zhurakousky
  * @author Gary Russell
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
index c636ed9ae9..c70ee75dbc 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
@@ -41,13 +41,12 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.integration.support.locks.ExpirableLockRegistry;
-import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Implementation of {@link LockRegistry} providing a distributed lock using Redis.
+ * Implementation of {@link ExpirableLockRegistry} providing a distributed lock using Redis.
  * Locks are stored under the key {@code registryKey:lockKey}. Locks expire after
  * (default 60) seconds. Threads unlocking an
  * expired lock will get an {@link IllegalStateException}. This should be
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/DefaultScriptExecutor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/DefaultScriptExecutor.java
index f90b89f894..2e9d5abadb 100644
--- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/DefaultScriptExecutor.java
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/DefaultScriptExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -19,10 +19,9 @@ package org.springframework.integration.scripting.jsr223;
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 
-import org.springframework.integration.scripting.ScriptExecutor;
-
 /**
- * Default implementation of the {@link ScriptExecutor}
+ * Default implementation of the
+ * {@link org.springframework.integration.scripting.ScriptExecutor}
  *
  * @author David Turanski
  * @author Mark Fisher
diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutor.java
index f71dabbcce..76085bd415 100644
--- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutor.java
+++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -19,10 +19,9 @@ package org.springframework.integration.scripting.jsr223;
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
 
-import org.springframework.integration.scripting.ScriptExecutor;
-
 /**
- * A {@link ScriptExecutor} that implements special handling required for Python to
+ * A {@link org.springframework.integration.scripting.ScriptExecutor}
+ * that implements special handling required for Python to
  * emulate behavior similar to other JSR223 scripting languages.
  * 
    
  * Script evaluation using the Jython implementation results in a null return
diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/SecurityContextPropagationChannelInterceptor.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/SecurityContextPropagationChannelInterceptor.java
index ef4e85649a..fa58673840 100644
--- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/SecurityContextPropagationChannelInterceptor.java
+++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/SecurityContextPropagationChannelInterceptor.java
@@ -22,13 +22,13 @@ import org.springframework.integration.channel.interceptor.ThreadStatePropagatio
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
-import org.springframework.messaging.support.ExecutorChannelInterceptor;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * The {@link ExecutorChannelInterceptor} implementation responsible for
+ * The {@link org.springframework.messaging.support.ExecutorChannelInterceptor}
+ * implementation responsible for
  * the {@link SecurityContext} propagation from one message flow's thread to another
  * through the {@link MessageChannel}s involved in the flow.
  * 
    
@@ -38,6 +38,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * and {@link org.springframework.integration.channel.QueueChannel}.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 4.2
  *
diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java b/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java
index 8814216572..53b7fb18ba 100644
--- a/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java
+++ b/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java
@@ -28,7 +28,6 @@ import org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator;
 import org.springframework.aop.support.DefaultBeanFactoryPointcutAdvisor;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.integration.security.channel.ChannelAccessPolicy;
 import org.springframework.integration.security.channel.ChannelSecurityInterceptor;
 import org.springframework.integration.security.channel.ChannelSecurityMetadataSource;
@@ -36,11 +35,13 @@ import org.springframework.lang.Nullable;
 import org.springframework.messaging.MessageChannel;
 
 /**
- * A {@link BeanPostProcessor} that proxies {@link MessageChannel}s to apply a {@link ChannelSecurityInterceptor}.
+ * A {@link org.springframework.beans.factory.config.BeanPostProcessor} that proxies
+ * {@link MessageChannel}s to apply a {@link ChannelSecurityInterceptor}.
  *
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Artem Bilan
+ * @author Gary Russell
  */
 @SuppressWarnings("serial")
 public class ChannelSecurityInterceptorBeanPostProcessor extends AbstractAutoProxyCreator {
diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java
index 45c4f466bb..f19f5fe2d1 100644
--- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java
+++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpFileInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -17,14 +17,13 @@
 package org.springframework.integration.sftp.session;
 
 import org.springframework.integration.file.remote.AbstractFileInfo;
-import org.springframework.integration.file.remote.FileInfo;
 import org.springframework.util.Assert;
 
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 import com.jcraft.jsch.SftpATTRS;
 
 /**
- * A {@link FileInfo} implementation for SFTP.
+ * A {@link org.springframework.integration.file.remote.FileInfo} implementation for SFTP.
  *
  * @author Gary Russell
  * @since 2.1
diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/config/StompInboundChannelAdapterParser.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/config/StompInboundChannelAdapterParser.java
index ec7e6abd1b..8d2e56f0f5 100644
--- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/config/StompInboundChannelAdapterParser.java
+++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/config/StompInboundChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 the original author or authors.
+ * Copyright 2015-2018 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.
@@ -20,17 +20,17 @@ import org.w3c.dom.Element;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.stomp.inbound.StompInboundChannelAdapter;
 
 /**
- * The {@link AbstractSingleBeanDefinitionParser} implementation for
+ * The {@link AbstractChannelAdapterParser} implementation for
  * the {@code } element.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 4.2
  */
 public class StompInboundChannelAdapterParser extends AbstractChannelAdapterParser {
diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/event/StompIntegrationEvent.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/event/StompIntegrationEvent.java
index 97c92f7577..5b7d79a730 100644
--- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/event/StompIntegrationEvent.java
+++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/event/StompIntegrationEvent.java
@@ -16,13 +16,13 @@
 
 package org.springframework.integration.stomp.event;
 
-import org.springframework.context.ApplicationEvent;
 import org.springframework.integration.events.IntegrationEvent;
 
 /**
- * Base class for all {@link ApplicationEvent}s generated by the STOMP Adapters.
+ * Base class for all {@link IntegrationEvent}s generated by the STOMP Adapters.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 4.2
  */
diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java
index 022f1ce2e8..eec154b873 100644
--- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java
+++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java
@@ -22,11 +22,11 @@ import java.io.OutputStream;
 
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessagingException;
 
 /**
- * A {@link MessageHandler} that writes a byte array to an {@link OutputStream}.
+ * A {@link org.springframework.messaging.MessageHandler} that writes a byte array to an
+ * {@link OutputStream}.
  *
  * @author Mark Fisher
  * @author Gary Russell
diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java
index 9b221b2496..103f2a48ae 100644
--- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java
+++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java
@@ -26,12 +26,12 @@ import java.io.Writer;
 
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
 
 /**
- * A {@link MessageHandler} that writes characters to a {@link Writer}.
+ * A {@link org.springframework.messaging.MessageHandler}
+ * that writes characters to a {@link Writer}.
  * String, character array, and byte array payloads will be written directly,
  * but for other payload types, the result of the object's {@link #toString()}
  * method will be written. To append a new-line after each write, set the
diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java
index b42d6b357a..0a25dcc2c0 100644
--- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java
+++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -24,7 +24,6 @@ import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.junit.Assert;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -33,7 +32,7 @@ import org.springframework.messaging.MessageHeaders;
  * Are the {@link MessageHeaders} of a {@link Message} containing any entry
  * or multiple that match?
  * 
    
- * For example using {@link Assert#assertThat(Object, Matcher)} for a single
+ * For example using {@link org.junit.Assert#assertThat(Object, Matcher)} for a single
  * entry:
  *
  * 
    @@ -69,6 +68,7 @@ import org.springframework.messaging.MessageHeaders;
  * @author Alex Peters
  * @author Iwein Fuld
  * @author Artem Bilan
+ * @author Gary Russell
  *
  */
 public class HeaderMatcher extends TypeSafeMatcher> {
diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java
index f4b321f7e7..be85b73997 100644
--- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java
+++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -19,9 +19,7 @@ package org.springframework.integration.test.matcher;
 import java.util.Map;
 
 import org.hamcrest.Matcher;
-import org.mockito.ArgumentMatcher;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 import org.mockito.internal.hamcrest.HamcrestArgumentMatcher;
 
 import org.springframework.messaging.Message;
@@ -32,11 +30,11 @@ import org.springframework.messaging.Message;
  * This class contains expressive factory methods for the most common Mockito
  * matchers needed when matching {@link Message}s. If you need a different
  * matching strategy, any Hamcrest matcher can be used in Mockito through
- * {@link Mockito#argThat(ArgumentMatcher)}.
+ * {@link org.mockito.Mockito#argThat(org.mockito.ArgumentMatcher)}.
  *
  * Example usage:
  * 
    
- * With {@link Mockito#verify(Object)}:
+ * With {@link org.mockito.Mockito#verify(Object)}:
  * 
    
  *
  * 
    @@ -50,7 +48,7 @@ import org.springframework.messaging.Message;
  * }
  * 
    
  * 
    
- * With {@link Mockito#when(Object)}:
+ * With {@link org.mockito.Mockito#when(Object)}:
  * 
    
  *
  * 
    diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java
index e382ea15e6..cb91e192f8 100644
--- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java
+++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -21,7 +21,6 @@ import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.core.IsEqual;
-import org.junit.Assert;
 
 import org.springframework.messaging.Message;
 
@@ -29,7 +28,7 @@ import org.springframework.messaging.Message;
  * Is the payload of a {@link Message} equal to a given value or is matching
  * a given matcher?
  * 
    
- * A Junit example using {@link Assert#assertThat(Object, Matcher)} could look
+ * A Junit example using {@link org.junit.Assert#assertThat(Object, Matcher)} could look
  * like this to test a payload value:
  *
  * 
    @@ -41,7 +40,7 @@ import org.springframework.messaging.Message;
  * 
    
  *
  * 
    
- * An example using {@link Assert#assertThat(Object, Matcher)} delegating to
+ * An example using {@link org.junit.Assert#assertThat(Object, Matcher)} delegating to
  * another {@link Matcher}.
  *
  * 
    @@ -56,6 +55,7 @@ import org.springframework.messaging.Message;
  * @author Alex Peters
  * @author Iwein Fuld
  * @author Artem Bilan
+ * @author Gary Russell
  *
  */
 public class PayloadMatcher extends TypeSafeMatcher> {
diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
index cf4dcedf11..541145b80f 100644
--- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
+++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/dsl/WebFluxMessageHandlerSpec.java
@@ -27,15 +27,13 @@ import org.springframework.integration.webflux.outbound.WebFluxRequestExecutingM
 import org.springframework.web.reactive.function.BodyExtractor;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * The {@link BaseHttpMessageHandlerSpec} implementation for the {@link WebFluxRequestExecutingMessageHandler}.
  *
  * @author Shiliang Li
  * @author Artem Bilan
  * @author Abhijit Sarkar
+ * @author Gary Russell
  *
  * @since 5.0
  *
@@ -60,11 +58,15 @@ public class WebFluxMessageHandlerSpec
 	}
 
 	/**
-	 * The boolean flag to identify if the reply payload should be as a {@link Flux} from the response body
-	 * or as resolved value from the {@link Mono} of the response body.
+	 * The boolean flag to identify if the reply payload should be as a
+	 * {@link reactor.core.publisher.Flux} from the response body
+	 * or as resolved value from the {@link reactor.core.publisher.Mono}
+	 * of the response body.
 	 * Defaults to {@code false} - simple value is pushed downstream.
 	 * Makes sense when {@code expectedResponseType} is configured.
-	 * @param replyPayloadToFlux represent reply payload as a {@link Flux} or as a value from the {@link Mono}.
+	 * @param replyPayloadToFlux represent reply payload as a
+	 * {@link reactor.core.publisher.Flux} or as a value from the
+	 * {@link reactor.core.publisher.Mono}.
 	 * @return the spec
 	 * @since 5.0.1
 	 * @see WebFluxRequestExecutingMessageHandler#setReplyPayloadToFlux(boolean)
diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
index ca847f7d32..95a6d16c63 100644
--- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
+++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
@@ -47,7 +47,6 @@ import org.springframework.http.codec.HttpMessageWriter;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.integration.gateway.MessagingGatewaySupport;
 import org.springframework.integration.http.inbound.BaseHttpInboundEndpoint;
 import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
 import org.springframework.messaging.Message;
@@ -67,10 +66,11 @@ import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 
 /**
- * A {@link MessagingGatewaySupport} implementation for Spring WebFlux
- * HTTP requests execution.
+ * A {@link org.springframework.integration.gateway.MessagingGatewaySupport}
+ * implementation for Spring WebFlux HTTP requests execution.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 5.0
  *
diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java
index 1b214fa8f2..0c5d8a5abc 100644
--- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java
+++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java
@@ -26,8 +26,6 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.integration.http.config.HttpContextUtils;
 import org.springframework.integration.http.inbound.BaseHttpInboundEndpoint;
 import org.springframework.integration.http.inbound.CrossOrigin;
-import org.springframework.integration.http.inbound.RequestMapping;
-import org.springframework.integration.webflux.support.WebFluxContextUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -51,15 +49,15 @@ import org.springframework.web.server.WebHandler;
  * bean with appropriate configuration for
  * {@link org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping}.
  * It is recommended to have only one similar bean in the application context using the 'id'
- * {@link WebFluxContextUtils#HANDLER_MAPPING_BEAN_NAME}.
+ * {@link org.springframework.integration.webflux.support.WebFluxContextUtils#HANDLER_MAPPING_BEAN_NAME}.
  * 
    
  * In most cases, Spring MVC offers to configure Request Mapping via
  * {@code org.springframework.stereotype.Controller} and
- * {@link org.springframework.web.bind.annotation.RequestMapping}.
+ * {@link org.springframework.integration.http.inbound.RequestMapping}.
  * That's why Spring MVC's Handler Mapping infrastructure relies on
  * {@link org.springframework.web.method.HandlerMethod}, as different methods at the same
  * {@code org.springframework.stereotype.Controller} user-class may have their own
- * {@link org.springframework.web.bind.annotation.RequestMapping}.
+ * {@link org.springframework.integration.http.inbound.RequestMapping}.
  * On the other side, all Spring Integration HTTP Inbound Endpoints are configured on
  * the basis of the same {@link org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport}
  * class and there is no single {@link org.springframework.web.reactive.result.method.RequestMappingInfo}
@@ -75,10 +73,11 @@ import org.springframework.web.server.WebHandler;
  * them during the {@link WebFluxInboundEndpoint} destruction.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 5.0
  *
- * @see RequestMapping
+ * @see org.springframework.integration.http.inbound.RequestMapping
  * @see RequestMappingHandlerMapping
  */
 public class WebFluxIntegrationRequestMappingHandlerMapping extends RequestMappingHandlerMapping
@@ -129,7 +128,8 @@ public class WebFluxIntegrationRequestMappingHandlerMapping extends RequestMappi
 
 	/**
 	 * Create a {@link RequestMappingInfo} from
-	 * a Spring Integration Reactive HTTP Inbound Endpoint {@link RequestMapping}.
+	 * a Spring Integration Reactive HTTP Inbound Endpoint
+	 * {@link org.springframework.integration.http.inbound.RequestMapping}.
 	 * @see RequestMappingHandlerMapping#getMappingForMethod
 	 */
 	private RequestMappingInfo getMappingForEndpoint(WebFluxInboundEndpoint endpoint) {
diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java
index 1ddbf5c3da..361efbc064 100644
--- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java
+++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java
@@ -20,7 +20,6 @@ import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.function.Supplier;
 
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferUtils;
@@ -35,7 +34,6 @@ import org.springframework.http.client.reactive.ClientHttpResponse;
 import org.springframework.integration.expression.ValueExpression;
 import org.springframework.integration.http.outbound.AbstractHttpRequestExecutingMessageHandler;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
 import org.springframework.web.reactive.function.BodyExtractor;
@@ -49,11 +47,12 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
- * A {@link MessageHandler} implementation that executes HTTP requests by delegating
- * to a Reactive {@link WebClient} instance.
+ * A {@link org.springframework.messaging.MessageHandler} implementation that executes
+ * HTTP requests by delegating to a Reactive {@link WebClient} instance.
  *
  * @author Shiliang Li
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 5.0
  *
@@ -109,7 +108,7 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
 	/**
 	 * Create a handler that will send requests to the provided URI using a provided WebClient.
 	 * @param uriExpression A SpEL Expression that can be resolved against the message object and
-	 * {@link BeanFactory}.
+	 * {@link org.springframework.beans.factory.BeanFactory}.
 	 * @param webClient The WebClient to use.
 	 */
 	public WebFluxRequestExecutingMessageHandler(Expression uriExpression, WebClient webClient) {
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java
index 7e01eb7001..ec603cfa1d 100644
--- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java
+++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/DefaultSoapHeaderMapper.java
@@ -29,7 +29,6 @@ import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 
 import org.springframework.integration.mapping.AbstractHeaderMapper;
-import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.util.StringUtils;
 import org.springframework.ws.soap.SoapHeader;
 import org.springframework.ws.soap.SoapHeaderElement;
@@ -39,7 +38,8 @@ import org.springframework.xml.namespace.QNameUtils;
 import org.springframework.xml.transform.TransformerHelper;
 
 /**
- * A {@link HeaderMapper} implementation for mapping to and from a SoapHeader.
+ * A {@link org.springframework.integration.mapping.HeaderMapper} implementation for
+ * mapping to and from a SoapHeader.
  * The {@link #setRequestHeaderNames(String[])} and {@link #setReplyHeaderNames(String[])}
  * accept exact name Strings or simple patterns (e.g. "start*", "*end", or "*").
  * By default all inbound headers will be accepted, but any outbound header that should
@@ -52,6 +52,7 @@ import org.springframework.xml.transform.TransformerHelper;
  * @author Stephane Nicoll
  * @author Mauro Molinari
  * @author Artem Bilan
+ * @author Gary Russell
  *
  * @since 2.0
  */
diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SoapHeaderMapper.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SoapHeaderMapper.java
index 2d7f58e251..30875bbe94 100644
--- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SoapHeaderMapper.java
+++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SoapHeaderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 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.
@@ -16,14 +16,12 @@
 
 package org.springframework.integration.ws;
 
-import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.integration.mapping.RequestReplyHeaderMapper;
-import org.springframework.ws.soap.SoapHeader;
 import org.springframework.ws.soap.SoapMessage;
 
 /**
- * A convenience interface that extends {@link HeaderMapper}
- * but parameterized with {@link SoapHeader}.
+ * A convenience interface that extends {@link RequestReplyHeaderMapper},
+ * parameterized with {@link org.springframework.ws.soap.SoapHeader}.
  *
  * @author Oleg Zhurakousky
  * @since 2.1
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java
index f464f58eb1..c5e89e01cf 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -18,25 +18,25 @@ package org.springframework.integration.xml.selector;
 
 import java.util.Map;
 
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import org.springframework.integration.core.MessageSelector;
 import org.springframework.messaging.Message;
 import org.springframework.xml.xpath.XPathExpression;
 
 /**
- * Boolean XPath testing {@link MessageSelector}. Requires an XPathExpression
+ * Boolean XPath testing {@link org.springframework.integration.core.MessageSelector}.
+ * Requires an XPathExpression
  * which can be evaluated using {@link XPathExpression#evaluateAsBoolean(Node)}.
- * Supports payloads of type {@link Document} or {@link String}.
+ * Supports payloads of type {@link org.w3c.dom.Document} or {@link String}.
  *
  * @author Jonas Partner
+ * @author Gary Russell
  */
 public class BooleanTestXPathMessageSelector extends AbstractXPathMessageSelector {
 
 	/**
-	 * Create a boolean testing XPath {@link MessageSelector} supporting
-	 * multiple namespaces.
+	 * Create a boolean testing XPath {@link org.springframework.integration.core.MessageSelector}
+	 * supporting multiple namespaces.
 	 *
 	 * @param expression XPath expression as a String
 	 * @param namespaces Map of namespaces where the keys are namespace prefixes
@@ -46,7 +46,9 @@ public class BooleanTestXPathMessageSelector extends AbstractXPathMessageSelecto
 	}
 
 	/**
-	 * Create a boolean testing XPath {@link MessageSelector} supporting a single namespace.
+	 * Create a boolean testing XPath
+	 * {@link org.springframework.integration.core.MessageSelector} supporting a single
+	 * namespace.
 	 *
 	 * @param expression XPath expression as a String
 	 * @param prefix namespace prefix
@@ -57,7 +59,9 @@ public class BooleanTestXPathMessageSelector extends AbstractXPathMessageSelecto
 	}
 
 	/**
-	 * Create a boolean testing XPath {@link MessageSelector} with no namespace support.
+	 * Create a boolean testing XPath
+	 * {@link org.springframework.integration.core.MessageSelector} with no namespace
+	 * support.
 	 *
 	 * @param expression XPath expression as a String
 	 */
@@ -66,8 +70,9 @@ public class BooleanTestXPathMessageSelector extends AbstractXPathMessageSelecto
 	}
 
 	/**
-	 * Create a boolean testing XPath {@link MessageSelector} using the
-	 * provided {@link XPathExpression}.
+	 * Create a boolean testing XPath
+	 * {@link org.springframework.integration.core.MessageSelector} using the provided
+	 * {@link XPathExpression}.
 	 *
 	 * @param expression XPath expression
 	 */
@@ -79,6 +84,7 @@ public class BooleanTestXPathMessageSelector extends AbstractXPathMessageSelecto
 	/**
 	 * Return true if the {@link XPathExpression} evaluates to true
 	 */
+	@Override
 	public boolean accept(Message message) {
 		Node node = getConverter().convertToNode(message.getPayload());
 		return getXPathExpresion().evaluateAsBoolean(node);
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java
index 515b746855..bbf782270e 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -20,17 +20,17 @@ import java.util.Map;
 
 import org.w3c.dom.Node;
 
-import org.springframework.integration.core.MessageSelector;
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.xml.xpath.XPathExpression;
 
 /**
- * XPath {@link MessageSelector} that tests if a provided String value
- * matches a given Regular Expression.
+ * XPath {@link org.springframework.integration.core.MessageSelector} that tests if a
+ * provided String value matches a given Regular Expression.
  *
  * @author Mark Fisher
+ * @author Gary Russell
  * @since 2.1
  */
 public class RegexTestXPathMessageSelector extends AbstractXPathMessageSelector {
@@ -95,6 +95,7 @@ public class RegexTestXPathMessageSelector extends AbstractXPathMessageSelector
 	 * Evaluate the payload and return true if the value returned by the
 	 * {@link XPathExpression} matches the regex.
 	 */
+	@Override
 	public boolean accept(Message message) {
 		Node nodeToTest = getConverter().convertToNode(message.getPayload());
 		String xPathResult = getXPathExpresion().evaluateAsString(nodeToTest);
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java
index 2f0c759d0e..209b0de8f9 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -18,18 +18,18 @@ package org.springframework.integration.xml.selector;
 
 import java.util.Map;
 
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import org.springframework.integration.core.MessageSelector;
 import org.springframework.messaging.Message;
 import org.springframework.xml.xpath.XPathExpression;
 
 /**
- * XPath {@link MessageSelector} that tests if a provided value supports
- * payloads of type {@link Document} or {@link String}.
+ * XPath {@link org.springframework.integration.core.MessageSelector} that tests if a
+ * provided value supports payloads of type {@link org.w3c.dom.Document} or
+ * {@link String}.
  *
  * @author Jonas Partner
+ * @author Gary Russell
  */
 public class StringValueTestXPathMessageSelector extends AbstractXPathMessageSelector {
 
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java
index cb346de8a2..bdd912f85c 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.xml.splitter;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -57,7 +56,7 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
 
 /**
  * Message Splitter that uses an {@link XPathExpression} to split a
- * {@link Document}, {@link File} or {@link String} payload into a {@link NodeList}.
+ * {@link Document}, {@link java.io.File} or {@link String} payload into a {@link NodeList}.
  * The return value will be either Strings or {@link Node}s depending on the
  * received payload type. Additionally, node types will be converted to
  * Documents if the 'createDocuments' property is set to true.
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java
index 9db432c0f7..b524eec3aa 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -21,17 +21,19 @@ import java.io.IOException;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Result;
 
-import org.springframework.integration.transformer.AbstractTransformer;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.util.Assert;
 
 /**
- * An implementation of {@link AbstractTransformer} that delegates to an OXM {@link Marshaller}.
+ * An implementation of
+ * {@link org.springframework.integration.transformer.AbstractTransformer} that delegates
+ * to an OXM {@link Marshaller}.
  *
  * @author Mark Fisher
  * @author Jonas Partner
+ * @author Gary Russell
  */
 public class MarshallingTransformer extends AbstractXmlTransformer {
 
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
index d4289f1406..3493f2b667 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java
@@ -27,7 +27,6 @@ import javax.xml.transform.stream.StreamSource;
 import org.w3c.dom.Document;
 
 import org.springframework.integration.transformer.AbstractPayloadTransformer;
-import org.springframework.integration.transformer.Transformer;
 import org.springframework.integration.xml.source.DomSourceFactory;
 import org.springframework.integration.xml.source.SourceFactory;
 import org.springframework.messaging.MessagingException;
@@ -37,7 +36,8 @@ import org.springframework.util.ClassUtils;
 import org.springframework.xml.transform.StringSource;
 
 /**
- * An implementation of {@link Transformer} that delegates to an OXM
+ * An implementation of {@link org.springframework.integration.transformer.Transformer}
+ * that delegates to an OXM
  * {@link Unmarshaller}. Expects the payload to be of type {@link Document},
  * {@link String}, {@link File}, {@link Source} or to have an instance of
  * {@link SourceFactory} that can convert to a {@link Source}. If
@@ -53,6 +53,7 @@ import org.springframework.xml.transform.StringSource;
  *
  * @author Jonas Partner
  * @author Artem Bilan
+ * @author Gary Russell
  */
 public class UnmarshallingTransformer extends AbstractPayloadTransformer {
 
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
index bfed8a66fa..07dcbbd84a 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java
@@ -39,7 +39,6 @@ import org.springframework.core.io.Resource;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.expression.ExpressionUtils;
-import org.springframework.integration.xml.result.DomResultFactory;
 import org.springframework.integration.xml.result.ResultFactory;
 import org.springframework.integration.xml.source.DomSourceFactory;
 import org.springframework.integration.xml.source.SourceFactory;
@@ -62,7 +61,8 @@ import org.springframework.xml.transform.StringSource;
  * {@link Document} payload in results in {@link Document} payload out
  * 
    
  * {@link Source} payload in results in {@link Result} payload out, type will be
- * determined by the {@link ResultFactory}, {@link DomResultFactory} by default.
+ * determined by the {@link ResultFactory},
+ * {@link org.springframework.integration.xml.result.DomResultFactory} by default.
  * If an instance of {@link ResultTransformer} is registered this will be used
  * to convert the result.
  * 
    
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java
index 4a305ab50f..6e3653725f 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -30,7 +30,6 @@ import org.w3c.dom.Node;
 
 import org.springframework.integration.xml.DefaultXmlPayloadConverter;
 import org.springframework.integration.xml.XmlPayloadConverter;
-import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
 import org.springframework.xml.xpath.NodeMapper;
 import org.springframework.xml.xpath.XPathException;
@@ -41,6 +40,7 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
  * Utility class for 'xpath' support.
  *
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 3.0
  */
 public final class XPathUtils {
@@ -77,7 +77,7 @@ public final class XPathUtils {
 	 * @param        The required return type.
 	 * @return the result of the xpath expression evaluation.
 	 * @throws IllegalArgumentException - if the provided arguments aren't appropriate types or values;
-	 * @throws MessagingException - if the provided object can't be converted to a {@link Node};
+	 * @throws org.springframework.messaging.MessagingException - if the provided object can't be converted to a {@link Node};
 	 * @throws XPathException - if the xpath expression can't be evaluated.
 	 */
 	@SuppressWarnings({"unchecked"})
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java
index 65ae901354..2c2a794ee2 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -27,12 +27,11 @@ import org.jivesoftware.smack.roster.RosterListener;
 import org.jxmpp.jid.Jid;
 
 import org.springframework.integration.xmpp.core.AbstractXmppConnectionAwareEndpoint;
-import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * An inbound endpoint that is able to login and then emit {@link Message}s when a
+ * An inbound endpoint that is able to login and then emit
  * particular Presence event occurs within the logged-in user's {@link Roster}.
  * (e.g., logged in/out, changed status etc.)
  *
@@ -40,6 +39,7 @@ import org.springframework.util.StringUtils;
  * @author Oleg Zhurakousky
  * @author Mark Fisher
  * @author Artem Bilan
+ * @author Gary Russell
  * @since 2.0
  */
 public class PresenceListeningEndpoint extends AbstractXmppConnectionAwareEndpoint {
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java
index aa10535ae5..baf2100872 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -18,14 +18,14 @@ package org.springframework.integration.xmpp.support;
 
 import org.jivesoftware.smack.packet.Message;
 
-import org.springframework.integration.mapping.HeaderMapper;
 import org.springframework.integration.mapping.RequestReplyHeaderMapper;
 
 /**
- * A convenience interface that extends {@link HeaderMapper}
+ * A convenience interface that extends {@link RequestReplyHeaderMapper}
  * but parameterized with the Smack API {@link Message}.
  *
  * @author Mark Fisher
+ * @author Gary Russell
  * @since 2.1
  */
 public interface XmppHeaderMapper extends RequestReplyHeaderMapper {