Polishing - PR Comments

Remove unnecessary generics.

Author: garyrussell

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java

@@ -39,15 +39,14 @@ public abstract class AbstractConnectionFactorySpec
 			<S extends AbstractConnectionFactorySpec<S, C>, C extends AbstractConnectionFactory>
 		extends IntegrationComponentSpec<S, C> {
 
-	protected C target;
-
-	public AbstractConnectionFactorySpec(C connectionFactory) {
+	AbstractConnectionFactorySpec(C connectionFactory) {
 		this.target = connectionFactory;
 	}
 
 	@Override
 	public S id(String id) {
-		return super.id(id);
+		this.target.setBeanName(id);
+		return _this();
 	}
 
 	/**
@@ -221,12 +220,4 @@ public S tcpSocketSupport(TcpSocketSupport tcpSocketSupport) {
 		return _this();
 	}
 
-	@Override
-	protected C doGet() {
-		if (getId() != null) {
-			this.target.setBeanName(getId());
-		}
-		return this.target;
-	}
-
 }

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/Tcp.java

@@ -18,7 +18,6 @@
 
 import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
 import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory;
-import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
 
 /**
  * Factory methods for TCP.
@@ -47,67 +46,73 @@ private Tcp() {
 	/**
 	 * Create a server spec that uses NIO.
 	 * @param port the port to listen on.
-	 * @param <S> the spec type.
-	 * @param <C> the connection factrory type.
 	 * @return the spec.
 	 */
-	public static <S extends TcpServerConnectionFactorySpec<S, C>, C extends AbstractServerConnectionFactory>
-			TcpServerConnectionFactorySpec<S, C> nioServer(int port) {
-		return new TcpServerConnectionFactorySpec<>(port, NIO);
+	public static TcpServerConnectionFactorySpec nioServer(int port) {
+		return new TcpServerConnectionFactorySpec(port, NIO);
 	}
 
 	/**
 	 * Create a server spec that does not use NIO.
 	 * @param port the port to listen on.
-	 * @param <S> the spec type.
-	 * @param <C> the connection factrory type.
 	 * @return the spec.
 	 */
-	public static <S extends TcpServerConnectionFactorySpec<S, C>, C extends AbstractServerConnectionFactory>
-			TcpServerConnectionFactorySpec<S, C> netServer(int port) {
-		return new TcpServerConnectionFactorySpec<>(port, NET);
+	public static TcpServerConnectionFactorySpec netServer(int port) {
+		return new TcpServerConnectionFactorySpec(port, NET);
 	}
 
 	/**
 	 * Create a client spec that uses NIO.
 	 * @param host the host to connect to.
 	 * @param port the port to connect to.
-	 * @param <S> the spec type.
-	 * @param <C> the connection factrory type.
 	 * @return the spec.
 	 */
-	public static <S extends TcpClientConnectionFactorySpec<S, C>, C extends AbstractClientConnectionFactory>
-			TcpClientConnectionFactorySpec<S, C> nioClient(String host, int port) {
-		return new TcpClientConnectionFactorySpec<>(host, port, NIO);
+	public static TcpClientConnectionFactorySpec nioClient(String host, int port) {
+		return new TcpClientConnectionFactorySpec(host, port, NIO);
 	}
 
 	/**
 	 * Create a client spec that does not use NIO.
 	 * @param host the host to connect to.
 	 * @param port the port to connect to.
-	 * @param <S> the spec type.
-	 * @param <C> the connection factrory type.
 	 * @return the spec.
 	 */
-	public static <S extends TcpClientConnectionFactorySpec<S, C>, C extends AbstractClientConnectionFactory>
-			TcpClientConnectionFactorySpec<S, C> netClient(String host, int port) {
-		return new TcpClientConnectionFactorySpec<>(host, port, NET);
+	public static TcpClientConnectionFactorySpec netClient(String host, int port) {
+		return new TcpClientConnectionFactorySpec(host, port, NET);
 	}
 
-	public static <S extends TcpInboundGatewaySpec<S>> TcpInboundGatewaySpec<S> inboundGateway(
-			AbstractConnectionFactory connectionFactory) {
-		return new TcpInboundGatewaySpec<>(connectionFactory);
+	/**
+	 * Create an inbound gateway using the supplied connection factory.
+	 * @param connectionFactory the connection factory.
+	 * @return the spec.
+	 */
+	public static TcpInboundGatewaySpec inboundGateway(AbstractConnectionFactory connectionFactory) {
+		return new TcpInboundGatewaySpec(connectionFactory);
 	}
 
-	public static <S extends TcpInboundChannelAdapterSpec<S>> TcpInboundChannelAdapterSpec<S> inboundAdapter(
-			AbstractConnectionFactory connectionFactory) {
-		return new TcpInboundChannelAdapterSpec<>(connectionFactory);
+	/**
+	 * Create an inbound channel adapter using the supplied connection factory.
+	 * @param connectionFactory the connection factory.
+	 * @return the spec.
+	 */
+	public static TcpInboundChannelAdapterSpec inboundAdapter(AbstractConnectionFactory connectionFactory) {
+		return new TcpInboundChannelAdapterSpec(connectionFactory);
 	}
 
+	/**
+	 * Create an outbound gateway using the supplied client connection factory.
+	 * @param connectionFactory the connection factory.
+	 * @return the spec.
+	 */
 	public static TcpOutboundGatewaySpec outboundGateway(AbstractClientConnectionFactory connectionFactory) {
 		return new TcpOutboundGatewaySpec(connectionFactory);
 	}
 
+	/**
+	 * Create an outbound gateway using the supplied connection factory.
+	 * @param connectionFactory the connection factory.
+	 * @return the spec.
+	 */
 	public static TcpOutboundChannelAdapterSpec outboundAdapter(AbstractConnectionFactory connectionFactory) {
 		return new TcpOutboundChannelAdapterSpec(connectionFactory);
 	}

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpClientConnectionFactorySpec.java

@@ -25,21 +25,17 @@
  * An {@link IntegrationComponentSpec} for {@link AbstractClientConnectionFactory}s.
  * @author Gary Russell
  *
- * @param <S> the target {@link TcpClientConnectionFactorySpec} implementation type.
- * @param <C> the target {@link AbstractClientConnectionFactory} implementation type.
- *
  * @since 5.0
  *
  */
 public class TcpClientConnectionFactorySpec
-			<S extends TcpClientConnectionFactorySpec<S, C>, C extends AbstractClientConnectionFactory>
-		extends AbstractConnectionFactorySpec<S, AbstractClientConnectionFactory> {
+		extends AbstractConnectionFactorySpec<TcpClientConnectionFactorySpec, AbstractClientConnectionFactory> {
 
 	TcpClientConnectionFactorySpec(String host, int port) {
 		this(host, port, false);
 	}
 
-	public TcpClientConnectionFactorySpec(String host, int port, boolean nio) {
+	TcpClientConnectionFactorySpec(String host, int port, boolean nio) {
 		super(nio ? new TcpNioClientConnectionFactory(host, port) : new TcpNetClientConnectionFactory(host, port));
 	}
 

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpInboundChannelAdapterSpec.java

@@ -28,8 +28,8 @@
  * @since 5.0
  *
  */
-public class TcpInboundChannelAdapterSpec<S extends TcpInboundChannelAdapterSpec<S>>
-	extends MessageProducerSpec<S, TcpReceivingChannelAdapter> {
+public class TcpInboundChannelAdapterSpec
+	extends MessageProducerSpec<TcpInboundChannelAdapterSpec, TcpReceivingChannelAdapter> {
 
 	TcpInboundChannelAdapterSpec(AbstractConnectionFactory connectionFactory) {
 		super(new TcpReceivingChannelAdapter());
@@ -41,7 +41,7 @@ public class TcpInboundChannelAdapterSpec<S extends TcpInboundChannelAdapterSpec
 	 * @return the spec.
 	 * @see TcpReceivingChannelAdapter#setClientMode(boolean)
 	 */
-	public S clientMode(boolean isClientMode) {
+	public TcpInboundChannelAdapterSpec clientMode(boolean isClientMode) {
 		this.target.setClientMode(isClientMode);
 		return _this();
 	}
@@ -51,7 +51,7 @@ public S clientMode(boolean isClientMode) {
 	 * @return the spec.
 	 * @see TcpReceivingChannelAdapter#setRetryInterval(long)
 	 */
-	public S retryInterval(long retryInterval) {
+	public TcpInboundChannelAdapterSpec retryInterval(long retryInterval) {
 		this.target.setRetryInterval(retryInterval);
 		return _this();
 	}
@@ -61,7 +61,7 @@ public S retryInterval(long retryInterval) {
 	 * @return the spec.
 	 * @see TcpReceivingChannelAdapter#setTaskScheduler(TaskScheduler)
 	 */
-	public S taskScheduler(TaskScheduler taskScheduler) {
+	public TcpInboundChannelAdapterSpec taskScheduler(TaskScheduler taskScheduler) {
 		this.target.setTaskScheduler(taskScheduler);
 		return _this();
 	}

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpInboundGatewaySpec.java

@@ -28,8 +28,7 @@
  * @since 5.0
  *
  */
-public class TcpInboundGatewaySpec<S extends TcpInboundGatewaySpec<S>>
-		extends MessagingGatewaySpec<S, TcpInboundGateway> {
+public class TcpInboundGatewaySpec extends MessagingGatewaySpec<TcpInboundGatewaySpec, TcpInboundGateway> {
 
 	TcpInboundGatewaySpec(AbstractConnectionFactory connectionFactory) {
 		super(new TcpInboundGateway());
@@ -41,7 +40,7 @@ public class TcpInboundGatewaySpec<S extends TcpInboundGatewaySpec<S>>
 	 * @return the spec.
 	 * @see TcpInboundGateway#setClientMode(boolean)
 	 */
-	public S clientMode(boolean isClientMode) {
+	public TcpInboundGatewaySpec clientMode(boolean isClientMode) {
 		this.target.setClientMode(isClientMode);
 		return _this();
 	}
@@ -51,7 +50,7 @@ public S clientMode(boolean isClientMode) {
 	 * @return the spec.
 	 * @see TcpInboundGateway#setRetryInterval(long)
 	 */
-	public S retryInterval(long retryInterval) {
+	public TcpInboundGatewaySpec retryInterval(long retryInterval) {
 		this.target.setRetryInterval(retryInterval);
 		return _this();
 	}
@@ -61,7 +60,7 @@ public S retryInterval(long retryInterval) {
 	 * @return the spec.
 	 * @see TcpInboundGateway#setTaskScheduler(TaskScheduler)
 	 */
-	public S taskScheduler(TaskScheduler taskScheduler) {
+	public TcpInboundGatewaySpec taskScheduler(TaskScheduler taskScheduler) {
 		this.target.setTaskScheduler(taskScheduler);
 		return _this();
 	}

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/TcpServerConnectionFactorySpec.java

@@ -25,21 +25,17 @@
  * An {@link IntegrationComponentSpec} for {@link AbstractServerConnectionFactory}s.
  * @author Gary Russell
  *
- * @param <S> the target {@link TcpServerConnectionFactorySpec} implementation type.
- * @param <C> the target {@link AbstractServerConnectionFactory} implementation type.
- *
  * @since 5.0
  *
  */
 public class TcpServerConnectionFactorySpec
-			<S extends TcpServerConnectionFactorySpec<S, C>, C extends AbstractServerConnectionFactory>
-		extends AbstractConnectionFactorySpec<S, AbstractServerConnectionFactory> {
+		extends AbstractConnectionFactorySpec<TcpServerConnectionFactorySpec, AbstractServerConnectionFactory> {
 
 	TcpServerConnectionFactorySpec(int port) {
 		this(port, false);
 	}
 
-	public TcpServerConnectionFactorySpec(int port, boolean nio) {
+	TcpServerConnectionFactorySpec(int port, boolean nio) {
 		super(nio ? new TcpNioServerConnectionFactory(port) : new TcpNetServerConnectionFactory(port));
 	}
 
@@ -48,7 +44,7 @@ public TcpServerConnectionFactorySpec(int port, boolean nio) {
 	 * @return the spec.
 	 * @see AbstractServerConnectionFactory#setLocalAddress(String)
 	 */
-	public S localAddress(String localAddress) {
+	public TcpServerConnectionFactorySpec localAddress(String localAddress) {
 		this.target.setLocalAddress(localAddress);
 		return _this();
 	}
@@ -58,7 +54,7 @@ public S localAddress(String localAddress) {
 	 * @return the spec.
 	 * @see AbstractServerConnectionFactory#setBacklog(int)
 	 */
-	public S backlog(int backlog) {
+	public TcpServerConnectionFactorySpec backlog(int backlog) {
 		this.target.setBacklog(backlog);
 		return _this();
 	}

spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/Udp.java

@@ -29,22 +29,20 @@ private Udp() {
 		super();
 	}
 
-	public static <S extends UdpInboundChannelAdapterSpec<S>> UdpInboundChannelAdapterSpec<S> inboundAdapter(
-			int port) {
-		return new UdpInboundChannelAdapterSpec<>(port);
+	public static UdpInboundChannelAdapterSpec inboundAdapter(int port) {
+		return new UdpInboundChannelAdapterSpec(port);
 	}
 
-	public static <S extends UdpInboundChannelAdapterSpec<S>> UdpInboundChannelAdapterSpec<S> inboundMulticastAdapter(
-			int port, String multicastGroup) {
-		return new UdpInboundChannelAdapterSpec<>(port, multicastGroup);
+	public static UdpInboundChannelAdapterSpec inboundMulticastAdapter(int port, String multicastGroup) {
+		return new UdpInboundChannelAdapterSpec(port, multicastGroup);
 	}
 
 	public static UdpOutboundChannelAdapterSpec outboundAdapter(String destinationExpression) {
 		return new UdpOutboundChannelAdapterSpec(destinationExpression);
 	}
 
-	public static UdpOutboundChannelAdapterSpec outboundMultcastAdapter(String destinationExpression) {
-		return new UdpOutboundChannelAdapterSpec(destinationExpression);
+	public static UdpOutboundChannelAdapterSpec outboundMulticastAdapter(String destinationExpression) {
+		return new UdpMulticastOutboundChannelAdapterSpec(destinationExpression);
 	}
 
 }