diff --git a/application/build.gradle b/application/build.gradle index d996cd8e..cd5d0d79 100644 --- 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" } \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/MqttBrokerApplication.java b/application/src/main/java/javasabr/mqtt/application/MqttBrokerApplication.java similarity index 75% rename from legacy/src/main/java/javasabr/mqtt/legacy/MqttBrokerApplication.java rename to application/src/main/java/javasabr/mqtt/application/MqttBrokerApplication.java index 93fb2f6f..3ffd9e45 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/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/legacy/src/main/java/javasabr/mqtt/legacy/config/MqttBrokerConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java similarity index 62% rename from legacy/src/main/java/javasabr/mqtt/legacy/config/MqttBrokerConfig.java rename to application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java index 1f4f45d4..d36e5b00 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/config/MqttBrokerConfig.java +++ b/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java @@ -1,38 +1,38 @@ -package javasabr.mqtt.legacy.config; +package javasabr.mqtt.application.config; -import javasabr.mqtt.legacy.handler.client.DefaultMqttClientReleaseHandler; -import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler; -import javasabr.mqtt.legacy.handler.packet.in.ConnectInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.DisconnetInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler; -import javasabr.mqtt.legacy.handler.packet.in.PublishAckInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.PublishCompleteInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.PublishInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.PublishReceiveInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.PublishReleaseInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.SubscribeInPacketHandler; -import javasabr.mqtt.legacy.handler.packet.in.UnsubscribeInPacketHandler; -import javasabr.mqtt.legacy.handler.publish.in.PublishInHandler; -import javasabr.mqtt.legacy.handler.publish.in.Qos0PublishInHandler; -import javasabr.mqtt.legacy.handler.publish.in.Qos1PublishInHandler; -import javasabr.mqtt.legacy.handler.publish.in.Qos2PublishInHandler; -import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler; -import javasabr.mqtt.legacy.handler.publish.out.Qos0PublishOutHandler; -import javasabr.mqtt.legacy.handler.publish.out.Qos1PublishOutHandler; -import javasabr.mqtt.legacy.handler.publish.out.Qos2PublishOutHandler; -import javasabr.mqtt.legacy.network.packet.PacketType; -import javasabr.mqtt.legacy.service.AuthenticationService; -import javasabr.mqtt.legacy.service.ClientIdRegistry; -import javasabr.mqtt.legacy.service.CredentialSource; -import javasabr.mqtt.legacy.service.MqttSessionService; -import javasabr.mqtt.legacy.service.PublishingService; -import javasabr.mqtt.legacy.service.SubscriptionService; -import javasabr.mqtt.legacy.service.impl.DefaultPublishingService; -import javasabr.mqtt.legacy.service.impl.FileCredentialsSource; -import javasabr.mqtt.legacy.service.impl.InMemoryClientIdRegistry; -import javasabr.mqtt.legacy.service.impl.InMemoryMqttSessionService; -import javasabr.mqtt.legacy.service.impl.SimpleAuthenticationService; -import javasabr.mqtt.legacy.service.impl.SimpleSubscriptionService; +import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; +import javasabr.mqtt.service.handler.in.ConnectInPacketHandler; +import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler; +import javasabr.mqtt.network.handler.packet.in.PacketInHandler; +import javasabr.mqtt.service.handler.in.PublishAckInPacketHandler; +import javasabr.mqtt.service.handler.in.PublishCompleteInPacketHandler; +import javasabr.mqtt.service.handler.in.PublishInPacketHandler; +import javasabr.mqtt.service.handler.in.PublishReceiveInPacketHandler; +import javasabr.mqtt.service.handler.in.PublishReleaseInPacketHandler; +import javasabr.mqtt.service.handler.in.SubscribeInPacketHandler; +import javasabr.mqtt.service.handler.in.UnsubscribeInPacketHandler; +import javasabr.mqtt.network.handler.publish.PublishInHandler; +import javasabr.mqtt.service.handler.publish.in.Qos0PublishInHandler; +import javasabr.mqtt.service.handler.publish.in.Qos1PublishInHandler; +import javasabr.mqtt.service.handler.publish.in.Qos2PublishInHandler; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.Qos0PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.Qos1PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.Qos2PublishOutHandler; +import javasabr.mqtt.network.packet.PacketType; +import javasabr.mqtt.service.AuthenticationService; +import javasabr.mqtt.service.ClientIdRegistry; +import javasabr.mqtt.service.CredentialSource; +import javasabr.mqtt.service.MqttSessionService; +import javasabr.mqtt.service.PublishingService; +import javasabr.mqtt.service.SubscriptionService; +import javasabr.mqtt.service.impl.DefaultPublishingService; +import javasabr.mqtt.service.impl.FileCredentialsSource; +import javasabr.mqtt.service.impl.InMemoryClientIdRegistry; +import javasabr.mqtt.service.impl.InMemoryMqttSessionService; +import javasabr.mqtt.service.impl.SimpleAuthenticationService; +import javasabr.mqtt.service.impl.SimpleSubscriptionService; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.context.annotation.Bean; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/config/MqttNetworkConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/config/MqttNetworkConfig.java rename to application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java index d3202208..a37b3a58 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/config/MqttNetworkConfig.java +++ b/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.config; +package javasabr.mqtt.application.config; -import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler; -import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; +import javasabr.mqtt.network.handler.packet.in.PacketInHandler; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.QoS; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.client.ExternalMqttClient; -import javasabr.mqtt.legacy.network.client.InternalMqttClient; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.client.ExternalMqttClient; +import javasabr.mqtt.network.client.InternalMqttClient; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; import java.net.InetSocketAddress; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.BiFunction; 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 new file mode 100644 index 00000000..36f8e56b --- /dev/null +++ b/application/src/main/java/javasabr/mqtt/application/config/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.application.config; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/resources/application.properties b/application/src/main/resources/application.properties similarity index 100% rename from legacy/src/main/resources/application.properties rename to application/src/main/resources/application.properties diff --git a/legacy/src/main/resources/credentials b/application/src/main/resources/credentials similarity index 100% rename from legacy/src/main/resources/credentials rename to application/src/main/resources/credentials diff --git a/legacy/src/main/resources/log4j2.xml b/application/src/main/resources/log4j2.xml similarity index 100% rename from legacy/src/main/resources/log4j2.xml rename to application/src/main/resources/log4j2.xml diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/UnitSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/UnitSpecification.groovy similarity index 71% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/UnitSpecification.groovy rename to application/src/test/groovy/javasabr/mqtt/application/UnitSpecification.groovy index f9174689..e7d5cba1 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/extension/SpecificationExtensions.groovy b/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy similarity index 93% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/extension/SpecificationExtensions.groovy rename to application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy index dc2e6a89..2eb6da91 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/extension/SpecificationExtensions.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.extension +package javasabr.mqtt.application.extension -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket -import javasabr.mqtt.legacy.util.MqttDataUtils +import javasabr.mqtt.network.packet.out.MqttWritablePacket +import javasabr.mqtt.network.utils.MqttDataUtils import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.data.type.PacketDataType import javasabr.mqtt.model.data.type.StringPair diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/ConnectSubscribePublishTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/ConnectSubscribePublishTest.groovy similarity index 99% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/ConnectSubscribePublishTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/ConnectSubscribePublishTest.groovy index d7895121..a55f4898 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/ExternalConnectionTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/ExternalConnectionTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy index 9caa6909..33860606 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/ExternalConnectionTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy @@ -1,11 +1,11 @@ -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 import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket -import javasabr.mqtt.legacy.network.packet.out.Connect311OutPacket +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.out.Connect311OutPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.QoS import javasabr.mqtt.model.reason.code.ConnectAckReasonCode diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/IntegrationSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/IntegrationSpecification.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy index af798a55..8f0493ec 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.network.MqttConnection -import javasabr.mqtt.legacy.integration.config.MqttBrokerTestConfig -import javasabr.mqtt.legacy.mock.MqttMockClient +import javasabr.mqtt.network.MqttConnection +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 @@ -16,7 +16,7 @@ import spock.lang.Specification import java.nio.charset.StandardCharsets import java.util.concurrent.atomic.AtomicInteger -import static javasabr.mqtt.legacy.network.MqttClient.* +import static javasabr.mqtt.network.MqttClient.* @SpringJUnitConfig(classes = MqttBrokerTestConfig) class IntegrationSpecification extends Specification { diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/InternalConnectionTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/InternalConnectionTest.groovy similarity index 96% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/InternalConnectionTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/InternalConnectionTest.groovy index e9e62c08..62ca98f7 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/PublishRetryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy similarity index 91% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/PublishRetryTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy index b742a977..5024a309 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/PublishRetryTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy @@ -1,19 +1,19 @@ -package javasabr.mqtt.legacy.integration +package javasabr.mqtt.application.integration import com.hivemq.client.mqtt.datatypes.MqttQos -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.Connect311OutPacket -import javasabr.mqtt.legacy.network.packet.out.Connect5OutPacket -import javasabr.mqtt.legacy.network.packet.out.PublishComplete311OutPacket -import javasabr.mqtt.legacy.network.packet.out.PublishComplete5OutPacket -import javasabr.mqtt.legacy.network.packet.out.PublishReceived311OutPacket -import javasabr.mqtt.legacy.network.packet.out.PublishReceived5OutPacket -import javasabr.mqtt.legacy.network.packet.out.Subscribe311OutPacket -import javasabr.mqtt.legacy.network.packet.out.Subscribe5OutPacket -import javasabr.mqtt.legacy.service.MqttSessionService +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.in.PublishInPacket +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket +import javasabr.mqtt.network.packet.out.Connect311OutPacket +import javasabr.mqtt.network.packet.out.Connect5OutPacket +import javasabr.mqtt.network.packet.out.PublishComplete311OutPacket +import javasabr.mqtt.network.packet.out.PublishComplete5OutPacket +import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket +import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket +import javasabr.mqtt.network.packet.out.Subscribe311OutPacket +import javasabr.mqtt.network.packet.out.Subscribe5OutPacket +import javasabr.mqtt.service.MqttSessionService import javasabr.mqtt.model.QoS import javasabr.mqtt.model.reason.code.ConnectAckReasonCode import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/config/MqttBrokerTestConfig.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/config/MqttBrokerTestConfig.groovy similarity index 85% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/config/MqttBrokerTestConfig.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/config/MqttBrokerTestConfig.groovy index 46a4501f..e7a9dddf 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/config/MqttBrokerTestConfig.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/config/MqttBrokerTestConfig.groovy @@ -1,8 +1,8 @@ -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.legacy.network.MqttConnection +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 import org.springframework.context.annotation.Bean diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/ClientIdRegistryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/ClientIdRegistryTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy index d39280b0..4bedc6a8 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.service.ClientIdRegistry -import javasabr.mqtt.legacy.integration.IntegrationSpecification +import javasabr.mqtt.service.ClientIdRegistry +import javasabr.mqtt.application.integration.IntegrationSpecification import javasabr.rlib.common.util.StringUtils import org.springframework.beans.factory.annotation.Autowired diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy similarity index 93% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/service/DisabledFeaturesSubscribtionServiceTest.groovy index 61bbfc27..8fd50bae 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/MqttSessionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy similarity index 86% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/MqttSessionServiceTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy index 6293bd83..abb674b6 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.service.ClientIdRegistry -import javasabr.mqtt.legacy.service.MqttSessionService -import javasabr.mqtt.legacy.integration.IntegrationSpecification +import javasabr.mqtt.service.ClientIdRegistry +import javasabr.mqtt.service.MqttSessionService +import javasabr.mqtt.application.integration.IntegrationSpecification import org.springframework.beans.factory.annotation.Autowired class MqttSessionServiceTest extends IntegrationSpecification { diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/SubscribtionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy similarity index 96% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/integration/service/SubscribtionServiceTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy index fb1f115d..ece76cc0 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.service.ClientIdRegistry -import javasabr.mqtt.legacy.service.impl.SimpleSubscriptionService -import javasabr.mqtt.legacy.integration.IntegrationSpecification +import javasabr.mqtt.service.ClientIdRegistry +import javasabr.mqtt.service.impl.SimpleSubscriptionService +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/legacy/src/test/groovy/javasabr/mqtt/legacy/mock/MqttMockClient.groovy b/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/mock/MqttMockClient.groovy rename to application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy index 22fcf34b..995002c2 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/mock/MqttMockClient.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy @@ -1,14 +1,14 @@ -package javasabr.mqtt.legacy.mock - -import javasabr.mqtt.legacy.network.MqttConnection -import javasabr.mqtt.legacy.network.packet.PacketType -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket -import javasabr.mqtt.legacy.util.MqttDataUtils +package javasabr.mqtt.application.mock + +import javasabr.mqtt.network.MqttConnection +import javasabr.mqtt.network.packet.PacketType +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.in.MqttReadablePacket +import javasabr.mqtt.network.packet.in.PublishInPacket +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket +import javasabr.mqtt.network.packet.out.MqttWritablePacket +import javasabr.mqtt.network.utils.MqttDataUtils import javasabr.rlib.common.util.NumberUtils import java.nio.ByteBuffer diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/model/ActionResultTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy similarity index 88% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/model/ActionResultTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy index 3c93191d..8a87714b 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/model/TopicSubscriberTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/model/TopicSubscriberTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy index 1c3f571d..0b6cf5f6 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.network.MqttClient -import javasabr.mqtt.legacy.network.NetworkUnitSpecification +import javasabr.mqtt.network.MqttClient +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/legacy/src/test/groovy/javasabr/mqtt/legacy/model/TopicTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy similarity index 98% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/model/TopicTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy index edb40056..0237b917 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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/legacy/src/test/groovy/javasabr/mqtt/legacy/network/NetworkUnitSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/NetworkUnitSpecification.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy index d63998d5..23378244 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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 @@ -9,6 +9,8 @@ import javasabr.mqtt.model.data.type.StringPair import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode import javasabr.mqtt.model.subscriber.SubscribeTopicFilter +import javasabr.mqtt.network.MqttClient +import javasabr.mqtt.network.MqttConnection import javasabr.rlib.collections.array.Array import javasabr.rlib.collections.array.IntArray import spock.lang.Shared diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/AuthenticationInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy similarity index 96% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/AuthenticationInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy index ce2f66df..57c42367 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/AuthenticationInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.AuthenticationInPacket +import javasabr.mqtt.network.packet.in.AuthenticationInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.AuthenticateReasonCode import javasabr.rlib.collections.array.Array 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 new file mode 100644 index 00000000..6ef65ea8 --- /dev/null +++ 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/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy similarity index 98% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectAckInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy index 8fcb0703..d1bb8e41 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.in.ConnectAckInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy similarity index 96% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy index 2eaf3704..00303f0e 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/ConnectInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.exception.MalformedPacketMqttException -import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket +import javasabr.mqtt.model.exception.MalformedPacketMqttException +import javasabr.mqtt.network.packet.in.ConnectInPacket import javasabr.mqtt.model.MqttVersion import javasabr.mqtt.model.PacketProperty import javasabr.rlib.common.util.ArrayUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/DisconnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/DisconnectInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy index a0aae3e6..a5091bf6 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/DisconnectInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.DisconnectInPacket +import javasabr.mqtt.network.packet.in.DisconnectInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.DisconnectReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishAckInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy index c68b0b36..f2bcbadd 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket +import javasabr.mqtt.network.packet.in.PublishAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishAckReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishCompleteInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishCompleteInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy index db0aa107..10a6e9cb 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishCompleteInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy index 5f211998..16863496 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket +import javasabr.mqtt.network.packet.in.PublishInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReceivedInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReceivedInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy index 2936a8c4..ee780750 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReceivedInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReleaseInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReleaseInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy index 2cae291a..18a12edd 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/PublishReleaseInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeAckInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy index 867c023b..1edc71ee 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy index c3b9f085..783eed4b 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/SubscribeInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.SubscribeInPacket +import javasabr.mqtt.network.packet.in.SubscribeInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy similarity index 96% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeAckInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy index 997b3de9..99e19ed5 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeAckInPacket +import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy similarity index 95% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeInPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy index 8e861c50..3475f737 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/UnsubscribeInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.in +package javasabr.mqtt.application.network.in -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeInPacket +import javasabr.mqtt.network.packet.in.UnsubscribeInPacket import javasabr.mqtt.model.PacketProperty import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Authentication5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy similarity index 84% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Authentication5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy index 2cc3fd51..02b90490 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Authentication5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.AuthenticationInPacket -import javasabr.mqtt.legacy.network.packet.out.Authentication5OutPacket +import javasabr.mqtt.network.packet.in.AuthenticationInPacket +import javasabr.mqtt.network.packet.out.Authentication5OutPacket import javasabr.mqtt.model.reason.code.AuthenticateReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/BaseOutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/BaseOutPacketTest.groovy similarity index 87% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/BaseOutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/BaseOutPacketTest.groovy index ae00469f..a00e7772 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/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.legacy.network.MqttClient -import javasabr.mqtt.legacy.network.NetworkUnitSpecification +import javasabr.mqtt.network.MqttClient +import javasabr.mqtt.application.network.NetworkUnitSpecification import spock.lang.Shared class BaseOutPacketTest extends NetworkUnitSpecification { diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy similarity index 86% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy index c0d7c8cf..eb1c38d2 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket -import javasabr.mqtt.legacy.network.packet.out.Connect311OutPacket +import javasabr.mqtt.network.packet.in.ConnectInPacket +import javasabr.mqtt.network.packet.out.Connect311OutPacket import javasabr.mqtt.model.QoS import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.ArrayUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy similarity index 91% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy index f08f1691..6c5d92ee 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Connect5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket -import javasabr.mqtt.legacy.network.packet.out.Connect5OutPacket +import javasabr.mqtt.network.packet.in.ConnectInPacket +import javasabr.mqtt.network.packet.out.Connect5OutPacket import javasabr.mqtt.model.QoS import javasabr.rlib.common.util.ArrayUtils import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy similarity index 91% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy index 5fabe2b4..82194aed 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket -import javasabr.mqtt.legacy.network.packet.out.ConnectAck311OutPacket +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.out.ConnectAck311OutPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.reason.code.ConnectAckReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy similarity index 93% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy index dc24cec1..bd390743 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/ConnectAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket -import javasabr.mqtt.legacy.network.packet.out.ConnectAck5OutPacket +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.out.ConnectAck5OutPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.reason.code.ConnectAckReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/DisconnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy similarity index 85% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/DisconnectAck5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy index 6bb76e0c..1bfeded2 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/DisconnectAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.DisconnectInPacket -import javasabr.mqtt.legacy.network.packet.out.Disconnect5OutPacket +import javasabr.mqtt.network.packet.in.DisconnectInPacket +import javasabr.mqtt.network.packet.out.Disconnect5OutPacket import javasabr.mqtt.model.reason.code.DisconnectReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy similarity index 90% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy index 9e2ccb5d..3182329d 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket -import javasabr.mqtt.legacy.network.packet.out.Publish311OutPacket +import javasabr.mqtt.network.packet.in.PublishInPacket +import javasabr.mqtt.network.packet.out.Publish311OutPacket import javasabr.mqtt.model.QoS import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy similarity index 93% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy index 9af90fc9..e26b6230 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Publish5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket -import javasabr.mqtt.legacy.network.packet.out.Publish5OutPacket +import javasabr.mqtt.network.packet.in.PublishInPacket +import javasabr.mqtt.network.packet.out.Publish5OutPacket import javasabr.mqtt.model.QoS import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy index afed9e48..3d698572 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishAck311OutPacket +import javasabr.mqtt.network.packet.in.PublishAckInPacket +import javasabr.mqtt.network.packet.out.PublishAck311OutPacket import javasabr.mqtt.model.reason.code.PublishAckReasonCode import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy index 0be8abc2..99e18be6 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishAck5OutPacket +import javasabr.mqtt.network.packet.in.PublishAckInPacket +import javasabr.mqtt.network.packet.out.PublishAck5OutPacket import javasabr.mqtt.model.reason.code.PublishAckReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy index 01e51be1..85ef588a 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishComplete311OutPacket +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket +import javasabr.mqtt.network.packet.out.PublishComplete311OutPacket import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy index b1093bba..43dc74ee 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishComplete5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishComplete5OutPacket +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket +import javasabr.mqtt.network.packet.out.PublishComplete5OutPacket import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy similarity index 82% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy index 32ba5edb..68268b61 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishReceived311OutPacket +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket +import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket import javasabr.mqtt.model.data.type.StringPair import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy index bd0f6107..30df350a 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishReceived5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishReceived5OutPacket +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket +import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy similarity index 82% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy index 0139af29..8a18a0d7 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishRelease311OutPacket +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.out.PublishRelease311OutPacket import javasabr.mqtt.model.data.type.StringPair import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy index 2c9e2b95..e8185583 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/PublishRelease5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket -import javasabr.mqtt.legacy.network.packet.out.PublishRelease5OutPacket +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.out.PublishRelease5OutPacket import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy index 445590c0..87531007 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.SubscribeInPacket -import javasabr.mqtt.legacy.network.packet.out.Subscribe311OutPacket +import javasabr.mqtt.network.packet.in.SubscribeInPacket +import javasabr.mqtt.network.packet.out.Subscribe311OutPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.data.type.StringPair import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy similarity index 83% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy index 08eff37d..66522731 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/Subscribe5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.SubscribeInPacket -import javasabr.mqtt.legacy.network.packet.out.Subscribe5OutPacket +import javasabr.mqtt.network.packet.in.SubscribeInPacket +import javasabr.mqtt.network.packet.out.Subscribe5OutPacket import javasabr.mqtt.model.MqttProperties import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy index cfb681df..95afb7b7 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.SubscribeAck311OutPacket +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket +import javasabr.mqtt.network.packet.out.SubscribeAck311OutPacket import javasabr.mqtt.model.data.type.StringPair import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck5OutPacketTest.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck5OutPacketTest.groovy index 125dff15..e42c33f5 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/SubscribeAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.SubscribeAck5OutPacket +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket +import javasabr.mqtt.network.packet.out.SubscribeAck5OutPacket import javasabr.rlib.common.util.BufferUtils class SubscribeAck5OutPacketTest extends BaseOutPacketTest { diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy similarity index 82% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck311OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy index 9532847d..e655e112 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.UnsubscribeAck311OutPacket +import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket +import javasabr.mqtt.network.packet.out.UnsubscribeAck311OutPacket import javasabr.mqtt.model.data.type.StringPair import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode import javasabr.rlib.collections.array.Array diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck5OutPacketTest.groovy similarity index 81% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck5OutPacketTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck5OutPacketTest.groovy index e342949b..20205587 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/out/UnsubscribeAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck5OutPacketTest.groovy @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.out +package javasabr.mqtt.application.network.out -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeAckInPacket -import javasabr.mqtt.legacy.network.packet.out.UnsubscribeAck5OutPacket +import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket +import javasabr.mqtt.network.packet.out.UnsubscribeAck5OutPacket import javasabr.rlib.common.util.BufferUtils class UnsubscribeAck5OutPacketTest extends BaseOutPacketTest { diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/util/MqttDataUtilsTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/util/MqttDataUtilsTest.groovy similarity index 92% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/util/MqttDataUtilsTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/util/MqttDataUtilsTest.groovy index cfa63718..3e10bef8 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/util/MqttDataUtilsTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/util/MqttDataUtilsTest.groovy @@ -1,6 +1,7 @@ -package javasabr.mqtt.legacy.util +package javasabr.mqtt.application.util -import javasabr.mqtt.legacy.UnitSpecification +import javasabr.mqtt.application.UnitSpecification +import javasabr.mqtt.network.utils.MqttDataUtils import java.nio.ByteBuffer diff --git a/legacy/src/test/groovy/javasabr/mqtt/legacy/util/TopicUtilsTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy similarity index 97% rename from legacy/src/test/groovy/javasabr/mqtt/legacy/util/TopicUtilsTest.groovy rename to application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy index fda697bc..53bcfa95 100644 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/util/TopicUtilsTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.util +package javasabr.mqtt.application.util import spock.lang.Specification import spock.lang.Unroll 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 new file mode 100644 index 00000000..485e81c4 --- /dev/null +++ b/application/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule @@ -0,0 +1,3 @@ +moduleName=test-specification +moduleVersion=1.0 +extensionClasses=javasabr.mqtt.application.extension.SpecificationExtensions diff --git a/legacy/src/test/resources/application-test.properties b/application/src/test/resources/application-test.properties similarity index 100% rename from legacy/src/test/resources/application-test.properties rename to application/src/test/resources/application-test.properties diff --git a/legacy/src/test/resources/credentials-test b/application/src/test/resources/credentials-test similarity index 100% rename from legacy/src/test/resources/credentials-test rename to application/src/test/resources/credentials-test diff --git a/legacy/src/test/resources/disabled-features.properties b/application/src/test/resources/disabled-features.properties similarity index 100% rename from legacy/src/test/resources/disabled-features.properties rename to application/src/test/resources/disabled-features.properties diff --git a/legacy/src/test/resources/log4j2.xml b/application/src/test/resources/log4j2.xml similarity index 85% rename from legacy/src/test/resources/log4j2.xml rename to application/src/test/resources/log4j2.xml index a1e31db8..66ea614f 100644 --- a/legacy/src/test/resources/log4j2.xml +++ b/application/src/test/resources/log4j2.xml @@ -6,7 +6,7 @@ - + diff --git a/base/build.gradle b/base/build.gradle index b462ce45..e9816262 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -3,6 +3,7 @@ apply from: "$rootDir/gradle/configure-java.gradle" dependencies { api libs.gson + api libs.project.reactor.core api libs.rlib.collections testImplementation projects.testSupport } \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/util/ReactorUtils.java b/base/src/main/java/javasabr/mqtt/base/utils/ReactorUtils.java similarity index 97% rename from legacy/src/main/java/javasabr/mqtt/legacy/util/ReactorUtils.java rename to base/src/main/java/javasabr/mqtt/base/utils/ReactorUtils.java index cacc1fad..875e1e9a 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/util/ReactorUtils.java +++ b/base/src/main/java/javasabr/mqtt/base/utils/ReactorUtils.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.util; +package javasabr.mqtt.base.utils; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 62c662cf..2dadc352 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,6 +37,7 @@ moquette-broker = "0.17" [libraries] rlib-network = { module = "javasabr.rlib:rlib-network", version.ref = "rlib" } +rlib-logger-api = { module = "javasabr.rlib:rlib-logger-api", version.ref = "rlib" } rlib-logger-slf4j = { module = "javasabr.rlib:rlib-logger-slf4j", version.ref = "rlib" } rlib-collections = { module = "javasabr.rlib:rlib-collections", version.ref = "rlib" } springboot-starter-core = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot" } diff --git a/legacy/build.gradle b/legacy/build.gradle deleted file mode 100644 index eb1f1e3e..00000000 --- a/legacy/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -plugins { - id "java" - id "groovy" - id "org.springframework.boot" -} - -apply from: "$rootDir/gradle/configure-java.gradle" - -dependencies { - implementation projects.model - implementation projects.base - - implementation libs.rlib.network - implementation libs.rlib.logger.slf4j - implementation libs.springboot.starter.core - implementation libs.springboot.starter.log4j2 - implementation libs.project.reactor.core - - 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/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/PublishInHandler.java b/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/PublishInHandler.java deleted file mode 100644 index 906b61ae..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/PublishInHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package javasabr.mqtt.legacy.handler.publish.in; - -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; - -/** - * Interface to handle incoming publish packets. - */ -public interface PublishInHandler { - - void handle(MqttClient client, PublishInPacket packet); -} diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/package-info.java deleted file mode 100644 index 341529bb..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.handler.publish.in; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/package-info.java deleted file mode 100644 index ee1311c0..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.handler.publish.out; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/package-info.java deleted file mode 100644 index 56bbd2f0..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.network.packet.in; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/package-info.java deleted file mode 100644 index 4306f847..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.network.packet.out; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/package-info.java deleted file mode 100644 index 274828fa..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.network.packet; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/PublishingService.java b/legacy/src/main/java/javasabr/mqtt/legacy/service/PublishingService.java deleted file mode 100644 index 965390a5..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/PublishingService.java +++ /dev/null @@ -1,9 +0,0 @@ -package javasabr.mqtt.legacy.service; - -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; - -public interface PublishingService { - - void publish(MqttClient client, PublishInPacket publish); -} diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/package-info.java b/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/package-info.java deleted file mode 100644 index f2c1a3eb..00000000 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@NullMarked -package javasabr.mqtt.legacy.service.impl; - -import org.jspecify.annotations.NullMarked; \ No newline at end of file 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 deleted file mode 100644 index 577efe68..00000000 --- a/legacy/src/test/groovy/javasabr/mqtt/legacy/network/in/BaseInPacketTest.groovy +++ /dev/null @@ -1,6 +0,0 @@ -package javasabr.mqtt.legacy.network.in - -import javasabr.mqtt.legacy.network.NetworkUnitSpecification - -class BaseInPacketTest extends NetworkUnitSpecification { -} 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 deleted file mode 100644 index 7fb642a1..00000000 --- a/legacy/src/test/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule +++ /dev/null @@ -1,3 +0,0 @@ -moduleName=test-specification -moduleVersion=1.0 -extensionClasses=javasabr.mqtt.legacy.extension.SpecificationExtensions diff --git a/lombok.config b/lombok.config new file mode 100644 index 00000000..b6e33001 --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +lombok.log.custom.declaration = javasabr.rlib.logger.api.Logger javasabr.rlib.logger.api.LoggerManager.getLogger(TYPE) \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/ConnectionRejectException.java b/model/src/main/java/javasabr/mqtt/model/exception/ConnectionRejectException.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/ConnectionRejectException.java rename to model/src/main/java/javasabr/mqtt/model/exception/ConnectionRejectException.java index 5e485ba4..aee4be5c 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/ConnectionRejectException.java +++ b/model/src/main/java/javasabr/mqtt/model/exception/ConnectionRejectException.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.model.exception; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; import lombok.Getter; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/CredentialsSourceException.java b/model/src/main/java/javasabr/mqtt/model/exception/CredentialsSourceException.java similarity index 85% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/CredentialsSourceException.java rename to model/src/main/java/javasabr/mqtt/model/exception/CredentialsSourceException.java index db39942a..6d03fb62 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/CredentialsSourceException.java +++ b/model/src/main/java/javasabr/mqtt/model/exception/CredentialsSourceException.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.model.exception; public class CredentialsSourceException extends RuntimeException { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/InconsistentSubscriptionStateException.java b/model/src/main/java/javasabr/mqtt/model/exception/InconsistentSubscriptionStateException.java similarity index 86% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/InconsistentSubscriptionStateException.java rename to model/src/main/java/javasabr/mqtt/model/exception/InconsistentSubscriptionStateException.java index 01ceca7e..718f4d73 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/InconsistentSubscriptionStateException.java +++ b/model/src/main/java/javasabr/mqtt/model/exception/InconsistentSubscriptionStateException.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.model.exception; public class InconsistentSubscriptionStateException extends RuntimeException { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/MalformedPacketMqttException.java b/model/src/main/java/javasabr/mqtt/model/exception/MalformedPacketMqttException.java similarity index 75% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/MalformedPacketMqttException.java rename to model/src/main/java/javasabr/mqtt/model/exception/MalformedPacketMqttException.java index f7312050..1d70d79a 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/MalformedPacketMqttException.java +++ b/model/src/main/java/javasabr/mqtt/model/exception/MalformedPacketMqttException.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.model.exception; import lombok.NoArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/MqttException.java b/model/src/main/java/javasabr/mqtt/model/exception/MqttException.java similarity index 84% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/MqttException.java rename to model/src/main/java/javasabr/mqtt/model/exception/MqttException.java index a6b9766d..b31a3985 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/MqttException.java +++ b/model/src/main/java/javasabr/mqtt/model/exception/MqttException.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.model.exception; public class MqttException extends RuntimeException { diff --git a/model/src/main/java/javasabr/mqtt/model/exception/package-info.java b/model/src/main/java/javasabr/mqtt/model/exception/package-info.java new file mode 100644 index 00000000..644d384c --- /dev/null +++ b/model/src/main/java/javasabr/mqtt/model/exception/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.model.exception; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/network/build.gradle b/network/build.gradle index d996cd8e..fd701670 100644 --- a/network/build.gradle +++ b/network/build.gradle @@ -1,8 +1,11 @@ -plugins { - id "java-library" -} +apply plugin: "java-library" +apply from: "$rootDir/gradle/configure-java.gradle" dependencies { + api projects.model + api libs.project.reactor.core + api libs.rlib.network + api libs.rlib.logger.api testImplementation projects.testSupport } \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/DefaultMqttSession.java b/network/src/main/java/javasabr/mqtt/network/DefaultMqttSession.java similarity index 94% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/DefaultMqttSession.java rename to network/src/main/java/javasabr/mqtt/network/DefaultMqttSession.java index 71b437e1..ecebaf81 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/DefaultMqttSession.java +++ b/network/src/main/java/javasabr/mqtt/network/DefaultMqttSession.java @@ -1,24 +1,25 @@ -package javasabr.mqtt.legacy.network; +package javasabr.mqtt.network; import javasabr.mqtt.model.MqttProperties; -import javasabr.mqtt.legacy.network.MqttSession.UnsafeMqttSession; +import javasabr.mqtt.network.MqttSession.UnsafeMqttSession; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.topic.TopicFilter; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.PublishInPacket; import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; import javasabr.rlib.collections.array.ArrayFactory; import javasabr.rlib.collections.array.LockableArray; import javasabr.rlib.functions.TriConsumer; import lombok.AllArgsConstructor; +import lombok.CustomLog; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.extern.log4j.Log4j2; -@Log4j2 +@CustomLog @ToString(of = "clientId") @EqualsAndHashCode(of = "clientId") public class DefaultMqttSession implements UnsafeMqttSession { @@ -61,7 +62,7 @@ private static void updatePendingPacket( } if (pendingPublish == null) { - log.warn("Not found pending publish for client {} by received packet {}", clientId, response); + log.warning(clientId , response, "Not found pending publish for client:[%s] by received packet:[%]"::formatted); return; } diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttClient.java b/network/src/main/java/javasabr/mqtt/network/MqttClient.java similarity index 85% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/MqttClient.java rename to network/src/main/java/javasabr/mqtt/network/MqttClient.java index 6692725b..a3406cbd 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttClient.java +++ b/network/src/main/java/javasabr/mqtt/network/MqttClient.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network; +package javasabr.mqtt.network; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.out.MqttPacketOutFactory; +import javasabr.mqtt.network.out.MqttPacketOutFactory; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; import javasabr.mqtt.model.MqttConnectionConfig; import javasabr.mqtt.model.MqttUser; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; import java.util.concurrent.CompletableFuture; import org.jspecify.annotations.Nullable; import reactor.core.publisher.Mono; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttConnection.java b/network/src/main/java/javasabr/mqtt/network/MqttConnection.java similarity index 84% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/MqttConnection.java rename to network/src/main/java/javasabr/mqtt/network/MqttConnection.java index 4105ce71..2b9113bf 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttConnection.java +++ b/network/src/main/java/javasabr/mqtt/network/MqttConnection.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.network; +package javasabr.mqtt.network; import javasabr.mqtt.model.MqttConnectionConfig; -import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler; import javasabr.mqtt.model.MqttVersion; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.MqttPacketReader; -import javasabr.mqtt.legacy.network.packet.MqttPacketWriter; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.handler.packet.in.PacketInHandler; +import javasabr.mqtt.network.packet.MqttPacketReader; +import javasabr.mqtt.network.packet.MqttPacketWriter; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.Function; import javasabr.rlib.network.BufferAllocator; @@ -17,11 +17,11 @@ import javasabr.rlib.network.packet.PacketReader; import javasabr.rlib.network.packet.PacketWriter; import lombok.AccessLevel; +import lombok.CustomLog; import lombok.Getter; import lombok.Setter; -import lombok.extern.log4j.Log4j2; -@Log4j2 +@CustomLog public class MqttConnection extends AbstractConnection { @Getter(AccessLevel.PROTECTED) diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttSession.java b/network/src/main/java/javasabr/mqtt/network/MqttSession.java similarity index 90% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/MqttSession.java rename to network/src/main/java/javasabr/mqtt/network/MqttSession.java index b8c8375e..a19ca0af 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/MqttSession.java +++ b/network/src/main/java/javasabr/mqtt/network/MqttSession.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network; +package javasabr.mqtt.network; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.PublishInPacket; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.topic.TopicFilter; import javasabr.rlib.functions.TriConsumer; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/AbstractMqttClient.java b/network/src/main/java/javasabr/mqtt/network/client/AbstractMqttClient.java similarity index 78% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/client/AbstractMqttClient.java rename to network/src/main/java/javasabr/mqtt/network/client/AbstractMqttClient.java index c50aaf37..e7164c4e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/AbstractMqttClient.java +++ b/network/src/main/java/javasabr/mqtt/network/client/AbstractMqttClient.java @@ -1,28 +1,28 @@ -package javasabr.mqtt.legacy.network.client; +package javasabr.mqtt.network.client; -import javasabr.mqtt.legacy.out.MqttPacketOutFactories; import javasabr.mqtt.model.MqttConnectionConfig; -import javasabr.mqtt.legacy.out.MqttPacketOutFactory; -import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler; -import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; +import javasabr.mqtt.network.handler.packet.in.PacketInHandler; +import javasabr.mqtt.network.out.MqttPacketOutFactories; +import javasabr.mqtt.network.out.MqttPacketOutFactory; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; import javasabr.mqtt.base.utils.DebugUtils; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import javasabr.rlib.common.util.StringUtils; +import lombok.CustomLog; import lombok.Getter; import lombok.Setter; -import lombok.extern.log4j.Log4j2; import org.jspecify.annotations.Nullable; import reactor.core.publisher.Mono; @Getter -@Log4j2 +@CustomLog public abstract class AbstractMqttClient implements UnsafeMqttClient { static { @@ -65,12 +65,12 @@ public AbstractMqttClient(MqttConnection connection, MqttClientReleaseHandler re @Override public void handle(MqttReadablePacket packet) { - log.debug("Client [{}] received packet: {} : {}", clientId, packet.getName(), packet); + log.debug(clientId, packet.getName(), packet, "Client:[%s] received packet:[%s]:[%s]"::formatted); PacketInHandler packetHandler = connection.getPacketHandlers()[packet.getPacketType()]; if (packetHandler != null) { packetHandler.handle(this, packet); } else { - log.warn("No packet handler in client {} for packet {}", this, packet); + log.warning(this, packet, "No packet handler in client:[%s] for packet:[%s]"::formatted); } } @@ -94,13 +94,13 @@ public void configure( @Override public void send(MqttWritablePacket packet) { - log.debug("Send to client [{}] packet: {} : {}", clientId, packet.getName(), packet); + log.debug(clientId, packet.getName(), packet, "Send to client:[%s] packet:[%s]:[%s]"::formatted); connection.send(packet); } @Override public CompletableFuture sendWithFeedback(MqttWritablePacket packet) { - log.debug("Send to client [{}] packet: {} : {}", clientId, packet.getName(), packet); + log.debug(clientId, packet.getName(), packet, "Send to client:[%s] packet:[%s]:[%s]"::formatted); return connection.sendWithFeedback(packet); } diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/ExternalMqttClient.java b/network/src/main/java/javasabr/mqtt/network/client/ExternalMqttClient.java similarity index 65% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/client/ExternalMqttClient.java rename to network/src/main/java/javasabr/mqtt/network/client/ExternalMqttClient.java index d1e53f98..b9dcfe92 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/ExternalMqttClient.java +++ b/network/src/main/java/javasabr/mqtt/network/client/ExternalMqttClient.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.network.client; +package javasabr.mqtt.network.client; -import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler; -import javasabr.mqtt.legacy.network.MqttConnection; +import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.base.utils.DebugUtils; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; public class ExternalMqttClient extends AbstractMqttClient { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/InternalMqttClient.java b/network/src/main/java/javasabr/mqtt/network/client/InternalMqttClient.java similarity index 65% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/client/InternalMqttClient.java rename to network/src/main/java/javasabr/mqtt/network/client/InternalMqttClient.java index 104e4848..b4c70bc0 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/InternalMqttClient.java +++ b/network/src/main/java/javasabr/mqtt/network/client/InternalMqttClient.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.network.client; +package javasabr.mqtt.network.client; -import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler; -import javasabr.mqtt.legacy.network.MqttConnection; +import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.base.utils.DebugUtils; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; public class InternalMqttClient extends AbstractMqttClient { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/package-info.java b/network/src/main/java/javasabr/mqtt/network/client/package-info.java similarity index 59% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/package-info.java rename to network/src/main/java/javasabr/mqtt/network/client/package-info.java index d5a71711..defb4d04 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/client/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.network; +package javasabr.mqtt.network.client; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/MqttClientReleaseHandler.java b/network/src/main/java/javasabr/mqtt/network/handler/client/MqttClientReleaseHandler.java similarity index 53% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/client/MqttClientReleaseHandler.java rename to network/src/main/java/javasabr/mqtt/network/handler/client/MqttClientReleaseHandler.java index fa9244da..cfc5db02 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/MqttClientReleaseHandler.java +++ b/network/src/main/java/javasabr/mqtt/network/handler/client/MqttClientReleaseHandler.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.handler.client; +package javasabr.mqtt.network.handler.client; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; import reactor.core.publisher.Mono; public interface MqttClientReleaseHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/package-info.java b/network/src/main/java/javasabr/mqtt/network/handler/client/package-info.java similarity index 54% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/client/package-info.java rename to network/src/main/java/javasabr/mqtt/network/handler/client/package-info.java index f335d6cb..4af32af9 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/handler/client/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.handler.client; +package javasabr.mqtt.network.handler.client; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PacketInHandler.java b/network/src/main/java/javasabr/mqtt/network/handler/packet/in/PacketInHandler.java similarity index 51% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PacketInHandler.java rename to network/src/main/java/javasabr/mqtt/network/handler/packet/in/PacketInHandler.java index 3b7ea97a..3a0b11c7 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PacketInHandler.java +++ b/network/src/main/java/javasabr/mqtt/network/handler/packet/in/PacketInHandler.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.network.handler.packet.in; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; public interface PacketInHandler { diff --git a/network/src/main/java/javasabr/mqtt/network/handler/publish/PublishInHandler.java b/network/src/main/java/javasabr/mqtt/network/handler/publish/PublishInHandler.java new file mode 100644 index 00000000..66f2698f --- /dev/null +++ b/network/src/main/java/javasabr/mqtt/network/handler/publish/PublishInHandler.java @@ -0,0 +1,12 @@ +package javasabr.mqtt.network.handler.publish; + +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; + +/** + * Interface to handle incoming publish packets. + */ +public interface PublishInHandler { + + void handle(MqttClient client, PublishInPacket packet); +} diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt311PacketOutFactory.java b/network/src/main/java/javasabr/mqtt/network/out/Mqtt311PacketOutFactory.java similarity index 80% rename from legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt311PacketOutFactory.java rename to network/src/main/java/javasabr/mqtt/network/out/Mqtt311PacketOutFactory.java index 984db040..f3435ab8 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt311PacketOutFactory.java +++ b/network/src/main/java/javasabr/mqtt/network/out/Mqtt311PacketOutFactory.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.out; +package javasabr.mqtt.network.out; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.data.type.StringPair; @@ -11,20 +11,20 @@ import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.out.ConnectAck311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.Disconnect311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.network.packet.out.PingRequest311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PingResponse311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.Publish311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishAck311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishComplete311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishOutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishReceived311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishRelease311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.SubscribeAck311OutPacket; -import javasabr.mqtt.legacy.network.packet.out.UnsubscribeAck311OutPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.out.ConnectAck311OutPacket; +import javasabr.mqtt.network.packet.out.Disconnect311OutPacket; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.network.packet.out.PingRequest311OutPacket; +import javasabr.mqtt.network.packet.out.PingResponse311OutPacket; +import javasabr.mqtt.network.packet.out.Publish311OutPacket; +import javasabr.mqtt.network.packet.out.PublishAck311OutPacket; +import javasabr.mqtt.network.packet.out.PublishComplete311OutPacket; +import javasabr.mqtt.network.packet.out.PublishOutPacket; +import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket; +import javasabr.mqtt.network.packet.out.PublishRelease311OutPacket; +import javasabr.mqtt.network.packet.out.SubscribeAck311OutPacket; +import javasabr.mqtt.network.packet.out.UnsubscribeAck311OutPacket; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.MutableArray; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt5PacketOutFactory.java b/network/src/main/java/javasabr/mqtt/network/out/Mqtt5PacketOutFactory.java similarity index 84% rename from legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt5PacketOutFactory.java rename to network/src/main/java/javasabr/mqtt/network/out/Mqtt5PacketOutFactory.java index cc17daff..6f047c6d 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/out/Mqtt5PacketOutFactory.java +++ b/network/src/main/java/javasabr/mqtt/network/out/Mqtt5PacketOutFactory.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.out; +package javasabr.mqtt.network.out; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.data.type.StringPair; @@ -11,19 +11,19 @@ import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.out.Authentication5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.ConnectAck5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.Disconnect5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.network.packet.out.Publish5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishAck5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishComplete5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishOutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishReceived5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.PublishRelease5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.SubscribeAck5OutPacket; -import javasabr.mqtt.legacy.network.packet.out.UnsubscribeAck5OutPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.out.Authentication5OutPacket; +import javasabr.mqtt.network.packet.out.ConnectAck5OutPacket; +import javasabr.mqtt.network.packet.out.Disconnect5OutPacket; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.network.packet.out.Publish5OutPacket; +import javasabr.mqtt.network.packet.out.PublishAck5OutPacket; +import javasabr.mqtt.network.packet.out.PublishComplete5OutPacket; +import javasabr.mqtt.network.packet.out.PublishOutPacket; +import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket; +import javasabr.mqtt.network.packet.out.PublishRelease5OutPacket; +import javasabr.mqtt.network.packet.out.SubscribeAck5OutPacket; +import javasabr.mqtt.network.packet.out.UnsubscribeAck5OutPacket; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.MutableArray; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactories.java b/network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactories.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactories.java rename to network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactories.java index 325ffbe7..754fa874 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactories.java +++ b/network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactories.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.out; +package javasabr.mqtt.network.out; import javasabr.mqtt.model.MqttVersion; import javasabr.rlib.common.util.ArrayUtils; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactory.java b/network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactory.java similarity index 97% rename from legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactory.java rename to network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactory.java index 1f18bbb9..65590204 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/out/MqttPacketOutFactory.java +++ b/network/src/main/java/javasabr/mqtt/network/out/MqttPacketOutFactory.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.out; +package javasabr.mqtt.network.out; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.data.type.StringPair; @@ -11,9 +11,9 @@ import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.network.packet.out.PublishOutPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.network.packet.out.PublishOutPacket; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.MutableArray; import javasabr.rlib.common.util.ArrayUtils; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/util/package-info.java b/network/src/main/java/javasabr/mqtt/network/out/package-info.java similarity index 61% rename from legacy/src/main/java/javasabr/mqtt/legacy/util/package-info.java rename to network/src/main/java/javasabr/mqtt/network/out/package-info.java index 9eb5821b..c7253a6a 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/util/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/out/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.util; +package javasabr.mqtt.network.out; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/out/package-info.java b/network/src/main/java/javasabr/mqtt/network/package-info.java similarity index 62% rename from legacy/src/main/java/javasabr/mqtt/legacy/out/package-info.java rename to network/src/main/java/javasabr/mqtt/network/package-info.java index e7c8ebbf..c45e26aa 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/out/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.out; +package javasabr.mqtt.network; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/HasPacketId.java b/network/src/main/java/javasabr/mqtt/network/packet/HasPacketId.java similarity index 72% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/HasPacketId.java rename to network/src/main/java/javasabr/mqtt/network/packet/HasPacketId.java index bf0b4537..3bac603a 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/HasPacketId.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/HasPacketId.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet; +package javasabr.mqtt.network.packet; import javasabr.rlib.network.packet.Packet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketReader.java b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java similarity index 69% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketReader.java rename to network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java index e3dc176a..be3fb5ba 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketReader.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java @@ -1,27 +1,27 @@ -package javasabr.mqtt.legacy.network.packet; - -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.in.AuthenticationInPacket; -import javasabr.mqtt.legacy.network.packet.in.ConnectAckInPacket; -import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket; -import javasabr.mqtt.legacy.network.packet.in.DisconnectInPacket; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; -import javasabr.mqtt.legacy.network.packet.in.PingRequestInPacket; -import javasabr.mqtt.legacy.network.packet.in.PingResponseInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket; -import javasabr.mqtt.legacy.network.packet.in.SubscribeAckInPacket; -import javasabr.mqtt.legacy.network.packet.in.SubscribeInPacket; -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeAckInPacket; -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeInPacket; -import javasabr.mqtt.legacy.util.MqttDataUtils; +package javasabr.mqtt.network.packet; + +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.in.AuthenticationInPacket; +import javasabr.mqtt.network.packet.in.ConnectAckInPacket; +import javasabr.mqtt.network.packet.in.ConnectInPacket; +import javasabr.mqtt.network.packet.in.DisconnectInPacket; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.packet.in.PingRequestInPacket; +import javasabr.mqtt.network.packet.in.PingResponseInPacket; +import javasabr.mqtt.network.packet.in.PublishAckInPacket; +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket; +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket; +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket; +import javasabr.mqtt.network.packet.in.SubscribeInPacket; +import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket; +import javasabr.mqtt.network.packet.in.UnsubscribeInPacket; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; import java.util.NoSuchElementException; import java.util.function.Consumer; +import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.common.util.ArrayUtils; import javasabr.rlib.common.util.NumberUtils; import javasabr.rlib.functions.ByteFunction; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketWriter.java b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java similarity index 91% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketWriter.java rename to network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java index 48ca1479..a576fcd3 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/MqttPacketWriter.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.network.packet; +package javasabr.mqtt.network.packet; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.util.MqttDataUtils; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; import java.nio.ByteBuffer; import java.nio.channels.AsynchronousSocketChannel; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; +import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.network.BufferAllocator; import javasabr.rlib.network.packet.WritablePacket; import javasabr.rlib.network.packet.impl.AbstractPacketWriter; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/PacketType.java b/network/src/main/java/javasabr/mqtt/network/packet/PacketType.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/PacketType.java rename to network/src/main/java/javasabr/mqtt/network/packet/PacketType.java index 413eebc4..9999556f 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/PacketType.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/PacketType.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet; +package javasabr.mqtt.network.packet; public enum PacketType { RESERVED, diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/AuthenticationInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/AuthenticationInPacket.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/AuthenticationInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/AuthenticationInPacket.java index 28d7f5a5..29ae02d0 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/AuthenticationInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/AuthenticationInPacket.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.AuthenticateReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectAckInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/ConnectAckInPacket.java similarity index 99% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectAckInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/ConnectAckInPacket.java index d0828147..3734c3f5 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectAckInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/ConnectAckInPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.MqttVersion; @@ -6,8 +6,8 @@ import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.data.type.StringPair; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/ConnectInPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/ConnectInPacket.java index f604df29..e8901f54 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/ConnectInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/ConnectInPacket.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; -import javasabr.mqtt.legacy.exception.ConnectionRejectException; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; +import javasabr.mqtt.model.exception.ConnectionRejectException; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/DisconnectInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/DisconnectInPacket.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/DisconnectInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/DisconnectInPacket.java index 66a29435..e42f1efc 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/DisconnectInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/DisconnectInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.DisconnectReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/MqttReadablePacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/MqttReadablePacket.java similarity index 95% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/MqttReadablePacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/MqttReadablePacket.java index c82213b0..aad49d05 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/MqttReadablePacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/MqttReadablePacket.java @@ -1,15 +1,14 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; -import javasabr.mqtt.legacy.exception.ConnectionRejectException; -import javasabr.mqtt.legacy.exception.MalformedPacketMqttException; -import javasabr.mqtt.legacy.exception.MqttException; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; +import javasabr.mqtt.model.exception.ConnectionRejectException; +import javasabr.mqtt.model.exception.MalformedPacketMqttException; +import javasabr.mqtt.model.exception.MqttException; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; +import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.base.utils.DebugUtils; -import javasabr.mqtt.legacy.util.MqttDataUtils; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharsetDecoder; @@ -17,6 +16,7 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Set; +import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.collections.array.MutableArray; import javasabr.rlib.common.util.ArrayUtils; import javasabr.rlib.network.packet.impl.AbstractReadablePacket; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingRequestInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PingRequestInPacket.java similarity index 75% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingRequestInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PingRequestInPacket.java index 0d7ea523..b30be46f 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingRequestInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PingRequestInPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; /** * PING request. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingResponseInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PingResponseInPacket.java similarity index 75% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingResponseInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PingResponseInPacket.java index 0c49c444..1da4fa23 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PingResponseInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PingResponseInPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; /** * PING response. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishAckInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishAckInPacket.java similarity index 93% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishAckInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PublishAckInPacket.java index 4823dc52..81b46b83 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishAckInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishAckInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.PublishAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishCompleteInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishCompleteInPacket.java similarity index 94% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishCompleteInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PublishCompleteInPacket.java index 2a6e817e..d4053685 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishCompleteInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishCompleteInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishInPacket.java similarity index 99% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PublishInPacket.java index c4884d63..5fa74710 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishInPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import static javasabr.mqtt.model.utils.TopicUtils.EMPTY_TOPIC_NAME; import static javasabr.mqtt.model.utils.TopicUtils.buildTopicName; @@ -7,8 +7,8 @@ import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.topic.TopicName; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReceivedInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishReceivedInPacket.java similarity index 94% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReceivedInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PublishReceivedInPacket.java index 42d3aadc..01362ab1 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReceivedInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishReceivedInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReleaseInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishReleaseInPacket.java similarity index 94% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReleaseInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/PublishReleaseInPacket.java index e9feccd9..ce252242 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/PublishReleaseInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/PublishReleaseInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeAckInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeAckInPacket.java similarity index 95% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeAckInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeAckInPacket.java index 04e11136..e2be7231 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeAckInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeAckInPacket.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeInPacket.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeInPacket.java index b2b633c3..ac9bc0ba 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/SubscribeInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/SubscribeInPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter; @@ -8,8 +8,8 @@ import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.SubscribeRetainHandling; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import java.util.EnumSet; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeAckInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeAckInPacket.java similarity index 95% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeAckInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeAckInPacket.java index f3ab147e..6a65ce5f 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeAckInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeAckInPacket.java @@ -1,10 +1,10 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeInPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeInPacket.java similarity index 91% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeInPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeInPacket.java index b3d415c9..2d18cf2e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/in/UnsubscribeInPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/UnsubscribeInPacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.in; +package javasabr.mqtt.network.packet.in; import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.topic.TopicFilter; -import javasabr.mqtt.legacy.network.MqttConnection; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/exception/package-info.java b/network/src/main/java/javasabr/mqtt/network/packet/in/package-info.java similarity index 57% rename from legacy/src/main/java/javasabr/mqtt/legacy/exception/package-info.java rename to network/src/main/java/javasabr/mqtt/network/packet/in/package-info.java index ef0e5fce..54bf77e8 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/exception/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/in/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.exception; +package javasabr.mqtt.network.packet.in; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Authentication5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Authentication5OutPacket.java similarity index 97% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Authentication5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Authentication5OutPacket.java index 01add7b7..67562ebe 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Authentication5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Authentication5OutPacket.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; import javasabr.mqtt.model.reason.code.AuthenticateReasonCode; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Connect311OutPacket.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Connect311OutPacket.java index 1f53848f..57f46dd9 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Connect311OutPacket.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.QoS; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import javasabr.rlib.common.util.ArrayUtils; import javasabr.rlib.common.util.StringUtils; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Connect5OutPacket.java similarity index 99% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Connect5OutPacket.java index 006cecd5..15d0bf72 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Connect5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Connect5OutPacket.java @@ -1,14 +1,14 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.data.type.StringPair; -import javasabr.mqtt.legacy.util.MqttDataUtils; import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Set; +import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.collections.array.Array; import javasabr.rlib.common.util.ArrayUtils; import javasabr.rlib.common.util.StringUtils; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck311OutPacket.java similarity index 94% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck311OutPacket.java index 34412b4c..bfa41235 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck311OutPacket.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck5OutPacket.java similarity index 99% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck5OutPacket.java index 4e608e3d..2d094f0d 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/ConnectAck5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/ConnectAck5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.PacketProperty; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect311OutPacket.java similarity index 76% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect311OutPacket.java index 868adf16..855221ae 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; /** * Disconnect notification. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect5OutPacket.java index c610543b..b98ec2bf 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Disconnect5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Disconnect5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.PacketProperty; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/MqttWritablePacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/MqttWritablePacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/MqttWritablePacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/MqttWritablePacket.java index 9d8cecb8..da551548 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/MqttWritablePacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/MqttWritablePacket.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; import javasabr.mqtt.base.utils.DebugUtils; -import javasabr.mqtt.legacy.util.MqttDataUtils; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.collections.array.Array; import javasabr.rlib.common.util.NumberUtils; import javasabr.rlib.network.packet.impl.AbstractWritablePacket; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingRequest311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PingRequest311OutPacket.java similarity index 71% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingRequest311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PingRequest311OutPacket.java index 7c1ac762..c8af6b19 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingRequest311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PingRequest311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; /** * PING request. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingResponse311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PingResponse311OutPacket.java similarity index 71% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingResponse311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PingResponse311OutPacket.java index 83d1efdd..34761038 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PingResponse311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PingResponse311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; /** * PING response. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Publish311OutPacket.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Publish311OutPacket.java index c6fc6760..83df2bb7 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Publish311OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.QoS; import javasabr.mqtt.base.utils.DebugUtils; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Publish5OutPacket.java similarity index 99% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Publish5OutPacket.java index ff769d4e..b065718f 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Publish5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Publish5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.PacketProperty; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck311OutPacket.java similarity index 87% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck311OutPacket.java index a2fb5b98..5b5122c9 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck5OutPacket.java index 20ba1d2a..d8018762 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishAck5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishAck5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete311OutPacket.java similarity index 86% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete311OutPacket.java index 185714e9..0cb1923b 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete5OutPacket.java index b966c56b..2f50b113 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishComplete5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishComplete5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishOutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishOutPacket.java similarity index 70% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishOutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishOutPacket.java index 4e0e5800..872613d0 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishOutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishOutPacket.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.PacketType; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived311OutPacket.java similarity index 86% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived311OutPacket.java index bb66d34f..37819ae3 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived5OutPacket.java index 53bb10a6..d4773b1b 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishReceived5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishReceived5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease311OutPacket.java similarity index 87% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease311OutPacket.java index 60fad3fb..df92b5f8 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease5OutPacket.java index 18924933..2ac17087 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/PublishRelease5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/PublishRelease5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe311OutPacket.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe311OutPacket.java index b19dea1c..5595c593 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe311OutPacket.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import javasabr.rlib.collections.array.Array; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe5OutPacket.java index c1c43d90..c517ab60 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/Subscribe5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/Subscribe5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.PacketProperty; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck311OutPacket.java similarity index 93% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck311OutPacket.java index 8ff1df8c..dc80f280 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck311OutPacket.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import javasabr.mqtt.base.utils.DebugUtils; import java.nio.ByteBuffer; import javasabr.rlib.collections.array.Array; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck5OutPacket.java index 4d489262..daa4be01 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/SubscribeAck5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/SubscribeAck5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck311OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck311OutPacket.java similarity index 86% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck311OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck311OutPacket.java index c405adeb..562dfb97 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck311OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck311OutPacket.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; -import javasabr.mqtt.legacy.network.packet.PacketType; +import javasabr.mqtt.network.packet.PacketType; import java.nio.ByteBuffer; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck5OutPacket.java b/network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck5OutPacket.java similarity index 98% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck5OutPacket.java rename to network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck5OutPacket.java index ec5d4e55..e10f1774 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/packet/out/UnsubscribeAck5OutPacket.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/UnsubscribeAck5OutPacket.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.network.packet.out; +package javasabr.mqtt.network.packet.out; import javasabr.mqtt.model.PacketProperty; import javasabr.mqtt.model.data.type.StringPair; diff --git a/network/src/main/java/javasabr/mqtt/network/packet/out/package-info.java b/network/src/main/java/javasabr/mqtt/network/packet/out/package-info.java new file mode 100644 index 00000000..aa1207b6 --- /dev/null +++ b/network/src/main/java/javasabr/mqtt/network/packet/out/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.network.packet.out; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/package-info.java b/network/src/main/java/javasabr/mqtt/network/packet/package-info.java similarity index 59% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/package-info.java rename to network/src/main/java/javasabr/mqtt/network/packet/package-info.java index 98fb2425..78381ac0 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/package-info.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.network.packet; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/util/MqttDataUtils.java b/network/src/main/java/javasabr/mqtt/network/utils/MqttDataUtils.java similarity index 97% rename from legacy/src/main/java/javasabr/mqtt/legacy/util/MqttDataUtils.java rename to network/src/main/java/javasabr/mqtt/network/utils/MqttDataUtils.java index cfe42c1a..7d70ddb5 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/util/MqttDataUtils.java +++ b/network/src/main/java/javasabr/mqtt/network/utils/MqttDataUtils.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.util; +package javasabr.mqtt.network.utils; import java.nio.ByteBuffer; diff --git a/service/build.gradle b/service/build.gradle new file mode 100644 index 00000000..8be50fb4 --- /dev/null +++ b/service/build.gradle @@ -0,0 +1,8 @@ +apply plugin: "java-library" +apply from: "$rootDir/gradle/configure-java.gradle" + +dependencies { + api projects.network + + testImplementation projects.testSupport +} \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/AuthenticationService.java b/service/src/main/java/javasabr/mqtt/service/AuthenticationService.java similarity index 78% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/AuthenticationService.java rename to service/src/main/java/javasabr/mqtt/service/AuthenticationService.java index 0c56e81e..925d27dd 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/AuthenticationService.java +++ b/service/src/main/java/javasabr/mqtt/service/AuthenticationService.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.service; import reactor.core.publisher.Mono; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/ClientIdRegistry.java b/service/src/main/java/javasabr/mqtt/service/ClientIdRegistry.java similarity index 85% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/ClientIdRegistry.java rename to service/src/main/java/javasabr/mqtt/service/ClientIdRegistry.java index 7e695ac3..adf2ab78 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/ClientIdRegistry.java +++ b/service/src/main/java/javasabr/mqtt/service/ClientIdRegistry.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.service; import reactor.core.publisher.Mono; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/CredentialSource.java b/service/src/main/java/javasabr/mqtt/service/CredentialSource.java similarity index 81% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/CredentialSource.java rename to service/src/main/java/javasabr/mqtt/service/CredentialSource.java index 4b6853b9..881361cc 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/CredentialSource.java +++ b/service/src/main/java/javasabr/mqtt/service/CredentialSource.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.service; import reactor.core.publisher.Mono; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/MqttSessionService.java b/service/src/main/java/javasabr/mqtt/service/MqttSessionService.java similarity index 74% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/MqttSessionService.java rename to service/src/main/java/javasabr/mqtt/service/MqttSessionService.java index f472752a..ffac55ec 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/MqttSessionService.java +++ b/service/src/main/java/javasabr/mqtt/service/MqttSessionService.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.service; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import reactor.core.publisher.Mono; public interface MqttSessionService { diff --git a/service/src/main/java/javasabr/mqtt/service/PublishingService.java b/service/src/main/java/javasabr/mqtt/service/PublishingService.java new file mode 100644 index 00000000..0fe6a1f9 --- /dev/null +++ b/service/src/main/java/javasabr/mqtt/service/PublishingService.java @@ -0,0 +1,9 @@ +package javasabr.mqtt.service; + +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; + +public interface PublishingService { + + void publish(MqttClient client, PublishInPacket publish); +} diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/SubscriptionService.java b/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/SubscriptionService.java rename to service/src/main/java/javasabr/mqtt/service/SubscriptionService.java index 93d88027..571f94ea 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/SubscriptionService.java +++ b/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java @@ -1,14 +1,14 @@ -package javasabr.mqtt.legacy.service; +package javasabr.mqtt.service; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.subscriber.SingleSubscriber; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; import javasabr.mqtt.model.topic.TopicFilter; import javasabr.mqtt.model.topic.TopicName; -import javasabr.mqtt.legacy.network.MqttClient; +import javasabr.mqtt.network.MqttClient; import java.util.function.BiFunction; import javasabr.rlib.collections.array.Array; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/AbstractMqttClientReleaseHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java similarity index 69% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/client/AbstractMqttClientReleaseHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java index 38c07ff8..d70b8754 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/AbstractMqttClientReleaseHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java @@ -1,16 +1,17 @@ -package javasabr.mqtt.legacy.handler.client; - -import javasabr.mqtt.legacy.network.client.AbstractMqttClient; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.service.ClientIdRegistry; -import javasabr.mqtt.legacy.service.MqttSessionService; -import javasabr.mqtt.legacy.service.SubscriptionService; +package javasabr.mqtt.service.handler.client; + +import javasabr.mqtt.network.client.AbstractMqttClient; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.service.ClientIdRegistry; +import javasabr.mqtt.service.MqttSessionService; +import javasabr.mqtt.service.SubscriptionService; +import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler; import javasabr.rlib.common.util.StringUtils; +import lombok.CustomLog; import lombok.RequiredArgsConstructor; -import lombok.extern.log4j.Log4j2; import reactor.core.publisher.Mono; -@Log4j2 +@CustomLog @RequiredArgsConstructor public abstract class AbstractMqttClientReleaseHandler implements MqttClientReleaseHandler { @@ -23,7 +24,7 @@ public abstract class AbstractMqttClientReleaseHandler release(UnsafeMqttClient client) { var clientId = client.getClientId(); //noinspection unchecked - return releaseImpl((T) client).doOnNext(aVoid -> log.info("Client {} was released", clientId)); + return releaseImpl((T) client).doOnNext(aVoid -> log.info(clientId, "Client:[%s] was released"::formatted)); } protected Mono releaseImpl(T client) { @@ -32,7 +33,7 @@ protected Mono releaseImpl(T client) { client.setClientId(StringUtils.EMPTY); if (StringUtils.isEmpty(clientId)) { - log.warn("This client {} is already released or rejected", client); + log.warning(client, "This client:[%s] is already released or rejected"::formatted); return Mono.empty(); } diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/DefaultMqttClientReleaseHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/client/DefaultMqttClientReleaseHandler.java similarity index 56% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/client/DefaultMqttClientReleaseHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/client/DefaultMqttClientReleaseHandler.java index f552a335..d59b0dee 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/client/DefaultMqttClientReleaseHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/client/DefaultMqttClientReleaseHandler.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.handler.client; +package javasabr.mqtt.service.handler.client; -import javasabr.mqtt.legacy.network.client.ExternalMqttClient; -import javasabr.mqtt.legacy.service.ClientIdRegistry; -import javasabr.mqtt.legacy.service.MqttSessionService; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.client.ExternalMqttClient; +import javasabr.mqtt.service.ClientIdRegistry; +import javasabr.mqtt.service.MqttSessionService; +import javasabr.mqtt.service.SubscriptionService; public class DefaultMqttClientReleaseHandler extends AbstractMqttClientReleaseHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/package-info.java b/service/src/main/java/javasabr/mqtt/service/handler/client/package-info.java similarity index 54% rename from legacy/src/main/java/javasabr/mqtt/legacy/network/client/package-info.java rename to service/src/main/java/javasabr/mqtt/service/handler/client/package-info.java index 3de6cd3f..58b723d7 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/network/client/package-info.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/client/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.network.client; +package javasabr.mqtt.service.handler.client; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/AbstractPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/AbstractPacketHandler.java similarity index 61% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/AbstractPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/AbstractPacketHandler.java index 7c360de1..53c6c93e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/AbstractPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/AbstractPacketHandler.java @@ -1,7 +1,8 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.handler.packet.in.PacketInHandler; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; public abstract class AbstractPacketHandler implements PacketInHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/ConnectInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java similarity index 90% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/ConnectInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java index 214bd34a..33de33dc 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/ConnectInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; import static javasabr.mqtt.model.MqttProperties.MAXIMUM_PACKET_SIZE_UNDEFINED; import static javasabr.mqtt.model.MqttProperties.RECEIVE_MAXIMUM_UNDEFINED; @@ -9,25 +9,26 @@ import static javasabr.mqtt.model.MqttProperties.TOPIC_ALIAS_MAXIMUM_UNDEFINED; import static javasabr.mqtt.model.reason.code.ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD; import static javasabr.mqtt.model.reason.code.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID; -import static javasabr.mqtt.legacy.util.ReactorUtils.ifTrue; +import static javasabr.mqtt.base.utils.ReactorUtils.ifTrue; -import javasabr.mqtt.legacy.exception.ConnectionRejectException; -import javasabr.mqtt.legacy.exception.MalformedPacketMqttException; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.model.exception.ConnectionRejectException; +import javasabr.mqtt.model.exception.MalformedPacketMqttException; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket; -import javasabr.mqtt.legacy.service.AuthenticationService; -import javasabr.mqtt.legacy.service.ClientIdRegistry; -import javasabr.mqtt.legacy.service.MqttSessionService; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.ConnectInPacket; +import javasabr.mqtt.service.AuthenticationService; +import javasabr.mqtt.service.ClientIdRegistry; +import javasabr.mqtt.service.MqttSessionService; +import javasabr.mqtt.service.SubscriptionService; import javasabr.rlib.common.util.StringUtils; +import lombok.CustomLog; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import reactor.core.publisher.Mono; -@Log4j2 +@CustomLog @RequiredArgsConstructor public class ConnectInPacketHandler extends AbstractPacketHandler { @@ -170,7 +171,7 @@ private Mono onConnected( private boolean onSentConnAck(UnsafeMqttClient client, MqttSession session, boolean result) { if (!result) { - log.warn("Was issue with sending conn ack packet to client {}", client.getClientId()); + log.warning(client.getClientId(), "Was issue with sending conn ack packet to client:[%s]"::formatted); return false; } diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/DisconnetInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/DisconnetInPacketHandler.java similarity index 56% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/DisconnetInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/DisconnetInPacketHandler.java index b29b82f0..173bb274 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/DisconnetInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/DisconnetInPacketHandler.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; import javasabr.mqtt.model.reason.code.DisconnectReasonCode; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.DisconnectInPacket; -import lombok.extern.log4j.Log4j2; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.DisconnectInPacket; +import lombok.CustomLog; -@Log4j2 +@CustomLog public class DisconnetInPacketHandler extends AbstractPacketHandler { @Override @@ -14,9 +14,9 @@ protected void handleImpl(UnsafeMqttClient client, DisconnectInPacket packet) { var reasonCode = packet.getReasonCode(); if (reasonCode == DisconnectReasonCode.NORMAL_DISCONNECTION) { - log.info("Disconnect client {}", client); + log.info(client, "Disconnect client:[%s]"::formatted); } else { - log.error("Disconnect client {} by error reason {}", client, reasonCode); + log.error("Disconnect client:[%s] by error reason:[%s]".formatted(client, reasonCode)); } client diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PendingOutResponseInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java similarity index 64% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PendingOutResponseInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java index ea92381b..f5d85331 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PendingOutResponseInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.MqttReadablePacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishAckInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishAckInPacketHandler.java similarity index 59% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishAckInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PublishAckInPacketHandler.java index daa1dbb7..b2d1c3bc 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishAckInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishAckInPacketHandler.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket; +import javasabr.mqtt.network.packet.in.PublishAckInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishCompleteInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishCompleteInPacketHandler.java similarity index 60% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishCompleteInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PublishCompleteInPacketHandler.java index 5af6fdfd..55a85d9e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishCompleteInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishCompleteInPacketHandler.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket; +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishInPacketHandler.java similarity index 61% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PublishInPacketHandler.java index f27ba206..1894225d 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishInPacketHandler.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.service.PublishingService; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.service.PublishingService; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReceiveInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishReceiveInPacketHandler.java similarity index 60% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReceiveInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PublishReceiveInPacketHandler.java index b29ce8cf..d6cae073 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReceiveInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishReceiveInPacketHandler.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket; +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReleaseInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishReleaseInPacketHandler.java similarity index 69% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReleaseInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/PublishReleaseInPacketHandler.java index 5508da93..18400df1 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PublishReleaseInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PublishReleaseInPacketHandler.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/SubscribeInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java similarity index 85% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/SubscribeInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java index 0af71989..e70da362 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/SubscribeInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; import static javasabr.mqtt.model.reason.code.SubscribeAckReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED; import static javasabr.mqtt.model.reason.code.SubscribeAckReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED; @@ -6,10 +6,10 @@ import javasabr.mqtt.model.reason.code.DisconnectReasonCode; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.SubscribeInPacket; -import javasabr.mqtt.legacy.network.packet.out.MqttWritablePacket; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.SubscribeInPacket; +import javasabr.mqtt.network.packet.out.MqttWritablePacket; +import javasabr.mqtt.service.SubscriptionService; import java.util.Set; import javasabr.rlib.collections.array.Array; import lombok.RequiredArgsConstructor; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/UnsubscribeInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/UnsubscribeInPacketHandler.java similarity index 69% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/UnsubscribeInPacketHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/in/UnsubscribeInPacketHandler.java index a7ebb04f..ea98e487 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/UnsubscribeInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/UnsubscribeInPacketHandler.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.in; -import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.legacy.network.packet.in.UnsubscribeInPacket; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.packet.in.UnsubscribeInPacket; +import javasabr.mqtt.service.SubscriptionService; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/service/src/main/java/javasabr/mqtt/service/handler/in/package-info.java b/service/src/main/java/javasabr/mqtt/service/handler/in/package-info.java new file mode 100644 index 00000000..c8c50cbb --- /dev/null +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.service.handler.in; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/AbstractPublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java similarity index 75% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/AbstractPublishInHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java index d450d233..486aea08 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/AbstractPublishInHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java @@ -1,12 +1,13 @@ -package javasabr.mqtt.legacy.handler.publish.in; +package javasabr.mqtt.service.handler.publish.in; -import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.SingleSubscriber; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.handler.publish.PublishInHandler; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.service.SubscriptionService; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos0PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos0PublishInHandler.java similarity index 58% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos0PublishInHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos0PublishInHandler.java index bc3c9dba..71a291ec 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos0PublishInHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos0PublishInHandler.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.handler.publish.in; +package javasabr.mqtt.service.handler.publish.in; -import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; +import javasabr.mqtt.service.SubscriptionService; public class Qos0PublishInHandler extends AbstractPublishInHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos1PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos1PublishInHandler.java similarity index 80% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos1PublishInHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos1PublishInHandler.java index 069670c0..beb5f2d9 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos1PublishInHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos1PublishInHandler.java @@ -1,11 +1,11 @@ -package javasabr.mqtt.legacy.handler.publish.in; +package javasabr.mqtt.service.handler.publish.in; -import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.reason.code.PublishAckReasonCode; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.service.SubscriptionService; public class Qos1PublishInHandler extends AbstractPublishInHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos2PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos2PublishInHandler.java similarity index 82% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos2PublishInHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos2PublishInHandler.java index 61ebb67f..af65e33c 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/in/Qos2PublishInHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos2PublishInHandler.java @@ -1,15 +1,15 @@ -package javasabr.mqtt.legacy.handler.publish.in; +package javasabr.mqtt.service.handler.publish.in; -import javasabr.mqtt.legacy.handler.publish.out.PublishOutHandler; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode; import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishReleaseInPacket; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket; +import javasabr.mqtt.service.SubscriptionService; public class Qos2PublishInHandler extends AbstractPublishInHandler implements MqttSession.PendingPacketHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/package-info.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/package-info.java similarity index 52% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/package-info.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/in/package-info.java index 27719391..cb5838d9 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/package-info.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.handler.packet.in; +package javasabr.mqtt.service.handler.publish.in; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/AbstractPublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java similarity index 87% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/AbstractPublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java index 86c0af0b..1f24bc91 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/AbstractPublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.MqttProperties; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.SingleSubscriber; import javasabr.mqtt.model.subscriber.Subscriber; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; abstract class AbstractPublishOutHandler implements PublishOutHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PersistentPublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java similarity index 79% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PersistentPublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java index c278d97f..a850556f 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PersistentPublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java @@ -1,10 +1,10 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.subscriber.Subscriber; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; public abstract class PersistentPublishOutHandler extends AbstractPublishOutHandler implements MqttSession.PendingPacketHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PublishOutHandler.java similarity index 70% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/PublishOutHandler.java index 4ababf13..ad0ae7cf 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PublishOutHandler.java @@ -1,8 +1,8 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.subscriber.SingleSubscriber; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.packet.in.PublishInPacket; /** * Interface to handle outgoing publish packets. diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos0PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java similarity index 72% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos0PublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java index 2a7cb118..326cc284 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos0PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java @@ -1,13 +1,13 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import static javasabr.mqtt.model.ActionResult.SUCCESS; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.Subscriber; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.in.PublishInPacket; public class Qos0PublishOutHandler extends AbstractPublishOutHandler { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos1PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java similarity index 71% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos1PublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java index 6cd039ee..8734070e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos1PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import javasabr.mqtt.model.QoS; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.PublishAckInPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.PublishAckInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos2PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos2PublishOutHandler.java similarity index 73% rename from legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos2PublishOutHandler.java rename to service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos2PublishOutHandler.java index 2cabd94b..a864164c 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/handler/publish/out/Qos2PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos2PublishOutHandler.java @@ -1,12 +1,12 @@ -package javasabr.mqtt.legacy.handler.publish.out; +package javasabr.mqtt.service.handler.publish.out; import static javasabr.mqtt.model.reason.code.PublishReleaseReasonCode.SUCCESS; import javasabr.mqtt.model.QoS; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.HasPacketId; -import javasabr.mqtt.legacy.network.packet.in.PublishCompleteInPacket; -import javasabr.mqtt.legacy.network.packet.in.PublishReceivedInPacket; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.packet.HasPacketId; +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket; +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/package-info.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/package-info.java new file mode 100644 index 00000000..ed8abf71 --- /dev/null +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.service.handler.publish.out; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/AbstractCredentialSource.java b/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/AbstractCredentialSource.java rename to service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java index eca3bbcf..ef3698e3 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/AbstractCredentialSource.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.service.CredentialSource; +import javasabr.mqtt.service.CredentialSource; import java.util.Arrays; import javasabr.rlib.collections.dictionary.DictionaryFactory; import javasabr.rlib.collections.dictionary.LockableRefToRefDictionary; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/DefaultPublishingService.java b/service/src/main/java/javasabr/mqtt/service/impl/DefaultPublishingService.java similarity index 59% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/DefaultPublishingService.java rename to service/src/main/java/javasabr/mqtt/service/impl/DefaultPublishingService.java index 8fbf1451..33c061fa 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/DefaultPublishingService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/DefaultPublishingService.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.handler.publish.in.PublishInHandler; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.network.packet.in.PublishInPacket; -import javasabr.mqtt.legacy.service.PublishingService; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.handler.publish.PublishInHandler; +import javasabr.mqtt.network.packet.in.PublishInPacket; +import javasabr.mqtt.service.PublishingService; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/FileCredentialsSource.java b/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java similarity index 92% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/FileCredentialsSource.java rename to service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java index e303cc6d..1e6f4cfa 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/FileCredentialsSource.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.exception.CredentialsSourceException; +import javasabr.mqtt.model.exception.CredentialsSourceException; import java.io.FileInputStream; import java.io.IOException; import java.net.URL; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryClientIdRegistry.java b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java similarity index 96% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryClientIdRegistry.java rename to service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java index 539ecbdc..17bc4974 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryClientIdRegistry.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java @@ -1,6 +1,6 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.service.ClientIdRegistry; +import javasabr.mqtt.service.ClientIdRegistry; import java.util.BitSet; import java.util.UUID; import javasabr.rlib.collections.dictionary.Dictionary; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryMqttSessionService.java b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java similarity index 84% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryMqttSessionService.java rename to service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java index ca38ca31..841c878e 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/InMemoryMqttSessionService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java @@ -1,9 +1,9 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.network.MqttSession; -import javasabr.mqtt.legacy.network.MqttSession.UnsafeMqttSession; -import javasabr.mqtt.legacy.network.DefaultMqttSession; -import javasabr.mqtt.legacy.service.MqttSessionService; +import javasabr.mqtt.network.MqttSession; +import javasabr.mqtt.network.MqttSession.UnsafeMqttSession; +import javasabr.mqtt.network.DefaultMqttSession; +import javasabr.mqtt.service.MqttSessionService; import java.io.Closeable; import javasabr.rlib.collections.array.ArrayFactory; import javasabr.rlib.collections.array.MutableArray; @@ -13,11 +13,11 @@ import javasabr.rlib.collections.dictionary.MutableRefToRefDictionary; import javasabr.rlib.common.util.ThreadUtils; import lombok.AccessLevel; +import lombok.CustomLog; import lombok.experimental.FieldDefaults; -import lombok.extern.log4j.Log4j2; import reactor.core.publisher.Mono; -@Log4j2 +@CustomLog @FieldDefaults(level = AccessLevel.PRIVATE) public class InMemoryMqttSessionService implements MqttSessionService, Closeable { @@ -45,9 +45,9 @@ public Mono restore(String clientId) { if (session != null) { session.onRestored(); - log.debug("Restored session for client:[{}]", clientId); + log.debug(clientId, "Restored session for client:[%s]"::formatted); } else { - log.debug("No stored session for client:[{}]", clientId); + log.debug(clientId, "No stored session for client:[%s]"::formatted); } return Mono.justOrEmpty(session); @@ -61,10 +61,10 @@ public Mono create(String clientId) { .getInWriteLock(clientId, MutableRefToRefDictionary::remove); if (session != null) { - log.debug("Removed old session for client:[{}]", clientId); + log.debug(clientId, "Removed old session for client:[%s]"::formatted); } - log.debug("Created new session for client:[{}]", clientId); + log.debug(clientId, "Created new session for client:[%s]"::formatted); return Mono.just(new DefaultMqttSession(clientId)); } @@ -80,7 +80,7 @@ public Mono store(String clientId, MqttSession session, long expiryInte .operations() .inWriteLock(clientId, unsafe, MutableRefToRefDictionary::put); - log.debug("Stored session for client {}", clientId); + log.debug(clientId, "Stored session for client:[%s]"::formatted); return Mono.just(Boolean.TRUE); } @@ -120,7 +120,7 @@ private static void removeExpiredSessions( } UnsafeMqttSession removed = sessions.remove(session.getClientId()); - log.debug("Removed expired session for client:[{}]", session.getClientId()); + log.debug(session.getClientId(), "Removed expired session for client:[%]"::formatted); // if we already have new session under the same client id if (removed != null && removed != session) { diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleAuthenticationService.java b/service/src/main/java/javasabr/mqtt/service/impl/SimpleAuthenticationService.java similarity index 77% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleAuthenticationService.java rename to service/src/main/java/javasabr/mqtt/service/impl/SimpleAuthenticationService.java index c06e5c4c..6f18b39b 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleAuthenticationService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/SimpleAuthenticationService.java @@ -1,7 +1,7 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; -import javasabr.mqtt.legacy.service.AuthenticationService; -import javasabr.mqtt.legacy.service.CredentialSource; +import javasabr.mqtt.service.AuthenticationService; +import javasabr.mqtt.service.CredentialSource; import lombok.RequiredArgsConstructor; import reactor.core.publisher.Mono; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleSubscriptionService.java b/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java similarity index 95% rename from legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleSubscriptionService.java rename to service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java index a284a88e..22bab583 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/service/impl/SimpleSubscriptionService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java @@ -1,4 +1,4 @@ -package javasabr.mqtt.legacy.service.impl; +package javasabr.mqtt.service.impl; import static javasabr.mqtt.model.ActionResult.EMPTY; import static javasabr.mqtt.model.ActionResult.FAILED; @@ -13,7 +13,7 @@ import javasabr.mqtt.model.MqttConnectionConfig; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.legacy.network.MqttSession; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.subscriber.SingleSubscriber; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; @@ -21,8 +21,8 @@ import javasabr.mqtt.model.topic.TopicFilter; import javasabr.mqtt.model.topic.TopicName; import javasabr.mqtt.model.topic.TopicSubscribers; -import javasabr.mqtt.legacy.network.MqttClient; -import javasabr.mqtt.legacy.service.SubscriptionService; +import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.service.SubscriptionService; import java.util.function.BiFunction; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.ArrayCollectors; diff --git a/legacy/src/main/java/javasabr/mqtt/legacy/config/package-info.java b/service/src/main/java/javasabr/mqtt/service/impl/package-info.java similarity index 60% rename from legacy/src/main/java/javasabr/mqtt/legacy/config/package-info.java rename to service/src/main/java/javasabr/mqtt/service/impl/package-info.java index e6af1260..a4c1e433 100644 --- a/legacy/src/main/java/javasabr/mqtt/legacy/config/package-info.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/package-info.java @@ -1,4 +1,4 @@ @NullMarked -package javasabr.mqtt.legacy.config; +package javasabr.mqtt.service.impl; import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/service/src/main/java/javasabr/mqtt/service/package-info.java b/service/src/main/java/javasabr/mqtt/service/package-info.java new file mode 100644 index 00000000..c05a95ba --- /dev/null +++ b/service/src/main/java/javasabr/mqtt/service/package-info.java @@ -0,0 +1,4 @@ +@NullMarked +package javasabr.mqtt.service; + +import org.jspecify.annotations.NullMarked; \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0887aaa3..78ddf787 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,6 @@ rootProject.name = 'MQTT-Broker' include(":base") include(":model") include(":network") +include(":service") include(":application") -include(":legacy") include(":test-support") \ No newline at end of file diff --git a/src/test/resources/credentials-test b/src/test/resources/credentials-test deleted file mode 100644 index 9f363386..00000000 --- a/src/test/resources/credentials-test +++ /dev/null @@ -1,2 +0,0 @@ -user=password -user1=password