Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed SocketIoUtils to SocketUtils

Browse Source
This commit is contained in:
Mark Fisher
2010-11-13 23:49:36 -05:00
parent a78d361538
commit d7ad37de4b
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java
View File

@@ -22,7 +22,7 @@ import java.net.SocketTimeoutException;
import org.springframework.core.serializer.Deserializer;
import org.springframework.integration.Message;
import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
import org.springframework.integration.ip.util.SocketIoUtils;
import org.springframework.integration.ip.util.SocketUtils;
/**
* A TcpConnection that uses and underlying {@link Socket}.
@@ -162,7 +162,7 @@ public class TcpNetConnection extends AbstractTcpConnection {
public String getConnectionId() {
if (this.connectionId == null) {
this.connectionId = SocketIoUtils.getSocketId(this.socket);
this.connectionId = SocketUtils.getSocketId(this.socket);
}
return this.connectionId;
}

4
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java
View File

@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.integration.Message;
import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException;
import org.springframework.integration.ip.util.SocketIoUtils;
import org.springframework.integration.ip.util.SocketUtils;
/**
* A TcpConnection that uses and underlying {@link SocketChannel}.
@@ -340,7 +340,7 @@ public class TcpNioConnection extends AbstractTcpConnection {
public String getConnectionId() {
if (this.connectionId == null) {
this.connectionId = SocketIoUtils.getSocketId(this.socketChannel.socket());
this.connectionId = SocketUtils.getSocketId(this.socketChannel.socket());
}
return this.connectionId;
}

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketIoUtils.java → spring-integration-ip/src/main/java/org/springframework/integration/ip/util/SocketUtils.java
View File

@@ -23,7 +23,7 @@ import java.net.Socket;
* @author Gary Russell
* @since 2.0
*/
public abstract class SocketIoUtils {
public abstract class SocketUtils {
public static String getSocketId(Socket socket) {
InetAddress inetAddress = socket.getInetAddress();

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
View File

@@ -9,7 +9,7 @@
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
<int:channel id="udpChannel" />
<int:channel id="tcpChannel" />

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests-context.xml
View File

@@ -9,7 +9,7 @@
<int:message-history/>
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
<int-ip:tcp-connection-factory id="server"
type="server"

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests-context.xml
View File

@@ -7,7 +7,7 @@
http://www.springframework.org/schema/integration/ip http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests-context.xml
View File

@@ -9,7 +9,7 @@
<int:message-history/>
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
<bean id="serializer" class="org.springframework.core.serializer.DefaultSerializer" />

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/common-context.xml
View File

@@ -10,7 +10,7 @@
http://www.springframework.org/schema/integration/ip
http://www.springframework.org/schema/integration/ip/spring-integration-ip.xsd">
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketUtils" />
<bean id="tcpIpUtils" class="org.springframework.integration.ip.util.SocketTestUtils" />
<bean id="crLfSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer" />
<bean id="stxEtxSerializer" class="org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer" />