From 3296463fb80338787a148dfd2a4f81e7fd7d18b9 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 27 Aug 2014 17:46:54 -0400
Subject: [PATCH] TCP Sample - Use <o-t-s-t />

Replace expression-based transformers with <o-t-s-t/> now that
it can handle `byte[]`.
---
 .../spring/integration/tcpClientServerDemo-context.xml | 10 ++++------
 .../tcpServerConnectionDeserialize-context.xml         |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml
index c9c6e66d..145703a3 100644
--- a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml
+++ b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml
@@ -33,9 +33,8 @@
 		request-timeout="10000"
 		reply-timeout="10000"/>
 
-	<int:transformer id="clientBytes2String"
-		input-channel="clientBytes2StringChannel"
-		expression="new String(payload)"/>
+	<int:object-to-string-transformer id="clientBytes2String"
+		input-channel="clientBytes2StringChannel" />
 
 	<!-- Server side -->
 
@@ -57,10 +56,9 @@
 	<bean id="echoService"
 		class="org.springframework.integration.samples.tcpclientserver.EchoService" />
 
-	<int:transformer id="serverBytes2String"
+	<int:object-to-string-transformer id="serverBytes2String"
 		input-channel="serverBytes2StringChannel"
-		output-channel="toSA"
-		expression="new String(payload)"/>
+		output-channel="toSA"/>
 
 	<int:transformer id="errorHandler"
 		input-channel="errorChannel"
diff --git a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml
index 12188ecc..290d6dfe 100644
--- a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml
+++ b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml
@@ -39,9 +39,8 @@
 
 	<int:channel id="clientBytes2StringChannel"/>
 
-	<int:transformer id="clientBytes2String"
-		input-channel="clientBytes2StringChannel"
-		expression="new String(payload)"/>
+	<int:object-to-string-transformer id="clientBytes2String"
+		input-channel="clientBytes2StringChannel" />
 
 	<!-- Server side -->
 	<!-- When creating the socket factory on the server side, we specify both the serializer and deserializer