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 f361338115..afcde094bb 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.beans.factory.DisposableBean; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; import org.springframework.integration.amqp.support.MappingUtils; @@ -38,8 +37,7 @@ import org.springframework.util.Assert; * * @since 2.1 */ -public abstract class AbstractAmqpChannel extends AbstractMessageChannel - implements DisposableBean, ConnectionListener { +public abstract class AbstractAmqpChannel extends AbstractMessageChannel implements ConnectionListener { private final AmqpTemplate amqpTemplate; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java index 3f419e9163..9e43cc6141 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java @@ -440,7 +440,7 @@ public class FileSplitter extends AbstractMessageSplitter { private static final long serialVersionUID = 8514605438145748406L; - public enum Mark implements Serializable { + public enum Mark { START, END } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java index 9b8e1bbe58..69e54813e8 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java @@ -55,8 +55,7 @@ public class BeanPropertySqlParameterSourceFactory implements SqlParameterSource return new StaticBeanPropertySqlParameterSource(input, this.staticParameters); } - private static final class StaticBeanPropertySqlParameterSource extends AbstractSqlParameterSource implements - SqlParameterSource { + private static final class StaticBeanPropertySqlParameterSource extends AbstractSqlParameterSource { private final BeanPropertySqlParameterSource input; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java index 44ce586deb..07cb08f284 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java @@ -22,7 +22,6 @@ import java.util.List; import javax.sql.DataSource; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; @@ -36,10 +35,11 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Gunnar Hillert * @author Artem Bilan + * @author Gary Russell * * @since 2.0 */ -public class JdbcOutboundGateway extends AbstractReplyProducingMessageHandler implements InitializingBean { +public class JdbcOutboundGateway extends AbstractReplyProducingMessageHandler { private final JdbcMessageHandler handler; 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 8ff794248f..59a93ebce4 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 @@ -18,7 +18,6 @@ package org.springframework.integration.jdbc; import java.util.Map; -import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.messaging.Message; import org.springframework.util.Assert; @@ -45,9 +44,10 @@ import org.springframework.util.Assert; * feature request at https://jira.springsource.org. * * @author Gunnar Hillert + * @author Gary Russell * @since 2.1 */ -public class StoredProcMessageHandler extends AbstractMessageHandler implements InitializingBean { +public class StoredProcMessageHandler extends AbstractMessageHandler { private final StoredProcExecutor executor; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java index e7c6fd59f6..3c1ae35371 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java @@ -17,7 +17,6 @@ package org.springframework.integration.jms; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationContext; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.gateway.MessagingGatewaySupport; @@ -33,7 +32,7 @@ import org.springframework.messaging.MessageChannel; * * @since 5.0 */ -public class JmsInboundGateway extends MessagingGatewaySupport implements DisposableBean, OrderlyShutdownCapable { +public class JmsInboundGateway extends MessagingGatewaySupport implements OrderlyShutdownCapable { private final JmsMessageDrivenEndpoint endpoint; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java index d3c4541fd4..3253268304 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java @@ -17,7 +17,6 @@ package org.springframework.integration.jms; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationContext; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.endpoint.MessageProducerSupport; @@ -36,8 +35,7 @@ import org.springframework.util.Assert; * @author Gary Russell * @author Artem Bilan */ -public class JmsMessageDrivenEndpoint extends MessageProducerSupport - implements DisposableBean, OrderlyShutdownCapable { +public class JmsMessageDrivenEndpoint extends MessageProducerSupport implements OrderlyShutdownCapable { private final AbstractMessageListenerContainer listenerContainer; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java index fc507bfe60..8d059f0859 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java @@ -21,7 +21,6 @@ import javax.jms.MessageListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; import org.springframework.integration.MessageDispatchingException; import org.springframework.integration.context.IntegrationProperties; @@ -49,7 +48,7 @@ import org.springframework.util.Assert; * @since 2.0 */ public class SubscribableJmsChannel extends AbstractJmsChannel - implements SubscribableChannel, SmartLifecycle, DisposableBean { + implements SubscribableChannel, SmartLifecycle { private final AbstractMessageListenerContainer container; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java index 55ae19591a..6494af2aef 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java @@ -23,9 +23,7 @@ import javax.management.Notification; import javax.management.ObjectName; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryUtils; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.mapping.OutboundMessageMapper; @@ -52,8 +50,7 @@ import org.springframework.util.Assert; * * @since 2.0 */ -public class NotificationPublishingMessageHandler extends AbstractMessageHandler - implements BeanFactoryAware, InitializingBean { +public class NotificationPublishingMessageHandler extends AbstractMessageHandler { private final PublisherDelegate delegate = new PublisherDelegate(); diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java index f7a95eaf8f..d3cbbf4ad9 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java @@ -32,7 +32,6 @@ import javax.management.MBeanServerConnection; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.util.ClassUtils; import org.springframework.jmx.support.ObjectNameManager; @@ -64,7 +63,7 @@ import org.springframework.util.ObjectUtils; * * @since 2.0 */ -public class OperationInvokingMessageHandler extends AbstractReplyProducingMessageHandler implements InitializingBean { +public class OperationInvokingMessageHandler extends AbstractReplyProducingMessageHandler { private final MBeanServerConnection server; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java index 3673edd877..f6a0994544 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java @@ -20,7 +20,6 @@ import java.util.concurrent.Executor; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -56,7 +55,7 @@ import org.springframework.util.StringUtils; */ @SuppressWarnings("rawtypes") public class SubscribableRedisChannel extends AbstractMessageChannel - implements SubscribableChannel, SmartLifecycle, DisposableBean { + implements SubscribableChannel, SmartLifecycle { private final RedisMessageListenerContainer container = new RedisMessageListenerContainer();