From 19dc3bb897c0f21dfebba632ab08db37c1ea830d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 27 Jul 2010 16:13:22 +0000 Subject: [PATCH] INT-1280 (partial) - Move java serializer implementations to subpackage --- .../DeserializingConverter.java} | 9 +++++---- .../JavaStreamingConverter.java} | 7 +++++-- .../SerializingConverter.java} | 9 +++++---- .../commons/serializer/java/package-info.java | 6 ++++++ .../transformer/PayloadDeserializingTransformer.java | 6 +++--- .../transformer/PayloadSerializingTransformer.java | 6 +++--- .../commons/serializer/JavaSerializationTests.java | 12 +++++++----- .../ip/config/ParserUnitTests-context.xml | 2 +- .../ip/tcp/SharedConnectionTests-context.xml | 2 +- .../ip/tcp/TcpSendingMessageHandlerTests.java | 6 +++--- 10 files changed, 39 insertions(+), 26 deletions(-) rename spring-integration-core/src/main/java/org/springframework/commons/serializer/{JavaDeserializingConverter.java => java/DeserializingConverter.java} (77%) rename spring-integration-core/src/main/java/org/springframework/commons/serializer/{JavaSerializationConverter.java => java/JavaStreamingConverter.java} (87%) rename spring-integration-core/src/main/java/org/springframework/commons/serializer/{JavaSerializingConverter.java => java/SerializingConverter.java} (79%) create mode 100644 spring-integration-core/src/main/java/org/springframework/commons/serializer/java/package-info.java diff --git a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaDeserializingConverter.java b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/DeserializingConverter.java similarity index 77% rename from spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaDeserializingConverter.java rename to spring-integration-core/src/main/java/org/springframework/commons/serializer/java/DeserializingConverter.java index 9480df1745..bf24e803c3 100644 --- a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaDeserializingConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/DeserializingConverter.java @@ -14,24 +14,25 @@ * limitations under the License. */ -package org.springframework.commons.serializer; +package org.springframework.commons.serializer.java; import java.io.ByteArrayInputStream; import java.io.IOException; +import org.springframework.commons.serializer.DeserializationFailureException; import org.springframework.core.convert.converter.Converter; /** - * Delegates to a {@link JavaSerializationConverter} to deserialize data + * Delegates to a {@link JavaStreamingConverter} to deserialize data * in a byte[] to an object. * * @author Gary Russell * @since 2.0 * */ -public class JavaDeserializingConverter implements Converter { +public class DeserializingConverter implements Converter { - private JavaSerializationConverter converter = new JavaSerializationConverter(); + private JavaStreamingConverter converter = new JavaStreamingConverter(); public Object convert(byte[] source) { ByteArrayInputStream byteStream = new ByteArrayInputStream(source); diff --git a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializationConverter.java b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/JavaStreamingConverter.java similarity index 87% rename from spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializationConverter.java rename to spring-integration-core/src/main/java/org/springframework/commons/serializer/java/JavaStreamingConverter.java index 6c8c23771b..c891168601 100644 --- a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializationConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/JavaStreamingConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.commons.serializer; +package org.springframework.commons.serializer.java; import java.io.IOException; import java.io.InputStream; @@ -22,6 +22,9 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; +import org.springframework.commons.serializer.InputStreamingConverter; +import org.springframework.commons.serializer.OutputStreamingConverter; + /** * Converter that implements both input and output streaming using Java @@ -31,7 +34,7 @@ import java.io.OutputStream; * @since 2.0 * */ -public class JavaSerializationConverter +public class JavaStreamingConverter implements InputStreamingConverter, OutputStreamingConverter { diff --git a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializingConverter.java b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/SerializingConverter.java similarity index 79% rename from spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializingConverter.java rename to spring-integration-core/src/main/java/org/springframework/commons/serializer/java/SerializingConverter.java index 8b57f0d6cb..ac680dc2a0 100644 --- a/spring-integration-core/src/main/java/org/springframework/commons/serializer/JavaSerializingConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/SerializingConverter.java @@ -14,25 +14,26 @@ * limitations under the License. */ -package org.springframework.commons.serializer; +package org.springframework.commons.serializer.java; import java.io.ByteArrayOutputStream; import java.io.Serializable; +import org.springframework.commons.serializer.SerializationFailureException; import org.springframework.core.convert.converter.Converter; import org.springframework.util.Assert; /** - * Delegates to a {@link JavaSerializationConverter} to serialize an object + * Delegates to a {@link JavaStreamingConverter} to serialize an object * to a byte[]. Source object must implement {@link Serializable}. * * @author Gary Russell * @since 2.0 * */ -public class JavaSerializingConverter implements Converter { +public class SerializingConverter implements Converter { - private JavaSerializationConverter converter = new JavaSerializationConverter(); + private JavaStreamingConverter converter = new JavaStreamingConverter(); public byte[] convert(Object source) { Assert.isTrue(source instanceof Serializable, this.getClass().getName() diff --git a/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/package-info.java b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/package-info.java new file mode 100644 index 0000000000..23d562f1ca --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/commons/serializer/java/package-info.java @@ -0,0 +1,6 @@ +/** + * Implementations of In/Out JavaStreamingConverter and + * Converter using standard Java Serialization. + */ +package org.springframework.commons.serializer.java; + diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java index f9fc495f34..ddefbcc93e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java @@ -16,13 +16,13 @@ package org.springframework.integration.transformer; -import org.springframework.commons.serializer.JavaDeserializingConverter; +import org.springframework.commons.serializer.java.DeserializingConverter; import org.springframework.core.convert.converter.Converter; import org.springframework.util.Assert; /** * Transformer that deserializes the inbound byte array payload to an object by delegating to a - * Converter<byte[], Object>. Default delegate is a {@link JavaDeserializingConverter}. + * Converter<byte[], Object>. Default delegate is a {@link DeserializingConverter}. *

The byte array payload must be a result of equivalent serialization. * * @author Mark Fisher @@ -32,7 +32,7 @@ import org.springframework.util.Assert; public class PayloadDeserializingTransformer extends PayloadTypeConvertingTransformer { public PayloadDeserializingTransformer() { - this.converter = new JavaDeserializingConverter(); + this.converter = new DeserializingConverter(); } @Override diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java index dce0ac8378..016f033b85 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java @@ -16,13 +16,13 @@ package org.springframework.integration.transformer; -import org.springframework.commons.serializer.JavaSerializingConverter; +import org.springframework.commons.serializer.java.SerializingConverter; import org.springframework.core.convert.converter.Converter; import org.springframework.util.Assert; /** * Transformer that serializes the inbound payload into a byte array by delegating to a - * Converter<Object, byte[]>. Default delegate is a {@link JavaSerializingConverter}. + * Converter<Object, byte[]>. Default delegate is a {@link SerializingConverter}. * *

The payload instance must be Serializable if the default converter is used. * @@ -34,7 +34,7 @@ public class PayloadSerializingTransformer extends PayloadTypeConvertingTransfor public PayloadSerializingTransformer() { - this.converter = new JavaSerializingConverter(); + this.converter = new SerializingConverter(); } @Override diff --git a/spring-integration-core/src/test/java/org/springframework/commons/serializer/JavaSerializationTests.java b/spring-integration-core/src/test/java/org/springframework/commons/serializer/JavaSerializationTests.java index d5bf70ca2f..d7ef179766 100644 --- a/spring-integration-core/src/test/java/org/springframework/commons/serializer/JavaSerializationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/commons/serializer/JavaSerializationTests.java @@ -22,6 +22,8 @@ import static org.junit.Assert.fail; import java.io.Serializable; import org.junit.Test; +import org.springframework.commons.serializer.java.DeserializingConverter; +import org.springframework.commons.serializer.java.SerializingConverter; /** @@ -33,15 +35,15 @@ public class JavaSerializationTests { @Test public void testGood() { - JavaSerializingConverter toBytes = new JavaSerializingConverter(); + SerializingConverter toBytes = new SerializingConverter(); byte[] bytes = toBytes.convert("Testing"); - JavaDeserializingConverter fromBytes = new JavaDeserializingConverter(); + DeserializingConverter fromBytes = new DeserializingConverter(); assertEquals("Testing", fromBytes.convert(bytes)); } @Test public void testBadSerializeNotSerializable() { - JavaSerializingConverter toBytes = new JavaSerializingConverter(); + SerializingConverter toBytes = new SerializingConverter(); try { toBytes.convert(new Object()); fail("Expected IllegalArgumentException"); @@ -51,7 +53,7 @@ public class JavaSerializationTests { @Test public void testBadSerializeNotSerializableField() { - JavaSerializingConverter toBytes = new JavaSerializingConverter(); + SerializingConverter toBytes = new SerializingConverter(); try { toBytes.convert(new UnSerializable()); fail("Expected SerializationFailureException"); @@ -61,7 +63,7 @@ public class JavaSerializationTests { @Test public void testBadDeserialize() { - JavaDeserializingConverter fromBytes = new JavaDeserializingConverter(); + DeserializingConverter fromBytes = new DeserializingConverter(); try { fromBytes.convert("Junk".getBytes()); fail("Expected DeserializationFailureException"); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml index 024d34a439..3c2a57a602 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml @@ -320,7 +320,7 @@ using-direct-buffers="true" /> - + - +