move legacy part to application

JavaSaBr · JavaSaBr · commit c8e48d15f912 · 2025-09-28T16:15:27.000+02:00
diff --git a/application/build.gradle b/application/build.gradle
@@ -1,8 +1,25 @@
 plugins {
-  id "java-library"
+  id "java"
+  id "groovy"
+  id "org.springframework.boot"
 }
 
+apply from: "$rootDir/gradle/configure-java.gradle"
+
 dependencies {
+  implementation projects.service
+  implementation libs.rlib.logger.slf4j
+  implementation libs.springboot.starter.core
+  implementation libs.springboot.starter.log4j2
 
   testImplementation projects.testSupport
+}
+
+tasks.withType(GroovyCompile).configureEach {
+  options.forkOptions.jvmArgs += "--enable-preview"
+}
+
+configurations.each {
+  it.exclude group: "org.slf4j", module: "slf4j-log4j12"
+  it.exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
 }
diff --git a/application/src/main/java/javasabr/mqtt/application/MqttBrokerApplication.java b/application/src/main/java/javasabr/mqtt/application/MqttBrokerApplication.java
@@ -1,7 +1,7 @@
-package javasabr.mqtt.legacy;
+package javasabr.mqtt.application;
 
-import javasabr.mqtt.legacy.config.MqttBrokerConfig;
-import javasabr.mqtt.legacy.config.MqttNetworkConfig;
+import javasabr.mqtt.application.config.MqttBrokerConfig;
+import javasabr.mqtt.application.config.MqttNetworkConfig;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Configuration;
diff --git a/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.config;
+package javasabr.mqtt.application.config;
 
 import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;
 import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
diff --git a/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.config;
+package javasabr.mqtt.application.config;
 
 import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
 import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
diff --git a/application/src/main/java/javasabr/mqtt/application/config/package-info.java b/application/src/main/java/javasabr/mqtt/application/config/package-info.java
@@ -1,4 +1,4 @@
 @NullMarked
-package javasabr.mqtt.legacy.config;
+package javasabr.mqtt.application.config;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/application/src/main/resources/application.properties b/application/src/main/resources/application.properties
diff --git a/application/src/main/resources/credentials b/application/src/main/resources/credentials
diff --git a/application/src/main/resources/log4j2.xml b/application/src/main/resources/log4j2.xml
diff --git a/application/src/test/groovy/javasabr/mqtt/application/UnitSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/UnitSpecification.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy
+package javasabr.mqtt.application
 
 import spock.lang.Specification
 
diff --git a/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy b/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.extension
+package javasabr.mqtt.application.extension
 
 import javasabr.mqtt.network.packet.out.MqttWritablePacket
 import javasabr.mqtt.network.utils.MqttDataUtils
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/ConnectSubscribePublishTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/ConnectSubscribePublishTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.integration
+package javasabr.mqtt.application.integration
 
 import com.hivemq.client.mqtt.datatypes.MqttQos
 import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.integration
+package javasabr.mqtt.application.integration
 
 import com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException
 import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy
@@ -1,11 +1,11 @@
-package javasabr.mqtt.legacy.integration
+package javasabr.mqtt.application.integration
 
 import com.hivemq.client.mqtt.MqttClient
 import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient
 import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient
 import javasabr.mqtt.network.MqttConnection
-import javasabr.mqtt.legacy.integration.config.MqttBrokerTestConfig
-import javasabr.mqtt.legacy.mock.MqttMockClient
+import javasabr.mqtt.application.integration.config.MqttBrokerTestConfig
+import javasabr.mqtt.application.mock.MqttMockClient
 import javasabr.mqtt.model.MqttConnectionConfig
 import javasabr.mqtt.model.MqttProperties
 import javasabr.mqtt.model.MqttVersion
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/InternalConnectionTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/InternalConnectionTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.integration
+package javasabr.mqtt.application.integration
 
 import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode
 import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.integration
+package javasabr.mqtt.application.integration
 
 import com.hivemq.client.mqtt.datatypes.MqttQos
 import javasabr.mqtt.network.packet.in.ConnectAckInPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/config/MqttBrokerTestConfig.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/config/MqttBrokerTestConfig.groovy
@@ -1,7 +1,7 @@
-package javasabr.mqtt.legacy.integration.config
+package javasabr.mqtt.application.integration.config
 
-import javasabr.mqtt.legacy.config.MqttBrokerConfig
-import javasabr.mqtt.legacy.config.MqttNetworkConfig
+import javasabr.mqtt.application.config.MqttBrokerConfig
+import javasabr.mqtt.application.config.MqttNetworkConfig
 import javasabr.mqtt.network.MqttConnection
 import javasabr.rlib.network.server.ServerNetwork
 import org.springframework.beans.factory.annotation.Qualifier
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy
@@ -1,8 +1,8 @@
-package javasabr.mqtt.legacy.integration.service
+package javasabr.mqtt.application.integration.service
 
 import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
 import javasabr.mqtt.service.ClientIdRegistry
-import javasabr.mqtt.legacy.integration.IntegrationSpecification
+import javasabr.mqtt.application.integration.IntegrationSpecification
 import javasabr.rlib.common.util.StringUtils
 import org.springframework.beans.factory.annotation.Autowired
 
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy
@@ -1,9 +1,9 @@
-package javasabr.mqtt.legacy.integration.service
+package javasabr.mqtt.application.integration.service
 
 import com.hivemq.client.mqtt.MqttClientState
 import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException
 import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode
-import javasabr.mqtt.legacy.integration.IntegrationSpecification
+import javasabr.mqtt.application.integration.IntegrationSpecification
 import org.springframework.test.context.TestPropertySource
 import spock.lang.Unroll
 
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy
@@ -1,9 +1,9 @@
-package javasabr.mqtt.legacy.integration.service
+package javasabr.mqtt.application.integration.service
 
 import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
 import javasabr.mqtt.service.ClientIdRegistry
 import javasabr.mqtt.service.MqttSessionService
-import javasabr.mqtt.legacy.integration.IntegrationSpecification
+import javasabr.mqtt.application.integration.IntegrationSpecification
 import org.springframework.beans.factory.annotation.Autowired
 
 class MqttSessionServiceTest extends IntegrationSpecification {
diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy
@@ -1,10 +1,10 @@
-package javasabr.mqtt.legacy.integration.service
+package javasabr.mqtt.application.integration.service
 
 import com.hivemq.client.mqtt.datatypes.MqttQos
 import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException
 import javasabr.mqtt.service.ClientIdRegistry
 import javasabr.mqtt.service.impl.SimpleSubscriptionService
-import javasabr.mqtt.legacy.integration.IntegrationSpecification
+import javasabr.mqtt.application.integration.IntegrationSpecification
 import javasabr.mqtt.model.ActionResult
 import javasabr.mqtt.model.subscriber.SingleSubscriber
 import org.spockframework.util.Pair
diff --git a/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy b/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.mock
+package javasabr.mqtt.application.mock
 
 import javasabr.mqtt.network.MqttConnection
 import javasabr.mqtt.network.packet.PacketType
diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy
@@ -1,6 +1,6 @@
-package javasabr.mqtt.legacy.model
+package javasabr.mqtt.application.model
 
-import javasabr.mqtt.legacy.network.NetworkUnitSpecification
+import javasabr.mqtt.application.network.NetworkUnitSpecification
 import javasabr.mqtt.model.ActionResult
 import spock.lang.Unroll
 
diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy
@@ -1,7 +1,7 @@
-package javasabr.mqtt.legacy.model
+package javasabr.mqtt.application.model
 
 import javasabr.mqtt.network.MqttClient
-import javasabr.mqtt.legacy.network.NetworkUnitSpecification
+import javasabr.mqtt.application.network.NetworkUnitSpecification
 import javasabr.mqtt.model.QoS
 import javasabr.mqtt.model.subscriber.SubscribeTopicFilter
 import javasabr.mqtt.model.topic.TopicFilter
diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.model
+package javasabr.mqtt.application.model
 
 import javasabr.mqtt.model.MqttUser
 import javasabr.mqtt.model.QoS
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy
@@ -1,6 +1,6 @@
-package javasabr.mqtt.legacy.network
+package javasabr.mqtt.application.network
 
-import javasabr.mqtt.legacy.UnitSpecification
+import javasabr.mqtt.application.UnitSpecification
 import javasabr.mqtt.model.MqttConnectionConfig
 import javasabr.mqtt.model.MqttVersion
 import javasabr.mqtt.model.QoS
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.AuthenticationInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/BaseInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/BaseInPacketTest.groovy
@@ -0,0 +1,6 @@
+package javasabr.mqtt.application.network.in
+
+import javasabr.mqtt.application.network.NetworkUnitSpecification
+
+class BaseInPacketTest extends NetworkUnitSpecification {
+}
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.ConnectAckInPacket
 import javasabr.mqtt.model.MqttProperties
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.model.exception.MalformedPacketMqttException
 import javasabr.mqtt.network.packet.in.ConnectInPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.DisconnectInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.PublishAckInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.PublishCompleteInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.PublishInPacket
 import javasabr.mqtt.model.MqttProperties
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.PublishReceivedInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.PublishReleaseInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.SubscribeAckInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.SubscribeInPacket
 import javasabr.mqtt.model.MqttProperties
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.in
+package javasabr.mqtt.application.network.in
 
 import javasabr.mqtt.network.packet.in.UnsubscribeInPacket
 import javasabr.mqtt.model.PacketProperty
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.AuthenticationInPacket
 import javasabr.mqtt.network.packet.out.Authentication5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/BaseOutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/BaseOutPacketTest.groovy
@@ -1,7 +1,7 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.MqttClient
-import javasabr.mqtt.legacy.network.NetworkUnitSpecification
+import javasabr.mqtt.application.network.NetworkUnitSpecification
 import spock.lang.Shared
 
 class BaseOutPacketTest extends NetworkUnitSpecification {
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.ConnectInPacket
 import javasabr.mqtt.network.packet.out.Connect311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.ConnectInPacket
 import javasabr.mqtt.network.packet.out.Connect5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.ConnectAckInPacket
 import javasabr.mqtt.network.packet.out.ConnectAck311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.ConnectAckInPacket
 import javasabr.mqtt.network.packet.out.ConnectAck5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.DisconnectInPacket
 import javasabr.mqtt.network.packet.out.Disconnect5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishInPacket
 import javasabr.mqtt.network.packet.out.Publish311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishInPacket
 import javasabr.mqtt.network.packet.out.Publish5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishAckInPacket
 import javasabr.mqtt.network.packet.out.PublishAck311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishAckInPacket
 import javasabr.mqtt.network.packet.out.PublishAck5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishCompleteInPacket
 import javasabr.mqtt.network.packet.out.PublishComplete311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishCompleteInPacket
 import javasabr.mqtt.network.packet.out.PublishComplete5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishReceivedInPacket
 import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishReceivedInPacket
 import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishReleaseInPacket
 import javasabr.mqtt.network.packet.out.PublishRelease311OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy
@@ -1,4 +1,4 @@
-package javasabr.mqtt.legacy.network.out
+package javasabr.mqtt.application.network.out
 
 import javasabr.mqtt.network.packet.in.PublishReleaseInPacket
 import javasabr.mqtt.network.packet.out.PublishRelease5OutPacket
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck5OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck5OutPacketTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/util/MqttDataUtilsTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/util/MqttDataUtilsTest.groovy
diff --git a/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy
diff --git a/application/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/application/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/application/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties
diff --git a/application/src/test/resources/credentials-test b/application/src/test/resources/credentials-test
diff --git a/application/src/test/resources/disabled-features.properties b/application/src/test/resources/disabled-features.properties
diff --git a/application/src/test/resources/log4j2.xml b/application/src/test/resources/log4j2.xml
diff --git a/legacy/build.gradle b/legacy/build.gradle
diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/BaseInPacketTest.groovy b/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/BaseInPacketTest.groovy
diff --git a/legacy/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/legacy/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package javasabr.mqtt.legacy.config;`
	`1`	`+package javasabr.mqtt.application.config;`
`2`	`2`
`3`	`3`	`import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;`
`4`	`4`	`import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package javasabr.mqtt.legacy`
	`1`	`+package javasabr.mqtt.application`
`2`	`2`
`3`	`3`	`import spock.lang.Specification`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package javasabr.mqtt.legacy.extension`
	`1`	`+package javasabr.mqtt.application.extension`
`2`	`2`
`3`	`3`	`import javasabr.mqtt.network.packet.out.MqttWritablePacket`
`4`	`4`	`import javasabr.mqtt.network.utils.MqttDataUtils`