Remove remaining redundant superinterfaces

Author: garyrussell

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java

@@ -23,7 +23,6 @@
 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 @@
  *
  * @since 2.1
  */
-public abstract class AbstractAmqpChannel extends AbstractMessageChannel
-		implements DisposableBean, ConnectionListener {
+public abstract class AbstractAmqpChannel extends AbstractMessageChannel implements ConnectionListener {
 
 	private final AmqpTemplate amqpTemplate;
 

spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java

@@ -440,7 +440,7 @@ public static class FileMarker implements Serializable {
 
 		private static final long serialVersionUID = 8514605438145748406L;
 
-		public enum Mark implements Serializable {
+		public enum Mark {
 			START,
 			END
 		}

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java

@@ -55,8 +55,7 @@ public SqlParameterSource createParameterSource(Object input) {
 		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;
 

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java

@@ -22,7 +22,6 @@
 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 @@
  * @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;
 

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java

@@ -18,7 +18,6 @@
 
 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 @@
  * 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;
 

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 @@
  *
  * @since 5.0
  */
-public class JmsInboundGateway extends MessagingGatewaySupport implements DisposableBean, OrderlyShutdownCapable {
+public class JmsInboundGateway extends MessagingGatewaySupport implements OrderlyShutdownCapable {
 
 	private final JmsMessageDrivenEndpoint endpoint;
 

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 @@
  * @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;
 

spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java

@@ -21,7 +21,6 @@
 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 @@
  * @since 2.0
  */
 public class SubscribableJmsChannel extends AbstractJmsChannel
-		implements SubscribableChannel, SmartLifecycle, DisposableBean {
+		implements SubscribableChannel, SmartLifecycle {
 
 	private final AbstractMessageListenerContainer container;
 

spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java

@@ -23,9 +23,7 @@
 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 @@
  *
  * @since 2.0
  */
-public class NotificationPublishingMessageHandler extends AbstractMessageHandler
-		implements BeanFactoryAware, InitializingBean {
+public class NotificationPublishingMessageHandler extends AbstractMessageHandler {
 
 	private final PublisherDelegate delegate = new PublisherDelegate();
 

spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java

@@ -32,7 +32,6 @@
 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 @@
  *
  * @since 2.0
  */
-public class OperationInvokingMessageHandler extends AbstractReplyProducingMessageHandler implements InitializingBean {
+public class OperationInvokingMessageHandler extends AbstractReplyProducingMessageHandler {
 
 	private final MBeanServerConnection server;
 

spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java

@@ -20,7 +20,6 @@
 
 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 @@
  */
 @SuppressWarnings("rawtypes")
 public class SubscribableRedisChannel extends AbstractMessageChannel
-		implements SubscribableChannel, SmartLifecycle, DisposableBean {
+		implements SubscribableChannel, SmartLifecycle {
 
 	private final RedisMessageListenerContainer container = new RedisMessageListenerContainer();