diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionCloseEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionCloseEvent.java similarity index 88% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionCloseEvent.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionCloseEvent.java index 77f9933591..9eb086e76f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionCloseEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionCloseEvent.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.tcp.connection.event; +package org.springframework.integration.ip.tcp.connection; -import org.springframework.integration.ip.tcp.connection.TcpConnection; /** * @author Gary Russell diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEvent.java similarity index 92% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionEvent.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEvent.java index 6f4eb602a5..6894c8575d 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEvent.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.tcp.connection.event; +package org.springframework.integration.ip.tcp.connection; import org.springframework.integration.ip.event.IpIntegrationEvent; -import org.springframework.integration.ip.tcp.connection.TcpConnection; /** * ApplicationEvent representing normal operations on a {@link TcpConnection}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java index 812b629ac0..b63c754fdf 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java @@ -22,7 +22,6 @@ import org.springframework.context.ApplicationListener; import org.springframework.integration.Message; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.endpoint.MessageProducerSupport; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionExceptionEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionExceptionEvent.java similarity index 88% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionExceptionEvent.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionExceptionEvent.java index 207c4831dc..810389b6ef 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionExceptionEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionExceptionEvent.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.tcp.connection.event; +package org.springframework.integration.ip.tcp.connection; -import org.springframework.integration.ip.tcp.connection.TcpConnection; /** * ApplicationEvent representing exceptions on a {@link TcpConnection}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionOpenEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionOpenEvent.java similarity index 88% rename from spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionOpenEvent.java rename to spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionOpenEvent.java index e2ad806b81..0a0cde40e5 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/TcpConnectionOpenEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionOpenEvent.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.ip.tcp.connection.event; +package org.springframework.integration.ip.tcp.connection; -import org.springframework.integration.ip.tcp.connection.TcpConnection; /** * @author Gary Russell diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java index b006e4ee4a..f2c08d1b75 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java @@ -30,10 +30,6 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionCloseEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionExceptionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; import org.springframework.integration.ip.tcp.serializer.AbstractByteArraySerializer; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/package-info.java deleted file mode 100644 index d41864e353..0000000000 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/event/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Classes representing TCP connection events. - */ -package org.springframework.integration.ip.tcp.connection.event; \ No newline at end of file diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index c7826c9887..46258a9b78 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -56,7 +56,9 @@ import org.springframework.integration.ip.tcp.connection.AbstractConnectionFacto import org.springframework.integration.ip.tcp.connection.DefaultTcpNetSSLSocketFactorySupport; import org.springframework.integration.ip.tcp.connection.DefaultTcpNioSSLConnectionSupport; import org.springframework.integration.ip.tcp.connection.DefaultTcpSSLContextSupport; +import org.springframework.integration.ip.tcp.connection.TcpConnectionEvent; import org.springframework.integration.ip.tcp.connection.TcpConnectionEventListeningMessageProducer; +import org.springframework.integration.ip.tcp.connection.TcpConnectionOpenEvent; import org.springframework.integration.ip.tcp.connection.TcpConnectionSupport; import org.springframework.integration.ip.tcp.connection.TcpMessageMapper; import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory; @@ -66,8 +68,6 @@ import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionF import org.springframework.integration.ip.tcp.connection.TcpSSLContextSupport; import org.springframework.integration.ip.tcp.connection.TcpSocketFactorySupport; import org.springframework.integration.ip.tcp.connection.TcpSocketSupport; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; import org.springframework.integration.ip.udp.DatagramPacketMessageMapper; import org.springframework.integration.ip.udp.MulticastReceivingChannelAdapter; import org.springframework.integration.ip.udp.MulticastSendingMessageHandler; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java index 7683c00c46..31032d8649 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java @@ -38,10 +38,10 @@ import org.springframework.integration.history.MessageHistory; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnection; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionCloseEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionExceptionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; +import org.springframework.integration.ip.tcp.connection.TcpConnectionCloseEvent; +import org.springframework.integration.ip.tcp.connection.TcpConnectionEvent; +import org.springframework.integration.ip.tcp.connection.TcpConnectionExceptionEvent; +import org.springframework.integration.ip.tcp.connection.TcpConnectionOpenEvent; import org.springframework.integration.ip.tcp.serializer.ByteArrayRawSerializer; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java index f2b738cf4d..24e2f0340f 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java @@ -32,9 +32,6 @@ import org.mockito.Mockito; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionExceptionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java index f8d92e04ba..d16615513a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java @@ -37,8 +37,6 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java index 009ba44307..e401884e87 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java @@ -32,8 +32,6 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.integration.Message; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionCloseEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java index 68923eaf9d..747188d689 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java @@ -24,8 +24,6 @@ import org.mockito.Mockito; import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionEvent; -import org.springframework.integration.ip.tcp.connection.event.TcpConnectionOpenEvent; /** * @author Gary Russell