From 270093fc14186e89f518adefe9b1dfbf9b3906ae Mon Sep 17 00:00:00 2001 From: javasabr Date: Sun, 19 Oct 2025 19:59:19 +0200 Subject: [PATCH 1/2] update gradle configuration --- application/build.gradle | 9 ++++----- base/build.gradle | 6 ++++-- buildSrc/build.gradle | 8 ++++++++ buildSrc/settings.gradle | 3 +++ .../src/main/groovy}/configure-java.gradle | 10 ++++++++++ model/build.gradle | 6 ++++-- network/build.gradle | 6 ++++-- service/build.gradle | 6 ++++-- 8 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/settings.gradle rename {gradle => buildSrc/src/main/groovy}/configure-java.gradle (85%) diff --git a/application/build.gradle b/application/build.gradle index cd5d0d79..4c8d02dd 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,11 +1,10 @@ plugins { - id "java" - id "groovy" - id "org.springframework.boot" + id("java-library") + id("configure-java") + id("groovy") + id("org.springframework.boot") } -apply from: "$rootDir/gradle/configure-java.gradle" - dependencies { implementation projects.service implementation libs.rlib.logger.slf4j diff --git a/base/build.gradle b/base/build.gradle index e9816262..0be7c8c9 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -1,5 +1,7 @@ -apply plugin: "java-library" -apply from: "$rootDir/gradle/configure-java.gradle" +plugins { + id("java-library") + id("configure-java") +} dependencies { api libs.gson diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 00000000..3a85dcfe --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,8 @@ +plugins { + id 'groovy-gradle-plugin' +} + +repositories { + mavenCentral() + gradlePluginPortal() +} \ No newline at end of file diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle new file mode 100644 index 00000000..f74f1fed --- /dev/null +++ b/buildSrc/settings.gradle @@ -0,0 +1,3 @@ +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +rootProject.name = 'build-configuration' \ No newline at end of file diff --git a/gradle/configure-java.gradle b/buildSrc/src/main/groovy/configure-java.gradle similarity index 85% rename from gradle/configure-java.gradle rename to buildSrc/src/main/groovy/configure-java.gradle index bec7b36c..027d5fdc 100644 --- a/gradle/configure-java.gradle +++ b/buildSrc/src/main/groovy/configure-java.gradle @@ -1,5 +1,15 @@ import org.apache.tools.ant.filters.ReplaceTokens +plugins { + id("java") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } +} + dependencies { compileOnly libs.jspecify compileOnly libs.lombok diff --git a/model/build.gradle b/model/build.gradle index a46c7f27..6be210a1 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -1,5 +1,7 @@ -apply plugin: "java-library" -apply from: "$rootDir/gradle/configure-java.gradle" +plugins { + id("java-library") + id("configure-java") +} dependencies { api projects.base diff --git a/network/build.gradle b/network/build.gradle index fd701670..c0e178c5 100644 --- a/network/build.gradle +++ b/network/build.gradle @@ -1,5 +1,7 @@ -apply plugin: "java-library" -apply from: "$rootDir/gradle/configure-java.gradle" +plugins { + id("java-library") + id("configure-java") +} dependencies { api projects.model diff --git a/service/build.gradle b/service/build.gradle index 8be50fb4..cbd312e2 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -1,5 +1,7 @@ -apply plugin: "java-library" -apply from: "$rootDir/gradle/configure-java.gradle" +plugins { + id("java-library") + id("configure-java") +} dependencies { api projects.network From 5499c7ba8cb3e078a5497e2f4a1c4b8d5a5e4720 Mon Sep 17 00:00:00 2001 From: javasabr Date: Mon, 20 Oct 2025 19:56:01 +0200 Subject: [PATCH 2/2] finish updating to new rlib --- .../application/config/MqttBrokerConfig.java | 20 +++--- .../application/config/MqttNetworkConfig.java | 16 ++--- .../extension/SpecificationExtensions.groovy | 6 +- .../integration/ExternalConnectionTest.groovy | 4 +- .../IntegrationSpecification.groovy | 6 +- .../integration/PublishRetryTest.groovy | 22 ++----- .../service/ClientIdRegistryTest.groovy | 2 +- .../service/MqttSessionServiceTest.groovy | 2 +- .../service/SubscribtionServiceTest.groovy | 4 +- .../application/mock/MqttMockClient.groovy | 6 +- .../application/model/ActionResultTest.groovy | 4 +- .../model/TopicSubscriberTest.groovy | 6 +- .../mqtt/application/model/TopicTest.groovy | 4 +- .../network/NetworkUnitSpecification.groovy | 6 +- .../in/AuthenticationInPacketTest.groovy | 2 +- .../network/in/ConnectAckInPacketTest.groovy | 2 +- .../network/in/ConnectInPacketTest.groovy | 4 +- .../network/in/DisconnectInPacketTest.groovy | 2 +- .../network/in/PublishAckInPacketTest.groovy | 2 +- .../in/PublishCompleteInPacketTest.groovy | 2 +- .../network/in/PublishInPacketTest.groovy | 2 +- .../in/PublishReceivedInPacketTest.groovy | 2 +- .../in/PublishReleaseInPacketTest.groovy | 2 +- .../in/SubscribeAckInPacketTest.groovy | 2 +- .../network/in/SubscribeInPacketTest.groovy | 2 +- .../in/UnsubscribeAckInPacketTest.groovy | 2 +- .../network/in/UnsubscribeInPacketTest.groovy | 2 +- .../out/Authentication5OutPacketTest.groovy | 2 +- .../out/Connect311OutPacketTest.groovy | 2 +- .../network/out/Connect5OutPacketTest.groovy | 2 +- .../out/ConnectAck311OutPacketTest.groovy | 4 +- .../out/ConnectAck5OutPacketTest.groovy | 2 +- .../out/DisconnectAck5OutPacketTest.groovy | 2 +- .../out/Publish311OutPacketTest.groovy | 2 +- .../network/out/Publish5OutPacketTest.groovy | 2 +- .../out/PublishAck311OutPacketTest.groovy | 2 +- .../out/PublishAck5OutPacketTest.groovy | 2 +- .../PublishComplete311OutPacketTest.groovy | 2 +- .../out/PublishComplete5OutPacketTest.groovy | 2 +- .../PublishReceived311OutPacketTest.groovy | 4 +- .../out/PublishReceived5OutPacketTest.groovy | 2 +- .../out/PublishRelease311OutPacketTest.groovy | 4 +- .../out/PublishRelease5OutPacketTest.groovy | 2 +- .../out/Subscribe311OutPacketTest.groovy | 4 +- .../out/Subscribe5OutPacketTest.groovy | 2 +- .../out/SubscribeAck311OutPacketTest.groovy | 2 +- .../out/UnsubscribeAck311OutPacketTest.groovy | 4 +- .../application/util/TopicUtilsTest.groovy | 4 +- build.gradle | 2 - buildSrc/settings.gradle | 10 ++- gradle/libs.versions.toml | 2 +- .../javasabr/mqtt/model/PacketProperty.java | 2 +- .../model/subscriber/SharedSubscriber.java | 4 +- .../subscriber/SubscribeTopicFilter.java | 2 +- .../mqtt/model/topic/TopicSubscribers.java | 4 +- .../javasabr/mqtt/network/MqttConnection.java | 4 -- .../mqtt/network/packet/MqttPacketReader.java | 6 +- .../mqtt/network/packet/MqttPacketWriter.java | 61 ++++++++----------- .../mqtt/service/SubscriptionService.java | 8 +-- .../AbstractMqttClientReleaseHandler.java | 4 +- .../handler/in/ConnectInPacketHandler.java | 8 +-- .../in/PendingOutResponseInPacketHandler.java | 1 - .../handler/in/SubscribeInPacketHandler.java | 4 +- .../publish/in/AbstractPublishInHandler.java | 2 +- .../publish/in/Qos0PublishInHandler.java | 2 +- .../publish/in/Qos1PublishInHandler.java | 2 +- .../publish/in/Qos2PublishInHandler.java | 4 +- .../out/AbstractPublishOutHandler.java | 2 +- .../out/PersistentPublishOutHandler.java | 2 +- .../publish/out/Qos0PublishOutHandler.java | 2 +- .../publish/out/Qos1PublishOutHandler.java | 1 - .../impl/AbstractCredentialSource.java | 2 +- .../service/impl/FileCredentialsSource.java | 2 +- .../impl/InMemoryClientIdRegistry.java | 2 +- .../impl/InMemoryMqttSessionService.java | 4 +- .../impl/SimpleSubscriptionService.java | 10 +-- 76 files changed, 154 insertions(+), 195 deletions(-) diff --git a/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java index 8b56d00a..4e49cf4f 100644 --- a/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java +++ b/application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java @@ -1,10 +1,18 @@ package javasabr.mqtt.application.config; -import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler; import javasabr.mqtt.network.handler.MqttClientReleaseHandler; +import javasabr.mqtt.network.handler.PacketInHandler; +import javasabr.mqtt.network.handler.PublishInHandler; +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.handler.client.DefaultMqttClientReleaseHandler; import javasabr.mqtt.service.handler.in.ConnectInPacketHandler; import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler; -import javasabr.mqtt.network.handler.PacketInHandler; import javasabr.mqtt.service.handler.in.PublishAckInPacketHandler; import javasabr.mqtt.service.handler.in.PublishCompleteInPacketHandler; import javasabr.mqtt.service.handler.in.PublishInPacketHandler; @@ -12,7 +20,6 @@ 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.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; @@ -20,13 +27,6 @@ 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; diff --git a/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java b/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java index eee9eaf5..b81f0710 100644 --- a/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java +++ b/application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java @@ -1,18 +1,18 @@ package javasabr.mqtt.application.config; -import javasabr.mqtt.network.handler.MqttClientReleaseHandler; -import javasabr.mqtt.network.handler.PacketInHandler; -import javasabr.mqtt.model.MqttProperties; -import javasabr.mqtt.model.QoS; -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; import java.util.function.Consumer; +import javasabr.mqtt.model.MqttProperties; import javasabr.mqtt.model.MqttServerConnectionConfig; +import javasabr.mqtt.model.QoS; +import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.client.ExternalMqttClient; +import javasabr.mqtt.network.client.InternalMqttClient; +import javasabr.mqtt.network.handler.MqttClientReleaseHandler; +import javasabr.mqtt.network.handler.PacketInHandler; import javasabr.mqtt.network.packet.in.MqttReadablePacket; import javasabr.rlib.network.BufferAllocator; import javasabr.rlib.network.Network; diff --git a/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy b/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy index 9715531e..63f284ff 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy @@ -1,11 +1,11 @@ package javasabr.mqtt.application.extension -import javasabr.mqtt.network.MqttConnection -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 +import javasabr.mqtt.network.MqttConnection +import javasabr.mqtt.network.packet.out.MqttWritablePacket +import javasabr.mqtt.network.utils.MqttDataUtils import javasabr.rlib.collections.array.Array import javasabr.rlib.collections.array.IntArray import spock.lang.Specification diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy index 33860606..f502dfa4 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy @@ -4,11 +4,11 @@ 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.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 +import javasabr.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.out.Connect311OutPacket import javasabr.rlib.common.util.ArrayUtils import spock.lang.Ignore diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy index f74f3fca..0fc5425c 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy @@ -3,12 +3,12 @@ package javasabr.mqtt.application.integration import com.hivemq.client.mqtt.MqttClient import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient -import javasabr.mqtt.network.MqttConnection import javasabr.mqtt.application.integration.config.MqttBrokerTestConfig import javasabr.mqtt.application.mock.MqttMockClient -import javasabr.mqtt.model.MqttServerConnectionConfig import javasabr.mqtt.model.MqttProperties +import javasabr.mqtt.model.MqttServerConnectionConfig import javasabr.mqtt.model.MqttVersion +import javasabr.mqtt.network.MqttConnection import org.springframework.beans.factory.annotation.Autowired import org.springframework.test.context.junit.jupiter.SpringJUnitConfig import spock.lang.Specification @@ -16,7 +16,7 @@ import spock.lang.Specification import java.nio.charset.StandardCharsets import java.util.concurrent.atomic.AtomicInteger -import static javasabr.mqtt.network.MqttClient.* +import static javasabr.mqtt.network.MqttClient.UnsafeMqttClient @SpringJUnitConfig(classes = MqttBrokerTestConfig) class IntegrationSpecification extends Specification { diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy index 51c33073..15d3ecae 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy @@ -1,29 +1,19 @@ package javasabr.mqtt.application.integration import com.hivemq.client.mqtt.datatypes.MqttQos -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 import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode import javasabr.mqtt.model.subscriber.SubscribeTopicFilter +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.* +import javasabr.mqtt.service.MqttSessionService import javasabr.rlib.collections.array.Array -import javasabr.rlib.logger.api.LoggerLevel -import javasabr.rlib.logger.api.LoggerManager -import javasabr.rlib.network.packet.impl.AbstractNetworkPacketReader import org.springframework.beans.factory.annotation.Autowired class PublishRetryTest extends IntegrationSpecification { diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy index 4bedc6a8..94922925 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.integration.service import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode -import javasabr.mqtt.service.ClientIdRegistry import javasabr.mqtt.application.integration.IntegrationSpecification +import javasabr.mqtt.service.ClientIdRegistry import javasabr.rlib.common.util.StringUtils import org.springframework.beans.factory.annotation.Autowired diff --git a/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy index b6376090..061704eb 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.integration.service import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode +import javasabr.mqtt.application.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/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy index 737c021f..d6a1d96f 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy @@ -2,11 +2,11 @@ package javasabr.mqtt.application.integration.service import com.hivemq.client.mqtt.datatypes.MqttQos import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException -import javasabr.mqtt.service.ClientIdRegistry -import javasabr.mqtt.service.impl.SimpleSubscriptionService import javasabr.mqtt.application.integration.IntegrationSpecification import javasabr.mqtt.model.ActionResult import javasabr.mqtt.model.subscriber.SingleSubscriber +import javasabr.mqtt.service.ClientIdRegistry +import javasabr.mqtt.service.impl.SimpleSubscriptionService import org.spockframework.util.Pair import org.springframework.beans.factory.annotation.Autowired import spock.lang.Unroll diff --git a/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy b/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy index 71db6538..bb330a6d 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/mock/MqttMockClient.groovy @@ -2,11 +2,7 @@ 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.in.* import javasabr.mqtt.network.packet.out.Disconnect311OutPacket import javasabr.mqtt.network.packet.out.MqttWritablePacket import javasabr.mqtt.network.utils.MqttDataUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy index 8a87714b..827a9879 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/model/ActionResultTest.groovy @@ -4,9 +4,7 @@ import javasabr.mqtt.application.network.NetworkUnitSpecification import javasabr.mqtt.model.ActionResult import spock.lang.Unroll -import static javasabr.mqtt.model.ActionResult.EMPTY -import static javasabr.mqtt.model.ActionResult.FAILED -import static javasabr.mqtt.model.ActionResult.SUCCESS +import static javasabr.mqtt.model.ActionResult.* class ActionResultTest extends NetworkUnitSpecification { diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy index a6dcbbbf..0eff2fee 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/model/TopicSubscriberTest.groovy @@ -1,17 +1,15 @@ package javasabr.mqtt.application.model -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 import javasabr.mqtt.model.topic.TopicName import javasabr.mqtt.model.topic.TopicSubscribers +import javasabr.mqtt.network.MqttClient import spock.lang.Unroll -import static javasabr.mqtt.model.QoS.AT_LEAST_ONCE -import static javasabr.mqtt.model.QoS.AT_MOST_ONCE -import static javasabr.mqtt.model.QoS.EXACTLY_ONCE +import static javasabr.mqtt.model.QoS.* import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter import static javasabr.mqtt.model.utils.TopicUtils.buildTopicName diff --git a/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy index 0237b917..4dce31d2 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/model/TopicTest.groovy @@ -7,9 +7,7 @@ import javasabr.mqtt.model.topic.TopicSubscribers import spock.lang.Specification import spock.lang.Unroll -import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter -import static javasabr.mqtt.model.utils.TopicUtils.buildTopicName -import static javasabr.mqtt.model.utils.TopicUtils.isInvalid +import static javasabr.mqtt.model.utils.TopicUtils.* class TopicTest extends Specification { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy index dd983668..4392dd19 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/NetworkUnitSpecification.groovy @@ -1,11 +1,7 @@ package javasabr.mqtt.application.network import javasabr.mqtt.application.UnitSpecification -import javasabr.mqtt.model.MqttClientConnectionConfig -import javasabr.mqtt.model.MqttServerConnectionConfig -import javasabr.mqtt.model.MqttVersion -import javasabr.mqtt.model.QoS -import javasabr.mqtt.model.SubscribeRetainHandling +import javasabr.mqtt.model.* import javasabr.mqtt.model.data.type.StringPair import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy index 4555618d..7643205a 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/AuthenticationInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.AuthenticationInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.AuthenticateReasonCode +import javasabr.mqtt.network.packet.in.AuthenticationInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy index adc7f63a..b3e11388 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectAckInPacketTest.groovy @@ -1,10 +1,10 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.ConnectAckInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS import javasabr.mqtt.model.reason.code.ConnectAckReasonCode +import javasabr.mqtt.network.packet.in.ConnectAckInPacket import javasabr.rlib.common.util.ArrayUtils import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy index b627473c..80a5c1b3 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/ConnectInPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.in -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.mqtt.model.exception.MalformedPacketMqttException +import javasabr.mqtt.network.packet.in.ConnectInPacket import javasabr.rlib.common.util.ArrayUtils import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy index 47643a0f..89fde74d 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/DisconnectInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.DisconnectInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.DisconnectReasonCode +import javasabr.mqtt.network.packet.in.DisconnectInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy index d13c520d..cd95702a 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishAckInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.PublishAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishAckReasonCode +import javasabr.mqtt.network.packet.in.PublishAckInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy index 974a7302..f050618f 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishCompleteInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.PublishCompleteInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode +import javasabr.mqtt.network.packet.in.PublishCompleteInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy index dad19cd1..d861b808 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishInPacketTest.groovy @@ -1,10 +1,10 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.PublishInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS import javasabr.mqtt.model.data.type.StringPair +import javasabr.mqtt.network.packet.in.PublishInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.collections.array.IntArray import javasabr.rlib.common.util.ArrayUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy index 5b478920..8bef9d39 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReceivedInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.PublishReceivedInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode +import javasabr.mqtt.network.packet.in.PublishReceivedInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy index f47529eb..33391925 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/PublishReleaseInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.PublishReleaseInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode +import javasabr.mqtt.network.packet.in.PublishReleaseInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy index d0b8c2d3..fa49b4bd 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeAckInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.SubscribeAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode +import javasabr.mqtt.network.packet.in.SubscribeAckInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy index 6f9b388b..7e2898b7 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/SubscribeInPacketTest.groovy @@ -1,10 +1,10 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.SubscribeInPacket import javasabr.mqtt.model.MqttProperties import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.QoS import javasabr.mqtt.model.SubscribeRetainHandling +import javasabr.mqtt.network.packet.in.SubscribeInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy index 971f70d4..7e9c8f02 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeAckInPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket import javasabr.mqtt.model.PacketProperty import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode +import javasabr.mqtt.network.packet.in.UnsubscribeAckInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy index 2e27e076..dd7d14e6 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/in/UnsubscribeInPacketTest.groovy @@ -1,7 +1,7 @@ package javasabr.mqtt.application.network.in -import javasabr.mqtt.network.packet.in.UnsubscribeInPacket import javasabr.mqtt.model.PacketProperty +import javasabr.mqtt.network.packet.in.UnsubscribeInPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy index b57a889e..e0c4cb38 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Authentication5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.AuthenticateReasonCode 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 class Authentication5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy index e6d43217..eb0583db 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect311OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.QoS 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 import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy index 378ceff0..0401c17e 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Connect5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.QoS 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/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy index 7acb13c8..8d2736bd 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck311OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out -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.mqtt.network.packet.in.ConnectAckInPacket +import javasabr.mqtt.network.packet.out.ConnectAck311OutPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.ArrayUtils import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy index a47c4114..0e9153ba 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/ConnectAck5OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out import javasabr.mqtt.model.MqttVersion +import javasabr.mqtt.model.reason.code.ConnectAckReasonCode import javasabr.mqtt.network.packet.in.ConnectAckInPacket import javasabr.mqtt.network.packet.out.ConnectAck5OutPacket -import javasabr.mqtt.model.reason.code.ConnectAckReasonCode import javasabr.rlib.common.util.BufferUtils class ConnectAck5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy index 8e74583a..c601b812 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/DisconnectAck5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.DisconnectReasonCode 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 class DisconnectAck5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy index 330411db..c86d65e9 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish311OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.QoS 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/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy index ed752d00..3840079e 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Publish5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.QoS 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 class Publish5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy index cb464214..c5073ff5 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck311OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishAckReasonCode 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/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy index 6eee8e88..2baaeba9 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishAck5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishAckReasonCode 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 class PublishAck5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy index c8953f25..89acce50 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete311OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode 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/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy index 05ec4154..f3513cd0 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishComplete5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode 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 class PublishComplete5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy index 0c06b381..af8cc46e 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived311OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out -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.mqtt.network.packet.in.PublishReceivedInPacket +import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy index 3f724803..3b8343be 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishReceived5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode 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 class PublishReceived5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy index e21a6588..5dbd404e 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease311OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out -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.mqtt.network.packet.in.PublishReleaseInPacket +import javasabr.mqtt.network.packet.out.PublishRelease311OutPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy index 8646cc66..23b272bf 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/PublishRelease5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.reason.code.PublishReleaseReasonCode 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 class PublishRelease5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy index 75fe9522..7a38ccc8 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe311OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out -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.mqtt.network.packet.in.SubscribeInPacket +import javasabr.mqtt.network.packet.out.Subscribe311OutPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy index 9a8364cf..35e28516 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/Subscribe5OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.MqttProperties 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 class Subscribe5OutPacketTest extends BaseOutPacketTest { diff --git a/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy index 54420e3c..c88aac01 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/SubscribeAck311OutPacketTest.groovy @@ -1,8 +1,8 @@ package javasabr.mqtt.application.network.out +import javasabr.mqtt.model.data.type.StringPair 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/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy index e8b0e450..d81f1666 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/network/out/UnsubscribeAck311OutPacketTest.groovy @@ -1,9 +1,9 @@ package javasabr.mqtt.application.network.out -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.mqtt.network.packet.in.UnsubscribeAckInPacket +import javasabr.mqtt.network.packet.out.UnsubscribeAck311OutPacket import javasabr.rlib.collections.array.Array import javasabr.rlib.common.util.BufferUtils diff --git a/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy b/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy index 53bcfa95..e3ebbcca 100644 --- a/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy +++ b/application/src/test/groovy/javasabr/mqtt/application/util/TopicUtilsTest.groovy @@ -3,9 +3,7 @@ package javasabr.mqtt.application.util import spock.lang.Specification import spock.lang.Unroll -import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter -import static javasabr.mqtt.model.utils.TopicUtils.buildTopicName -import static javasabr.mqtt.model.utils.TopicUtils.isInvalid +import static javasabr.mqtt.model.utils.TopicUtils.* class TopicUtilsTest extends Specification { diff --git a/build.gradle b/build.gradle index a0ef39e8..d65798e3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import org.apache.tools.ant.filters.ReplaceTokens - buildscript { repositories { maven { diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index f74f1fed..64b18218 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -1,3 +1,11 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -rootProject.name = 'build-configuration' \ No newline at end of file +rootProject.name = 'build-configuration' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files("../gradle/libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d1bd955..1b5b6302 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://gitlab.com/JavaSaBr/maven-repo/-/packages -rlib = "10.0.alpha3" +rlib = "10.0.alpha4" # https://mvnrepository.com/artifact/org.jetbrains/annotations jetbrains-annotations = "26.0.2" # https://mvnrepository.com/artifact/org.projectlombok/lombok diff --git a/model/src/main/java/javasabr/mqtt/model/PacketProperty.java b/model/src/main/java/javasabr/mqtt/model/PacketProperty.java index 83feba70..0c57f9ce 100644 --- a/model/src/main/java/javasabr/mqtt/model/PacketProperty.java +++ b/model/src/main/java/javasabr/mqtt/model/PacketProperty.java @@ -1,7 +1,7 @@ package javasabr.mqtt.model; -import javasabr.mqtt.model.data.type.PacketDataType; import java.util.stream.Stream; +import javasabr.mqtt.model.data.type.PacketDataType; import javasabr.rlib.common.util.ClassUtils; import javasabr.rlib.common.util.ObjectUtils; import lombok.AccessLevel; diff --git a/model/src/main/java/javasabr/mqtt/model/subscriber/SharedSubscriber.java b/model/src/main/java/javasabr/mqtt/model/subscriber/SharedSubscriber.java index 6df99308..45cd46fd 100644 --- a/model/src/main/java/javasabr/mqtt/model/subscriber/SharedSubscriber.java +++ b/model/src/main/java/javasabr/mqtt/model/subscriber/SharedSubscriber.java @@ -1,9 +1,9 @@ package javasabr.mqtt.model.subscriber; -import javasabr.mqtt.model.MqttUser; -import javasabr.mqtt.model.topic.SharedTopicFilter; import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; +import javasabr.mqtt.model.MqttUser; +import javasabr.mqtt.model.topic.SharedTopicFilter; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.ArrayFactory; import javasabr.rlib.collections.array.LockableArray; diff --git a/model/src/main/java/javasabr/mqtt/model/subscriber/SubscribeTopicFilter.java b/model/src/main/java/javasabr/mqtt/model/subscriber/SubscribeTopicFilter.java index 568a9109..7fa192a2 100644 --- a/model/src/main/java/javasabr/mqtt/model/subscriber/SubscribeTopicFilter.java +++ b/model/src/main/java/javasabr/mqtt/model/subscriber/SubscribeTopicFilter.java @@ -2,9 +2,9 @@ import static javasabr.mqtt.model.utils.TopicUtils.buildTopicFilter; -import javasabr.mqtt.model.topic.TopicFilter; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.SubscribeRetainHandling; +import javasabr.mqtt.model.topic.TopicFilter; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/model/src/main/java/javasabr/mqtt/model/topic/TopicSubscribers.java b/model/src/main/java/javasabr/mqtt/model/topic/TopicSubscribers.java index 68db65fb..1ae347d4 100644 --- a/model/src/main/java/javasabr/mqtt/model/topic/TopicSubscribers.java +++ b/model/src/main/java/javasabr/mqtt/model/topic/TopicSubscribers.java @@ -1,9 +1,9 @@ package javasabr.mqtt.model.topic; -import javasabr.mqtt.model.MqttUser; -import javasabr.mqtt.model.QoS; import java.util.Objects; import java.util.function.Supplier; +import javasabr.mqtt.model.MqttUser; +import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.SharedSubscriber; import javasabr.mqtt.model.subscriber.SingleSubscriber; import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; diff --git a/network/src/main/java/javasabr/mqtt/network/MqttConnection.java b/network/src/main/java/javasabr/mqtt/network/MqttConnection.java index 5593ad50..2aa26367 100644 --- a/network/src/main/java/javasabr/mqtt/network/MqttConnection.java +++ b/network/src/main/java/javasabr/mqtt/network/MqttConnection.java @@ -86,8 +86,6 @@ public MqttClientConnectionConfig clientConnectionConfig() { private NetworkPacketReader createPacketReader() { return new MqttPacketReader( this, - channel, - bufferAllocator, this::updateLastActivity, this::handleReceivedPacket, maxPacketsByRead); @@ -96,8 +94,6 @@ private NetworkPacketReader createPacketReader() { private NetworkPacketWriter createPacketWriter() { return new MqttPacketWriter( this, - channel, - bufferAllocator, this::updateLastActivity, this::nextPacketToWrite, this::serializedPacket, diff --git a/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java index 5e1cba8c..d73b665f 100644 --- a/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketReader.java @@ -1,7 +1,6 @@ package javasabr.mqtt.network.packet; import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousSocketChannel; import java.util.NoSuchElementException; import java.util.function.Consumer; import javasabr.mqtt.network.MqttConnection; @@ -25,7 +24,6 @@ import javasabr.rlib.common.util.ArrayUtils; import javasabr.rlib.common.util.NumberUtils; import javasabr.rlib.functions.ByteFunction; -import javasabr.rlib.network.BufferAllocator; import javasabr.rlib.network.packet.impl.AbstractNetworkPacketReader; import org.jspecify.annotations.Nullable; @@ -53,12 +51,10 @@ public class MqttPacketReader extends AbstractNetworkPacketReader readPacketHandler, int maxPacketsByRead) { - super(connection, channel, bufferAllocator, updateActivityFunction, readPacketHandler, maxPacketsByRead); + super(connection, updateActivityFunction, readPacketHandler, maxPacketsByRead); } @Override diff --git a/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java index 011cff23..1f9c6820 100644 --- a/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java +++ b/network/src/main/java/javasabr/mqtt/network/packet/MqttPacketWriter.java @@ -1,41 +1,37 @@ package javasabr.mqtt.network.packet; import java.nio.ByteBuffer; -import java.nio.channels.AsynchronousSocketChannel; import java.util.function.Consumer; import java.util.function.Supplier; import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.network.packet.out.MqttWritablePacket; import javasabr.mqtt.network.utils.MqttDataUtils; import javasabr.rlib.functions.ObjBoolConsumer; -import javasabr.rlib.network.BufferAllocator; import javasabr.rlib.network.packet.WritableNetworkPacket; import javasabr.rlib.network.packet.impl.AbstractNetworkPacketWriter; import org.jspecify.annotations.Nullable; public class MqttPacketWriter extends AbstractNetworkPacketWriter { + public static final int DATA_OFFSET = 5; + public MqttPacketWriter( MqttConnection connection, - AsynchronousSocketChannel channel, - BufferAllocator bufferAllocator, Runnable updateActivityFunction, - Supplier<@Nullable WritableNetworkPacket> nextWritePacketSupplier, - Consumer> writtenPacketHandler, + Supplier<@Nullable WritableNetworkPacket> packetProvider, + Consumer> serializedToChannelPacketHandler, ObjBoolConsumer> sentPacketHandler) { super( connection, - channel, - bufferAllocator, updateActivityFunction, - nextWritePacketSupplier, - writtenPacketHandler, + packetProvider, + serializedToChannelPacketHandler, sentPacketHandler); } @Override protected int totalSize(WritableNetworkPacket packet, int expectedLength) { - return 1 + MqttDataUtils.sizeOfMbi(expectedLength) + expectedLength; + return DATA_OFFSET + expectedLength; } @Override @@ -43,24 +39,9 @@ protected boolean onBeforeSerialize( MqttWritablePacket packet, int expectedLength, int totalSize, - ByteBuffer firstBuffer, - ByteBuffer secondBuffer) { - firstBuffer.clear(); - secondBuffer.clear(); - return true; - } - - @Override - protected boolean doSerialize( - MqttWritablePacket packet, - int expectedLength, - int totalSize, - ByteBuffer firstBuffer, - ByteBuffer secondBuffer) { - if (!packet.write(connection, secondBuffer)) { - return false; - } - secondBuffer.flip(); + ByteBuffer writeBuffer) { + writeBuffer.clear() + .position(DATA_OFFSET); return true; } @@ -69,13 +50,21 @@ protected boolean onAfterSerialize( MqttWritablePacket packet, int expectedLength, int totalSize, - ByteBuffer firstBuffer, - ByteBuffer secondBuffer) { - firstBuffer.put((byte) packet.packetTypeAndFlags()); - MqttDataUtils.writeMbi(secondBuffer.remaining(), firstBuffer); - firstBuffer - .put(secondBuffer) - .flip(); + ByteBuffer writeBuffer) { + + int lastDataByteIndex = writeBuffer.position(); + int dataLength = lastDataByteIndex - DATA_OFFSET; + int offset = 4 - MqttDataUtils.sizeOfMbi(dataLength); + + writeBuffer + .position(offset) + .put((byte) packet.packetTypeAndFlags()); + + MqttDataUtils + .writeMbi(dataLength, writeBuffer) + .position(offset) + .limit(lastDataByteIndex); + return true; } } diff --git a/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java b/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java index 571f94ea..5b91a6ce 100644 --- a/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java +++ b/service/src/main/java/javasabr/mqtt/service/SubscriptionService.java @@ -1,15 +1,15 @@ package javasabr.mqtt.service; +import java.util.function.BiFunction; import javasabr.mqtt.model.ActionResult; -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.subscriber.SingleSubscriber; +import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.topic.TopicFilter; import javasabr.mqtt.model.topic.TopicName; import javasabr.mqtt.network.MqttClient; -import java.util.function.BiFunction; +import javasabr.mqtt.network.MqttSession; import javasabr.rlib.collections.array.Array; /** diff --git a/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java index 7f3c9237..80cbe7ae 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/client/AbstractMqttClientReleaseHandler.java @@ -1,12 +1,12 @@ package javasabr.mqtt.service.handler.client; import javasabr.mqtt.model.MqttClientConnectionConfig; -import javasabr.mqtt.network.client.AbstractMqttClient; import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.client.AbstractMqttClient; +import javasabr.mqtt.network.handler.MqttClientReleaseHandler; import javasabr.mqtt.service.ClientIdRegistry; import javasabr.mqtt.service.MqttSessionService; import javasabr.mqtt.service.SubscriptionService; -import javasabr.mqtt.network.handler.MqttClientReleaseHandler; import javasabr.rlib.common.util.StringUtils; import lombok.CustomLog; import lombok.RequiredArgsConstructor; diff --git a/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java index 68fe0856..cd155b13 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/ConnectInPacketHandler.java @@ -1,5 +1,6 @@ package javasabr.mqtt.service.handler.in; +import static javasabr.mqtt.base.utils.ReactorUtils.ifTrue; import static javasabr.mqtt.model.MqttProperties.MAXIMUM_PACKET_SIZE_UNDEFINED; import static javasabr.mqtt.model.MqttProperties.RECEIVE_MAXIMUM_UNDEFINED; import static javasabr.mqtt.model.MqttProperties.SERVER_KEEP_ALIVE_DISABLED; @@ -9,17 +10,16 @@ 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.base.utils.ReactorUtils.ifTrue; import javasabr.mqtt.model.MqttClientConnectionConfig; import javasabr.mqtt.model.MqttServerConnectionConfig; +import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.exception.ConnectionRejectException; import javasabr.mqtt.model.exception.MalformedPacketMqttException; -import javasabr.mqtt.network.MqttConnection; -import javasabr.mqtt.network.MqttSession; -import javasabr.mqtt.model.MqttVersion; import javasabr.mqtt.model.reason.code.ConnectAckReasonCode; import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; +import javasabr.mqtt.network.MqttConnection; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.network.packet.in.ConnectInPacket; import javasabr.mqtt.service.AuthenticationService; import javasabr.mqtt.service.ClientIdRegistry; diff --git a/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java index 58524481..363afaf6 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/PendingOutResponseInPacketHandler.java @@ -1,7 +1,6 @@ package javasabr.mqtt.service.handler.in; import javasabr.mqtt.network.MqttClient.UnsafeMqttClient; -import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.network.packet.HasPacketId; import javasabr.mqtt.network.packet.in.MqttReadablePacket; import lombok.RequiredArgsConstructor; diff --git a/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java index e3319f6f..d753b93e 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/in/SubscribeInPacketHandler.java @@ -1,16 +1,16 @@ package javasabr.mqtt.service.handler.in; +import static java.lang.Byte.toUnsignedInt; import static javasabr.mqtt.model.reason.code.SubscribeAckReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED; import static javasabr.mqtt.model.reason.code.SubscribeAckReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED; -import static java.lang.Byte.toUnsignedInt; +import java.util.Set; import javasabr.mqtt.model.reason.code.DisconnectReasonCode; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; 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/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java index 5da6935b..e6b74e38 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/AbstractPublishInHandler.java @@ -1,6 +1,5 @@ package javasabr.mqtt.service.handler.publish.in; -import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.SingleSubscriber; @@ -8,6 +7,7 @@ import javasabr.mqtt.network.handler.PublishInHandler; import javasabr.mqtt.network.packet.in.PublishInPacket; import javasabr.mqtt.service.SubscriptionService; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos0PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos0PublishInHandler.java index 71a291ec..c9848b70 100644 --- a/service/src/main/java/javasabr/mqtt/service/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.service.handler.publish.in; -import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.service.SubscriptionService; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; public class Qos0PublishInHandler extends AbstractPublishInHandler { diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos1PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos1PublishInHandler.java index 74277a39..c5e179b8 100644 --- a/service/src/main/java/javasabr/mqtt/service/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.service.handler.publish.in; -import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.reason.code.PublishAckReasonCode; import javasabr.mqtt.network.MqttClient; import javasabr.mqtt.network.packet.in.PublishInPacket; import javasabr.mqtt.service.SubscriptionService; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; public class Qos1PublishInHandler extends AbstractPublishInHandler { diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos2PublishInHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/in/Qos2PublishInHandler.java index e3cbb388..0c95f383 100644 --- a/service/src/main/java/javasabr/mqtt/service/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.service.handler.publish.in; -import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode; import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode; import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.MqttSession; 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; +import javasabr.mqtt.service.handler.publish.out.PublishOutHandler; public class Qos2PublishInHandler extends AbstractPublishInHandler implements MqttSession.PendingPacketHandler { diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java index c5702785..ed0338a2 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/AbstractPublishOutHandler.java @@ -2,11 +2,11 @@ import javasabr.mqtt.model.ActionResult; import javasabr.mqtt.model.MqttProperties; -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.network.MqttClient; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.network.packet.in.PublishInPacket; abstract class AbstractPublishOutHandler implements PublishOutHandler { diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java index a850556f..1c89e027 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/PersistentPublishOutHandler.java @@ -1,9 +1,9 @@ package javasabr.mqtt.service.handler.publish.out; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.subscriber.Subscriber; import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.network.packet.in.PublishInPacket; public abstract class PersistentPublishOutHandler extends AbstractPublishOutHandler implements diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java index 326cc284..340ba959 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos0PublishOutHandler.java @@ -3,10 +3,10 @@ import static javasabr.mqtt.model.ActionResult.SUCCESS; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.model.QoS; import javasabr.mqtt.model.subscriber.Subscriber; import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.network.packet.in.PublishInPacket; public class Qos0PublishOutHandler extends AbstractPublishOutHandler { diff --git a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java index 4e73d201..8734070e 100644 --- a/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java +++ b/service/src/main/java/javasabr/mqtt/service/handler/publish/out/Qos1PublishOutHandler.java @@ -2,7 +2,6 @@ import javasabr.mqtt.model.QoS; import javasabr.mqtt.network.MqttClient; -import javasabr.mqtt.network.MqttConnection; import javasabr.mqtt.network.packet.HasPacketId; import javasabr.mqtt.network.packet.in.PublishAckInPacket; import lombok.RequiredArgsConstructor; diff --git a/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java b/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java index ef3698e3..25bd229f 100644 --- a/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/AbstractCredentialSource.java @@ -1,7 +1,7 @@ package javasabr.mqtt.service.impl; -import javasabr.mqtt.service.CredentialSource; import java.util.Arrays; +import javasabr.mqtt.service.CredentialSource; import javasabr.rlib.collections.dictionary.DictionaryFactory; import javasabr.rlib.collections.dictionary.LockableRefToRefDictionary; import javasabr.rlib.collections.dictionary.RefToRefDictionary; diff --git a/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java b/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java index 1e6f4cfa..589d11b3 100644 --- a/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/FileCredentialsSource.java @@ -1,11 +1,11 @@ package javasabr.mqtt.service.impl; -import javasabr.mqtt.model.exception.CredentialsSourceException; import java.io.FileInputStream; import java.io.IOException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Properties; +import javasabr.mqtt.model.exception.CredentialsSourceException; import javasabr.rlib.collections.dictionary.DictionaryCollectors; import javasabr.rlib.collections.dictionary.RefToRefDictionary; diff --git a/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java index 17bc4974..29c1c385 100644 --- a/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryClientIdRegistry.java @@ -1,8 +1,8 @@ package javasabr.mqtt.service.impl; -import javasabr.mqtt.service.ClientIdRegistry; import java.util.BitSet; import java.util.UUID; +import javasabr.mqtt.service.ClientIdRegistry; import javasabr.rlib.collections.dictionary.Dictionary; import javasabr.rlib.collections.dictionary.DictionaryFactory; import javasabr.rlib.collections.dictionary.LockableRefToRefDictionary; diff --git a/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java index b80693d7..933938c6 100644 --- a/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/InMemoryMqttSessionService.java @@ -1,10 +1,10 @@ package javasabr.mqtt.service.impl; +import java.io.Closeable; +import javasabr.mqtt.network.DefaultMqttSession; 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; import javasabr.rlib.collections.dictionary.Dictionary; diff --git a/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java b/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java index 668c452d..7d9375ab 100644 --- a/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java +++ b/service/src/main/java/javasabr/mqtt/service/impl/SimpleSubscriptionService.java @@ -11,19 +11,19 @@ import static javasabr.mqtt.model.utils.TopicUtils.isInvalid; import static javasabr.mqtt.model.utils.TopicUtils.isShared; -import javasabr.mqtt.model.MqttClientConnectionConfig; +import java.util.function.BiFunction; import javasabr.mqtt.model.ActionResult; -import javasabr.mqtt.network.MqttSession; -import javasabr.mqtt.model.subscriber.SingleSubscriber; -import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; +import javasabr.mqtt.model.MqttClientConnectionConfig; import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode; import javasabr.mqtt.model.reason.code.UnsubscribeAckReasonCode; +import javasabr.mqtt.model.subscriber.SingleSubscriber; +import javasabr.mqtt.model.subscriber.SubscribeTopicFilter; import javasabr.mqtt.model.topic.TopicFilter; import javasabr.mqtt.model.topic.TopicName; import javasabr.mqtt.model.topic.TopicSubscribers; import javasabr.mqtt.network.MqttClient; +import javasabr.mqtt.network.MqttSession; import javasabr.mqtt.service.SubscriptionService; -import java.util.function.BiFunction; import javasabr.rlib.collections.array.Array; import javasabr.rlib.collections.array.ArrayCollectors; import lombok.AccessLevel;