From bc10b621e3bc8b4db2fd73ea8efc90097621270b Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sat, 13 Nov 2010 23:43:04 -0500
Subject: [PATCH] INT-1619 removed cycle by moving SocketIoUtils into the util
 package

---
 .../ip/tcp/connection/TcpNetConnection.java          |  2 +-
 .../ip/tcp/connection/TcpNioConnection.java          |  2 +-
 .../ip/udp/DatagramPacketMessageMapper.java          |  7 +++----
 .../integration/ip/util/RegexUtils.java              |  4 ++--
 .../integration/ip/{tcp => util}/SocketIoUtils.java  | 12 ++++++------
 .../integration/ip/util/RegexUtilsTests.java         |  8 +++-----
 6 files changed, 16 insertions(+), 19 deletions(-)
 rename spring-integration-ip/src/main/java/org/springframework/integration/ip/{tcp => util}/SocketIoUtils.java (84%)

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 4336771670..b9c443bea8 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
@@ -21,8 +21,8 @@ import java.net.SocketTimeoutException;
 
 import org.springframework.core.serializer.Deserializer;
 import org.springframework.integration.Message;
-import org.springframework.integration.ip.tcp.SocketIoUtils;
 import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
+import org.springframework.integration.ip.util.SocketIoUtils;
 
 /**
  * A TcpConnection that uses and underlying {@link Socket}.
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
index aa6b558132..e186557dfb 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
@@ -30,8 +30,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.integration.Message;
-import org.springframework.integration.ip.tcp.SocketIoUtils;
 import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
+import org.springframework.integration.ip.util.SocketIoUtils;
 
 /**
  * A TcpConnection that uses and underlying {@link SocketChannel}.
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
index f0ba5539e9..f3ab492594 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
@@ -56,8 +56,7 @@ import org.springframework.util.Assert;
  * @author Dave Syer
  * @since 2.0
  */
-public class DatagramPacketMessageMapper implements InboundMessageMapper<DatagramPacket>,
-		OutboundMessageMapper<DatagramPacket> {
+public class DatagramPacketMessageMapper implements InboundMessageMapper<DatagramPacket>, OutboundMessageMapper<DatagramPacket> {
 
 	private volatile String charset = "UTF-8";
 
@@ -68,9 +67,9 @@ public class DatagramPacketMessageMapper implements InboundMessageMapper<Datagra
 	private boolean lengthCheck = false;
 
 	private static Pattern udpHeadersPattern = 
-		Pattern.compile(RegexUtils.escapeRegExSpecials(IpHeaders.ACK_ADDRESS) +
+		Pattern.compile(RegexUtils.escapeRegexSpecials(IpHeaders.ACK_ADDRESS) +
 				"=" + "([^;]*);" + 
-				RegexUtils.escapeRegExSpecials(MessageHeaders.ID) + 
+				RegexUtils.escapeRegexSpecials(MessageHeaders.ID) + 
 				"=" + "([^;]*);");
 
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/RegexUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/RegexUtils.java
index ea0e0321b5..66c07e6a13 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/RegexUtils.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/RegexUtils.java
@@ -20,7 +20,7 @@ package org.springframework.integration.ip.util;
  * Regular Expression Utilities.
  * 
  * @author Gary Russell
- *
+ * @since 2.0
  */
 public abstract class RegexUtils {
 
@@ -32,7 +32,7 @@ public abstract class RegexUtils {
 	 * @param stringToEscape The string to escape.
 	 * @return The escaped string.
 	 */
-	public static String escapeRegExSpecials(String stringToEscape) {
+	public static String escapeRegexSpecials(String stringToEscape) {
 		// In the following, we look for all the specials and any we find 
 		// are escaped in the output string, allowing that string to 
 		// be used as a pattern containing the literal specials.
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java
similarity index 84%
rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java
rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java
index 8c634af6c7..8441417c29 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.ip.tcp;
+
+package org.springframework.integration.ip.util;
 
 import java.net.InetAddress;
 import java.net.Socket;
 
 /**
  * @author Gary Russell
- *
+ * @since 2.0
  */
-public class SocketIoUtils {
+public abstract class SocketIoUtils {
 
 	public static String getSocketId(Socket socket) {
 		InetAddress inetAddress = socket.getInetAddress();
@@ -30,8 +31,7 @@ public class SocketIoUtils {
 		if (inetAddress != null) {
 			hostName = inetAddress.getHostName();
 		}
-		return hostName + ":" + socket.getPort() + ":" +
-		       socket.hashCode();
+		return hostName + ":" + socket.getPort() + ":" + socket.hashCode();
 	}
-	
+
 }
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java
index 279c208fc1..8dd074368c 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java
@@ -17,10 +17,10 @@
 package org.springframework.integration.ip.util;
 
 import static org.junit.Assert.assertEquals;
-import static org.springframework.integration.ip.util.RegexUtils.escapeRegExSpecials;
 
 import org.junit.Ignore;
 import org.junit.Test;
+
 import org.springframework.integration.MessageHeaders;
 
 /**
@@ -34,8 +34,7 @@ public class RegexUtilsTests {
 	@Test
 	public void testRegex () {
 		String s = "xxx$^[]{()}+*\\?|.xxx";
-		assertEquals("xxx\\$\\^\\[\\]\\{\\(\\)\\}\\+\\*\\\\\\?\\|\\.xxx",
-					 escapeRegExSpecials(s));
+		assertEquals("xxx\\$\\^\\[\\]\\{\\(\\)\\}\\+\\*\\\\\\?\\|\\.xxx", RegexUtils.escapeRegexSpecials(s));
 	}
 
 	/**
@@ -46,8 +45,7 @@ public class RegexUtilsTests {
 	public void testSiPrefix () {
 		// protect the test in case we ever change the prefix
 		if ("$^[]{()}+*\\?|.".contains(MessageHeaders.PREFIX)) {
-			assertEquals(escapeRegExSpecials(MessageHeaders.PREFIX), "\\"
-					+ MessageHeaders.PREFIX);
+			assertEquals(RegexUtils.escapeRegexSpecials(MessageHeaders.PREFIX), "\\" + MessageHeaders.PREFIX);
 		}
 	}