From 12bc7e40243fd98c15cc1177b30699b61c41409a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 5 Jul 2010 16:45:54 +0000 Subject: [PATCH] INT-1217 Move SocketIoUtils from ...util to ...tcp --- .../integration/ip/tcp/SimpleTcpNetInboundGateway.java | 1 - .../integration/ip/tcp/SimpleTcpNetOutboundGateway.java | 1 - .../integration/ip/{util => tcp}/SocketIoUtils.java | 7 +------ .../integration/ip/tcp/TcpNetReceivingChannelAdapter.java | 1 - .../integration/ip/tcp/TcpNetSendingMessageHandler.java | 1 - .../integration/ip/tcp/TcpNioReceivingChannelAdapter.java | 1 - .../integration/ip/tcp/TcpNioSendingMessageHandler.java | 1 - 7 files changed, 1 insertion(+), 12 deletions(-) rename spring-integration-ip/src/main/java/org/springframework/integration/ip/{util => tcp}/SocketIoUtils.java (91%) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java index ef59f2242e..7218c5ebdd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java @@ -21,7 +21,6 @@ import java.net.SocketException; import org.springframework.integration.core.Message; import org.springframework.integration.gateway.AbstractMessagingGateway; -import org.springframework.integration.ip.util.SocketIoUtils; import org.springframework.integration.message.MessageMappingException; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java index 1c4621a8c3..db44d7b513 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java @@ -22,7 +22,6 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.ip.util.SocketIoUtils; /** * Simple TCP outbound gateway; delegates write to a {@link TcpNetSendingMessageHandler} diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java similarity index 91% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java index a8d0b43866..51d6d5fc8c 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java @@ -13,18 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.util; +package org.springframework.integration.ip.tcp; import java.lang.reflect.Constructor; import java.net.Socket; import java.nio.channels.SocketChannel; import org.springframework.beans.BeanUtils; -import org.springframework.integration.ip.tcp.MessageFormats; -import org.springframework.integration.ip.tcp.NetSocketReader; -import org.springframework.integration.ip.tcp.NetSocketWriter; -import org.springframework.integration.ip.tcp.NioSocketReader; -import org.springframework.integration.ip.tcp.NioSocketWriter; import org.springframework.integration.message.MessageMappingException; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java index 397354449b..80fdb656f9 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java @@ -23,7 +23,6 @@ import java.net.Socket; import javax.net.ServerSocketFactory; import org.springframework.integration.core.Message; -import org.springframework.integration.ip.util.SocketIoUtils; /** * Tcp Receiving Channel adapter that uses a {@link Socket}. Each diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetSendingMessageHandler.java index f3fa55a82c..067d956de5 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetSendingMessageHandler.java @@ -19,7 +19,6 @@ import java.net.Socket; import javax.net.SocketFactory; -import org.springframework.integration.ip.util.SocketIoUtils; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java index 81152291a4..0d211f64a3 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java @@ -30,7 +30,6 @@ import java.util.Iterator; import java.util.Set; import org.springframework.integration.core.Message; -import org.springframework.integration.ip.util.SocketIoUtils; /** * Tcp Receiving Channel adapter that uses a {@link java.nio.channels.SocketChannel}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioSendingMessageHandler.java index cf45486b25..6f79efd9f7 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioSendingMessageHandler.java @@ -17,7 +17,6 @@ package org.springframework.integration.ip.tcp; import java.nio.channels.SocketChannel; -import org.springframework.integration.ip.util.SocketIoUtils; /**