From a226eedf4b591d4168ba2dabfa35f4ac5594e0d3 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 29 Apr 2014 10:01:53 -0400 Subject: [PATCH] INT-3392 Fix Package Tangle https://jira.spring.io/browse/INT-3392 `TcpDeserializationExceptionEvent` was incorrectly in the connection package; move to serializer. --- .../ip/tcp/serializer/AbstractByteArraySerializer.java | 1 - .../TcpDeserializationExceptionEvent.java | 2 +- .../integration/ip/tcp/serializer/DeserializationTests.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) rename spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/{connection => serializer}/TcpDeserializationExceptionEvent.java (96%) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java index 65d8ad7428..c91ae4339a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java @@ -25,7 +25,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.ip.tcp.connection.TcpDeserializationExceptionEvent; /** * Base class for (de)serializers that provide a mechanism to diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpDeserializationExceptionEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpDeserializationExceptionEvent.java similarity index 96% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpDeserializationExceptionEvent.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpDeserializationExceptionEvent.java index 7e2d23a519..120404f1ab 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpDeserializationExceptionEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpDeserializationExceptionEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.tcp.connection; +package org.springframework.integration.ip.tcp.serializer; import org.springframework.integration.ip.event.IpIntegrationEvent; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java index 7e22122ca6..74df17d6d2 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java @@ -37,7 +37,6 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.DefaultDeserializer; -import org.springframework.integration.ip.tcp.connection.TcpDeserializationExceptionEvent; import org.springframework.integration.ip.util.SocketTestUtils; import org.springframework.integration.test.util.SocketUtils;