Update to rlib 10.alpha4

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

application/src/main/java/javasabr/mqtt/application/config/MqttBrokerConfig.java

@@ -1,32 +1,32 @@
 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;
 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.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;

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;

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

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
 

application/src/test/groovy/javasabr/mqtt/application/integration/IntegrationSpecification.groovy

@@ -3,20 +3,20 @@ 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
 
 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 {

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 {

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
 

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 {

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

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

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 {
 

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
 

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 {
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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