upgrading for new rlib

Author: JavaSaBr

src/test/groovy/com/ss/mqtt/broker/test/extension/SpecificationExtensions.groovy

@@ -5,9 +5,8 @@ import com.ss.mqtt.broker.model.PacketProperty
 import com.ss.mqtt.broker.model.data.type.StringPair
 import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket
 import com.ss.mqtt.broker.util.MqttDataUtils
-import com.ss.rlib.common.util.array.Array
-import com.ss.rlib.common.util.array.IntegerArray
-import org.jetbrains.annotations.NotNull
+import javasabr.rlib.collections.array.Array
+import javasabr.rlib.collections.array.IntArray
 import spock.lang.Specification
 
 import java.nio.ByteBuffer
@@ -17,8 +16,7 @@ class SpecificationExtensions extends Specification {
     static final writer = new MqttWritablePacket() {
 
         @Override
-        protected void writeImpl(@NotNull ByteBuffer buffer) {
-        }
+        protected void writeImpl(ByteBuffer buffer) {}
     }
 
     static ByteBuffer putMbi(ByteBuffer self, int value) {
@@ -68,7 +66,7 @@ class SpecificationExtensions extends Specification {
         return self
     }
 
-    static ByteBuffer putProperty(ByteBuffer self, PacketProperty property, IntegerArray values) {
+    static ByteBuffer putProperty(ByteBuffer self, PacketProperty property, IntArray values) {
         values.each { writer.writeProperty(self, property, it) }
         return self
     }

src/test/groovy/com/ss/mqtt/broker/test/integration/ExternalConnectionTest.groovy

@@ -9,7 +9,6 @@ import com.ss.mqtt.broker.model.QoS
 import com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode
 import com.ss.mqtt.broker.network.packet.in.ConnectAckInPacket
 import com.ss.mqtt.broker.network.packet.out.Connect311OutPacket
-import com.ss.rlib.common.util.ArrayUtils
 
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.CompletionException

src/test/groovy/com/ss/mqtt/broker/test/integration/PublishRetryTest.groovy

@@ -20,7 +20,6 @@ import com.ss.mqtt.broker.network.packet.out.PublishReceived5OutPacket
 import com.ss.mqtt.broker.network.packet.out.Subscribe311OutPacket
 import com.ss.mqtt.broker.network.packet.out.Subscribe5OutPacket
 import com.ss.mqtt.broker.service.MqttSessionService
-import com.ss.rlib.common.util.array.Array
 import org.springframework.beans.factory.annotation.Autowired
 
 class PublishRetryTest extends IntegrationSpecification {

src/test/groovy/com/ss/mqtt/broker/test/integration/config/MqttBrokerTestConfig.groovy

@@ -3,9 +3,7 @@ package com.ss.mqtt.broker.test.integration.config
 import com.ss.mqtt.broker.config.MqttBrokerConfig
 import com.ss.mqtt.broker.config.MqttNetworkConfig
 import com.ss.mqtt.broker.network.MqttConnection
-import com.ss.rlib.network.server.ServerNetwork
-import org.jetbrains.annotations.NotNull
-import org.springframework.beans.factory.annotation.Autowired
+import javasabr.rlib.network.server.ServerNetwork
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

src/test/groovy/com/ss/mqtt/broker/test/integration/service/ClientIdRegistryTest.groovy

@@ -3,7 +3,6 @@ package com.ss.mqtt.broker.test.integration.service
 import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
 import com.ss.mqtt.broker.service.ClientIdRegistry
 import com.ss.mqtt.broker.test.integration.IntegrationSpecification
-import com.ss.rlib.common.util.StringUtils
 import org.springframework.beans.factory.annotation.Autowired
 
 class ClientIdRegistryTest extends IntegrationSpecification {

src/test/groovy/com/ss/mqtt/broker/test/mock/MqttMockClient.groovy

@@ -3,14 +3,12 @@ package com.ss.mqtt.broker.test.mock
 import com.ss.mqtt.broker.network.MqttConnection
 import com.ss.mqtt.broker.network.packet.PacketType
 import com.ss.mqtt.broker.network.packet.in.ConnectAckInPacket
-import com.ss.mqtt.broker.network.packet.in.ConnectInPacket
 import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket
 import com.ss.mqtt.broker.network.packet.in.PublishInPacket
 import com.ss.mqtt.broker.network.packet.in.PublishReleaseInPacket
 import com.ss.mqtt.broker.network.packet.in.SubscribeAckInPacket
 import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket
 import com.ss.mqtt.broker.util.MqttDataUtils
-import com.ss.rlib.common.util.NumberUtils
 
 import java.nio.ByteBuffer
 

src/test/groovy/com/ss/mqtt/broker/test/network/NetworkUnitSpecification.groovy

@@ -11,9 +11,9 @@ import com.ss.mqtt.broker.model.reason.code.UnsubscribeAckReasonCode
 import com.ss.mqtt.broker.network.MqttConnection
 import com.ss.mqtt.broker.network.client.MqttClient
 import com.ss.mqtt.broker.test.UnitSpecification
-import com.ss.rlib.common.util.array.Array
-import com.ss.rlib.common.util.array.ArrayFactory
-import com.ss.rlib.common.util.array.IntegerArray
+import javasabr.rlib.collections.array.Array
+import javasabr.rlib.collections.array.ArrayFactory
+import javasabr.rlib.collections.array.IntArray
 import spock.lang.Shared
 
 import java.nio.charset.StandardCharsets
@@ -91,7 +91,7 @@ class NetworkUnitSpecification extends UnitSpecification {
         new StringPair("key2", "val2"),
         new StringPair("key3", "val3"),
     )
-    public static final subscriptionIds = IntegerArray.of(subscriptionId, subscriptionId2)
+    public static final subscriptionIds = IntArray.of(subscriptionId, subscriptionId2)
     public static final topicFilters = Array.of(topicFilter, topicFilter2)
     public static final topicFiltersObj311 = Array.of(topicFilter1Obj311, topicFilter2Obj311)
     public static final topicFiltersObj5 = Array.of(topicFilter1Obj5, topicFilter2Obj5)

src/test/groovy/com/ss/mqtt/broker/test/network/in/AuthenticationInPacketTest.groovy

@@ -3,8 +3,8 @@ package com.ss.mqtt.broker.test.network.in
 import com.ss.mqtt.broker.model.reason.code.AuthenticateReasonCode
 import com.ss.mqtt.broker.model.PacketProperty
 import com.ss.mqtt.broker.network.packet.in.AuthenticationInPacket
-import com.ss.rlib.common.util.BufferUtils
-import com.ss.rlib.common.util.array.Array
+import javasabr.rlib.common.util.BufferUtils
+import javasabr.rlib.collections.array.Array
 
 class AuthenticationInPacketTest extends BaseInPacketTest {
 

src/test/groovy/com/ss/mqtt/broker/test/network/in/ConnectAckInPacketTest.groovy

@@ -5,8 +5,8 @@ import com.ss.mqtt.broker.model.MqttPropertyConstants
 import com.ss.mqtt.broker.model.PacketProperty
 import com.ss.mqtt.broker.model.QoS
 import com.ss.mqtt.broker.network.packet.in.ConnectAckInPacket
-import com.ss.rlib.common.util.ArrayUtils
-import com.ss.rlib.common.util.BufferUtils
+import javasabr.rlib.common.util.ArrayUtils
+import javasabr.rlib.common.util.BufferUtils
 
 class ConnectAckInPacketTest extends BaseInPacketTest {
 

src/test/groovy/com/ss/mqtt/broker/test/network/in/ConnectInPacketTest.groovy

@@ -4,8 +4,8 @@ import com.ss.mqtt.broker.exception.MalformedPacketMqttException
 import com.ss.mqtt.broker.model.MqttVersion
 import com.ss.mqtt.broker.model.PacketProperty
 import com.ss.mqtt.broker.network.packet.in.ConnectInPacket
-import com.ss.rlib.common.util.ArrayUtils
-import com.ss.rlib.common.util.BufferUtils
+import javasabr.rlib.common.util.ArrayUtils
+import javasabr.rlib.common.util.BufferUtils
 
 class ConnectInPacketTest extends BaseInPacketTest {