Skip to content

Commit db2e2eb

Browse files
JavaSaBrJavaSaBr
authored
Update to rlib 10.alpha4 (#46)
* update gradle configuration * finish updating to new rlib
1 parent 072b95a commit db2e2eb

File tree

83 files changed

+194
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+194
-207
lines changed

‎application/build.gradle‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
plugins {
2-
id "java"
3-
id "groovy"
4-
id "org.springframework.boot"
2+
id("java-library")
3+
id("configure-java")
4+
id("groovy")
5+
id("org.springframework.boot")
56
}
67

7-
apply from: "$rootDir/gradle/configure-java.gradle"
8-
98
dependencies {
109
implementation projects.service
1110
implementation libs.rlib.logger.slf4j

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
package javasabr.mqtt.application.config;
22

3-
import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;
43
import javasabr.mqtt.network.handler.MqttClientReleaseHandler;
4+
import javasabr.mqtt.network.handler.PacketInHandler;
5+
import javasabr.mqtt.network.handler.PublishInHandler;
6+
import javasabr.mqtt.network.packet.PacketType;
7+
import javasabr.mqtt.service.AuthenticationService;
8+
import javasabr.mqtt.service.ClientIdRegistry;
9+
import javasabr.mqtt.service.CredentialSource;
10+
import javasabr.mqtt.service.MqttSessionService;
11+
import javasabr.mqtt.service.PublishingService;
12+
import javasabr.mqtt.service.SubscriptionService;
13+
import javasabr.mqtt.service.handler.client.DefaultMqttClientReleaseHandler;
514
import javasabr.mqtt.service.handler.in.ConnectInPacketHandler;
615
import javasabr.mqtt.service.handler.in.DisconnetInPacketHandler;
7-
import javasabr.mqtt.network.handler.PacketInHandler;
816
import javasabr.mqtt.service.handler.in.PublishAckInPacketHandler;
917
import javasabr.mqtt.service.handler.in.PublishCompleteInPacketHandler;
1018
import javasabr.mqtt.service.handler.in.PublishInPacketHandler;
1119
import javasabr.mqtt.service.handler.in.PublishReceiveInPacketHandler;
1220
import javasabr.mqtt.service.handler.in.PublishReleaseInPacketHandler;
1321
import javasabr.mqtt.service.handler.in.SubscribeInPacketHandler;
1422
import javasabr.mqtt.service.handler.in.UnsubscribeInPacketHandler;
15-
import javasabr.mqtt.network.handler.PublishInHandler;
1623
import javasabr.mqtt.service.handler.publish.in.Qos0PublishInHandler;
1724
import javasabr.mqtt.service.handler.publish.in.Qos1PublishInHandler;
1825
import javasabr.mqtt.service.handler.publish.in.Qos2PublishInHandler;
1926
import javasabr.mqtt.service.handler.publish.out.PublishOutHandler;
2027
import javasabr.mqtt.service.handler.publish.out.Qos0PublishOutHandler;
2128
import javasabr.mqtt.service.handler.publish.out.Qos1PublishOutHandler;
2229
import javasabr.mqtt.service.handler.publish.out.Qos2PublishOutHandler;
23-
import javasabr.mqtt.network.packet.PacketType;
24-
import javasabr.mqtt.service.AuthenticationService;
25-
import javasabr.mqtt.service.ClientIdRegistry;
26-
import javasabr.mqtt.service.CredentialSource;
27-
import javasabr.mqtt.service.MqttSessionService;
28-
import javasabr.mqtt.service.PublishingService;
29-
import javasabr.mqtt.service.SubscriptionService;
3030
import javasabr.mqtt.service.impl.DefaultPublishingService;
3131
import javasabr.mqtt.service.impl.FileCredentialsSource;
3232
import javasabr.mqtt.service.impl.InMemoryClientIdRegistry;

‎application/src/main/java/javasabr/mqtt/application/config/MqttNetworkConfig.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package javasabr.mqtt.application.config;
22

3-
import javasabr.mqtt.network.handler.MqttClientReleaseHandler;
4-
import javasabr.mqtt.network.handler.PacketInHandler;
5-
import javasabr.mqtt.model.MqttProperties;
6-
import javasabr.mqtt.model.QoS;
7-
import javasabr.mqtt.network.MqttConnection;
8-
import javasabr.mqtt.network.client.ExternalMqttClient;
9-
import javasabr.mqtt.network.client.InternalMqttClient;
10-
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
113
import java.net.InetSocketAddress;
124
import java.nio.channels.AsynchronousSocketChannel;
135
import java.util.function.BiFunction;
146
import java.util.function.Consumer;
7+
import javasabr.mqtt.model.MqttProperties;
158
import javasabr.mqtt.model.MqttServerConnectionConfig;
9+
import javasabr.mqtt.model.QoS;
10+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
11+
import javasabr.mqtt.network.MqttConnection;
12+
import javasabr.mqtt.network.client.ExternalMqttClient;
13+
import javasabr.mqtt.network.client.InternalMqttClient;
14+
import javasabr.mqtt.network.handler.MqttClientReleaseHandler;
15+
import javasabr.mqtt.network.handler.PacketInHandler;
1616
import javasabr.mqtt.network.packet.in.MqttReadablePacket;
1717
import javasabr.rlib.network.BufferAllocator;
1818
import javasabr.rlib.network.Network;

‎application/src/test/groovy/javasabr/mqtt/application/extension/SpecificationExtensions.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package javasabr.mqtt.application.extension
22

3-
import javasabr.mqtt.network.MqttConnection
4-
import javasabr.mqtt.network.packet.out.MqttWritablePacket
5-
import javasabr.mqtt.network.utils.MqttDataUtils
63
import javasabr.mqtt.model.PacketProperty
74
import javasabr.mqtt.model.data.type.PacketDataType
85
import javasabr.mqtt.model.data.type.StringPair
6+
import javasabr.mqtt.network.MqttConnection
7+
import javasabr.mqtt.network.packet.out.MqttWritablePacket
8+
import javasabr.mqtt.network.utils.MqttDataUtils
99
import javasabr.rlib.collections.array.Array
1010
import javasabr.rlib.collections.array.IntArray
1111
import spock.lang.Specification

‎application/src/test/groovy/javasabr/mqtt/application/integration/ExternalConnectionTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException
44
import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode
55
import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException
66
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
7-
import javasabr.mqtt.network.packet.in.ConnectAckInPacket
8-
import javasabr.mqtt.network.packet.out.Connect311OutPacket
97
import javasabr.mqtt.model.MqttProperties
108
import javasabr.mqtt.model.QoS
119
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode
10+
import javasabr.mqtt.network.packet.in.ConnectAckInPacket
11+
import javasabr.mqtt.network.packet.out.Connect311OutPacket
1212
import javasabr.rlib.common.util.ArrayUtils
1313
import spock.lang.Ignore
1414

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ package javasabr.mqtt.application.integration
33
import com.hivemq.client.mqtt.MqttClient
44
import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient
55
import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient
6-
import javasabr.mqtt.network.MqttConnection
76
import javasabr.mqtt.application.integration.config.MqttBrokerTestConfig
87
import javasabr.mqtt.application.mock.MqttMockClient
9-
import javasabr.mqtt.model.MqttServerConnectionConfig
108
import javasabr.mqtt.model.MqttProperties
9+
import javasabr.mqtt.model.MqttServerConnectionConfig
1110
import javasabr.mqtt.model.MqttVersion
11+
import javasabr.mqtt.network.MqttConnection
1212
import org.springframework.beans.factory.annotation.Autowired
1313
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig
1414
import spock.lang.Specification
1515

1616
import java.nio.charset.StandardCharsets
1717
import java.util.concurrent.atomic.AtomicInteger
1818

19-
import static javasabr.mqtt.network.MqttClient.*
19+
import static javasabr.mqtt.network.MqttClient.UnsafeMqttClient
2020

2121
@SpringJUnitConfig(classes = MqttBrokerTestConfig)
2222
class IntegrationSpecification extends Specification {

‎application/src/test/groovy/javasabr/mqtt/application/integration/PublishRetryTest.groovy‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,19 @@
11
package javasabr.mqtt.application.integration
22

33
import com.hivemq.client.mqtt.datatypes.MqttQos
4-
import javasabr.mqtt.network.packet.in.ConnectAckInPacket
5-
import javasabr.mqtt.network.packet.in.PublishInPacket
6-
import javasabr.mqtt.network.packet.in.PublishReleaseInPacket
7-
import javasabr.mqtt.network.packet.in.SubscribeAckInPacket
8-
import javasabr.mqtt.network.packet.out.Connect311OutPacket
9-
import javasabr.mqtt.network.packet.out.Connect5OutPacket
10-
import javasabr.mqtt.network.packet.out.PublishComplete311OutPacket
11-
import javasabr.mqtt.network.packet.out.PublishComplete5OutPacket
12-
import javasabr.mqtt.network.packet.out.PublishReceived311OutPacket
13-
import javasabr.mqtt.network.packet.out.PublishReceived5OutPacket
14-
import javasabr.mqtt.network.packet.out.Subscribe311OutPacket
15-
import javasabr.mqtt.network.packet.out.Subscribe5OutPacket
16-
import javasabr.mqtt.service.MqttSessionService
174
import javasabr.mqtt.model.QoS
185
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode
196
import javasabr.mqtt.model.reason.code.PublishCompletedReasonCode
207
import javasabr.mqtt.model.reason.code.PublishReceivedReasonCode
218
import javasabr.mqtt.model.reason.code.SubscribeAckReasonCode
229
import javasabr.mqtt.model.subscriber.SubscribeTopicFilter
10+
import javasabr.mqtt.network.packet.in.ConnectAckInPacket
11+
import javasabr.mqtt.network.packet.in.PublishInPacket
12+
import javasabr.mqtt.network.packet.in.PublishReleaseInPacket
13+
import javasabr.mqtt.network.packet.in.SubscribeAckInPacket
14+
import javasabr.mqtt.network.packet.out.*
15+
import javasabr.mqtt.service.MqttSessionService
2316
import javasabr.rlib.collections.array.Array
24-
import javasabr.rlib.logger.api.LoggerLevel
25-
import javasabr.rlib.logger.api.LoggerManager
26-
import javasabr.rlib.network.packet.impl.AbstractNetworkPacketReader
2717
import org.springframework.beans.factory.annotation.Autowired
2818

2919
class PublishRetryTest extends IntegrationSpecification {

‎application/src/test/groovy/javasabr/mqtt/application/integration/service/ClientIdRegistryTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package javasabr.mqtt.application.integration.service
22

33
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
4-
import javasabr.mqtt.service.ClientIdRegistry
54
import javasabr.mqtt.application.integration.IntegrationSpecification
5+
import javasabr.mqtt.service.ClientIdRegistry
66
import javasabr.rlib.common.util.StringUtils
77
import org.springframework.beans.factory.annotation.Autowired
88

‎application/src/test/groovy/javasabr/mqtt/application/integration/service/MqttSessionServiceTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package javasabr.mqtt.application.integration.service
22

33
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode
4+
import javasabr.mqtt.application.integration.IntegrationSpecification
45
import javasabr.mqtt.service.ClientIdRegistry
56
import javasabr.mqtt.service.MqttSessionService
6-
import javasabr.mqtt.application.integration.IntegrationSpecification
77
import org.springframework.beans.factory.annotation.Autowired
88

99
class MqttSessionServiceTest extends IntegrationSpecification {

‎application/src/test/groovy/javasabr/mqtt/application/integration/service/SubscribtionServiceTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package javasabr.mqtt.application.integration.service
22

33
import com.hivemq.client.mqtt.datatypes.MqttQos
44
import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException
5-
import javasabr.mqtt.service.ClientIdRegistry
6-
import javasabr.mqtt.service.impl.SimpleSubscriptionService
75
import javasabr.mqtt.application.integration.IntegrationSpecification
86
import javasabr.mqtt.model.ActionResult
97
import javasabr.mqtt.model.subscriber.SingleSubscriber
8+
import javasabr.mqtt.service.ClientIdRegistry
9+
import javasabr.mqtt.service.impl.SimpleSubscriptionService
1010
import org.spockframework.util.Pair
1111
import org.springframework.beans.factory.annotation.Autowired
1212
import spock.lang.Unroll

0 commit comments

Comments
 (0)