Skip to content

Commit 0bf4507

Browse files
JavaSaBrJavaSaBr
committed
migrate to updated rlib
1 parent d3e7199 commit 0bf4507

File tree

60 files changed

+193
-190
lines changed

Some content is hidden

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

60 files changed

+193
-190
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,15 @@ class IntegrationSpecification extends Specification {
149149
return Stub(MqttConnection) {
150150
isSupported(MqttVersion.MQTT_5) >> true
151151
isSupported(MqttVersion.MQTT_3_1_1) >> true
152-
getConfig() >> deviceConnectionConfig
153-
getClient() >> Stub(UnsafeMqttClient) {
152+
config() >> deviceConnectionConfig
153+
client() >> Stub(UnsafeMqttClient) {
154154
connectionConfig() >> deviceConnectionConfig
155155
sessionExpiryInterval() >> MqttProperties.SESSION_EXPIRY_INTERVAL_DISABLED
156-
receiveMax() >> deviceConnectionConfig.getReceiveMaximum()
157-
maximumPacketSize() >> deviceConnectionConfig.getMaximumPacketSize()
156+
receiveMax() >> deviceConnectionConfig.receiveMaximum()
157+
maximumPacketSize() >> deviceConnectionConfig.maximumPacketSize()
158158
clientId() >> IntegrationSpecification.clientId
159159
keepAlive() >> MqttProperties.SERVER_KEEP_ALIVE_DEFAULT
160-
topicAliasMaximum() >> deviceConnectionConfig.getTopicAliasMaximum()
160+
topicAliasMaximum() >> deviceConnectionConfig.topicAliasMaximum()
161161
}
162162
}
163163
}
@@ -166,15 +166,15 @@ class IntegrationSpecification extends Specification {
166166
return Stub(MqttConnection) {
167167
isSupported(MqttVersion.MQTT_5) >> false
168168
isSupported(MqttVersion.MQTT_3_1_1) >> true
169-
getConfig() >> deviceConnectionConfig
170-
getClient() >> Stub(UnsafeMqttClient) {
169+
config() >> deviceConnectionConfig
170+
client() >> Stub(UnsafeMqttClient) {
171171
connectionConfig() >> deviceConnectionConfig
172172
sessionExpiryInterval() >> MqttProperties.SESSION_EXPIRY_INTERVAL_DISABLED
173-
receiveMax() >> deviceConnectionConfig.getReceiveMaximum()
174-
maximumPacketSize() >> deviceConnectionConfig.getMaximumPacketSize()
173+
receiveMax() >> deviceConnectionConfig.receiveMaximum()
174+
maximumPacketSize() >> deviceConnectionConfig.maximumPacketSize()
175175
clientId() >> IntegrationSpecification.clientId
176176
keepAlive() >> MqttProperties.SERVER_KEEP_ALIVE_DEFAULT
177-
topicAliasMaximum() >> deviceConnectionConfig.getTopicAliasMaximum()
177+
topicAliasMaximum() >> deviceConnectionConfig.topicAliasMaximum()
178178
}
179179
}
180180
}

‎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
@@ -32,7 +32,7 @@ class MqttSessionServiceTest extends IntegrationSpecification {
3232
then:
3333
restored != null
3434
when:
35-
mqttSessionService.store(clientId, restored, externalConnectionConfig.getDefaultSessionExpiryInterval()).block()
35+
mqttSessionService.store(clientId, restored, externalConnectionConfig.defaultSessionExpiryInterval()).block()
3636
client.connect().join()
3737
shouldNoSession = mqttSessionService.restore(clientId).block()
3838
then:

‎model/src/main/java/javasabr/mqtt/model/MqttConnectionConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import lombok.Getter;
44
import lombok.RequiredArgsConstructor;
5+
import lombok.experimental.Accessors;
56

67
@Getter
78
@RequiredArgsConstructor
9+
@Accessors(fluent = true, chain = false)
810
public class MqttConnectionConfig {
911

1012
private final QoS maxQos;

‎network/src/main/java/javasabr/mqtt/network/DefaultMqttSession.java‎

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

3+
import java.util.Collection;
4+
import java.util.concurrent.atomic.AtomicInteger;
35
import javasabr.mqtt.model.MqttProperties;
4-
import javasabr.mqtt.network.MqttSession.UnsafeMqttSession;
56
import javasabr.mqtt.model.subscriber.SubscribeTopicFilter;
67
import javasabr.mqtt.model.topic.TopicFilter;
8+
import javasabr.mqtt.network.MqttSession.UnsafeMqttSession;
79
import javasabr.mqtt.network.packet.HasPacketId;
810
import javasabr.mqtt.network.packet.in.PublishInPacket;
9-
import java.util.Collection;
10-
import java.util.concurrent.atomic.AtomicInteger;
1111
import javasabr.rlib.collections.array.ArrayFactory;
1212
import javasabr.rlib.collections.array.LockableArray;
1313
import javasabr.rlib.functions.TriConsumer;

‎network/src/main/java/javasabr/mqtt/network/MqttClient.java‎

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

3-
import javasabr.mqtt.network.out.MqttPacketOutFactory;
4-
import javasabr.mqtt.network.packet.out.MqttWritablePacket;
3+
import java.util.concurrent.CompletableFuture;
54
import javasabr.mqtt.model.MqttConnectionConfig;
65
import javasabr.mqtt.model.MqttUser;
76
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode;
7+
import javasabr.mqtt.network.out.MqttPacketOutFactory;
88
import javasabr.mqtt.network.packet.in.MqttReadablePacket;
9-
import java.util.concurrent.CompletableFuture;
9+
import javasabr.mqtt.network.packet.out.MqttWritablePacket;
1010
import org.jspecify.annotations.Nullable;
1111
import reactor.core.publisher.Mono;
1212

‎network/src/main/java/javasabr/mqtt/network/MqttConnection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package javasabr.mqtt.network;
22

3+
import java.nio.channels.AsynchronousSocketChannel;
4+
import java.util.function.Function;
35
import javasabr.mqtt.model.MqttConnectionConfig;
46
import javasabr.mqtt.model.MqttVersion;
57
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
68
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
79
import javasabr.mqtt.network.packet.MqttPacketReader;
810
import javasabr.mqtt.network.packet.MqttPacketWriter;
9-
import java.nio.channels.AsynchronousSocketChannel;
10-
import java.util.function.Function;
1111
import javasabr.rlib.network.BufferAllocator;
1212
import javasabr.rlib.network.Network;
1313
import javasabr.rlib.network.impl.AbstractConnection;

‎network/src/main/java/javasabr/mqtt/network/MqttSession.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package javasabr.mqtt.network;
22

3-
import javasabr.mqtt.network.packet.HasPacketId;
4-
import javasabr.mqtt.network.packet.in.PublishInPacket;
53
import javasabr.mqtt.model.subscriber.SubscribeTopicFilter;
64
import javasabr.mqtt.model.topic.TopicFilter;
5+
import javasabr.mqtt.network.packet.HasPacketId;
6+
import javasabr.mqtt.network.packet.in.PublishInPacket;
77
import javasabr.rlib.functions.TriConsumer;
88

99
public interface MqttSession {
@@ -24,7 +24,7 @@ interface PendingPacketHandler {
2424
/**
2525
* @return true if pending packet can be removed.
2626
*/
27-
boolean handleResponse(MqttClient client, HasPacketId<?> response);
27+
boolean handleResponse(MqttClient client, HasPacketId response);
2828

2929
default void resend(MqttClient client, PublishInPacket packet, int packetId) {}
3030
}
@@ -52,9 +52,9 @@ default void resend(MqttClient client, PublishInPacket packet, int packetId) {}
5252

5353
void registerInPublish(PublishInPacket publish, PendingPacketHandler handler, int packetId);
5454

55-
void updateOutPendingPacket(MqttClient client, HasPacketId<?> response);
55+
void updateOutPendingPacket(MqttClient client, HasPacketId response);
5656

57-
void updateInPendingPacket(MqttClient client, HasPacketId<?> response);
57+
void updateInPendingPacket(MqttClient client, HasPacketId response);
5858

5959
<A, B> void forEachTopicFilter(
6060
A arg1,

‎network/src/main/java/javasabr/mqtt/network/client/AbstractMqttClient.java‎

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

3+
import java.util.concurrent.CompletableFuture;
4+
import java.util.concurrent.atomic.AtomicBoolean;
5+
import javasabr.mqtt.base.utils.DebugUtils;
36
import javasabr.mqtt.model.MqttConnectionConfig;
4-
import javasabr.mqtt.network.MqttSession;
57
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode;
6-
import javasabr.mqtt.network.MqttConnection;
78
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
9+
import javasabr.mqtt.network.MqttConnection;
10+
import javasabr.mqtt.network.MqttSession;
811
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
912
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
1013
import javasabr.mqtt.network.out.MqttPacketOutFactories;
1114
import javasabr.mqtt.network.out.MqttPacketOutFactory;
1215
import javasabr.mqtt.network.packet.in.MqttReadablePacket;
1316
import javasabr.mqtt.network.packet.out.MqttWritablePacket;
14-
import javasabr.mqtt.base.utils.DebugUtils;
15-
import java.util.concurrent.CompletableFuture;
16-
import java.util.concurrent.atomic.AtomicBoolean;
1717
import lombok.AccessLevel;
1818
import lombok.CustomLog;
1919
import lombok.Getter;
@@ -60,11 +60,11 @@ public AbstractMqttClient(MqttConnection connection, MqttClientReleaseHandler re
6060
this.releaseHandler = releaseHandler;
6161
this.released = new AtomicBoolean(false);
6262
this.clientId = connection.remoteAddress();
63-
this.sessionExpiryInterval = config.getDefaultSessionExpiryInterval();
64-
this.receiveMax = config.getReceiveMaximum();
65-
this.maximumPacketSize = config.getMaximumPacketSize();
66-
this.topicAliasMaximum = config.getTopicAliasMaximum();
67-
this.keepAlive = config.getMinKeepAliveTime();
63+
this.sessionExpiryInterval = config.defaultSessionExpiryInterval();
64+
this.receiveMax = config.receiveMaximum();
65+
this.maximumPacketSize = config.maximumPacketSize();
66+
this.topicAliasMaximum = config.topicAliasMaximum();
67+
this.keepAlive = config.minKeepAliveTime();
6868
}
6969

7070
@Override

‎network/src/main/java/javasabr/mqtt/network/client/ExternalMqttClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package javasabr.mqtt.network.client;
22

3-
import javasabr.mqtt.network.MqttConnection;
43
import javasabr.mqtt.base.utils.DebugUtils;
4+
import javasabr.mqtt.network.MqttConnection;
55
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
66

77
public class ExternalMqttClient extends AbstractMqttClient {

‎network/src/main/java/javasabr/mqtt/network/client/InternalMqttClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package javasabr.mqtt.network.client;
22

3-
import javasabr.mqtt.network.MqttConnection;
43
import javasabr.mqtt.base.utils.DebugUtils;
4+
import javasabr.mqtt.network.MqttConnection;
55
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
66

77
public class InternalMqttClient extends AbstractMqttClient {

0 commit comments

Comments
 (0)