Skip to content

Commit 258f387

Browse files
JavaSaBrJavaSaBr
committed
extract network module
1 parent 8215ba5 commit 258f387

File tree

159 files changed

+411
-397
lines changed

Some content is hidden

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

159 files changed

+411
-397
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ moquette-broker = "0.17"
3737

3838
[libraries]
3939
rlib-network = { module = "javasabr.rlib:rlib-network", version.ref = "rlib" }
40+
rlib-logger-api = { module = "javasabr.rlib:rlib-logger-api", version.ref = "rlib" }
4041
rlib-logger-slf4j = { module = "javasabr.rlib:rlib-logger-slf4j", version.ref = "rlib" }
4142
rlib-collections = { module = "javasabr.rlib:rlib-collections", version.ref = "rlib" }
4243
springboot-starter-core = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot" }

‎legacy/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ apply from: "$rootDir/gradle/configure-java.gradle"
99
dependencies {
1010
implementation projects.model
1111
implementation projects.base
12+
implementation projects.network
1213

1314
implementation libs.rlib.network
1415
implementation libs.rlib.logger.slf4j

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

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

33
import javasabr.mqtt.legacy.handler.client.DefaultMqttClientReleaseHandler;
4-
import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler;
4+
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
55
import javasabr.mqtt.legacy.handler.packet.in.ConnectInPacketHandler;
66
import javasabr.mqtt.legacy.handler.packet.in.DisconnetInPacketHandler;
7-
import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler;
7+
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
88
import javasabr.mqtt.legacy.handler.packet.in.PublishAckInPacketHandler;
99
import javasabr.mqtt.legacy.handler.packet.in.PublishCompleteInPacketHandler;
1010
import javasabr.mqtt.legacy.handler.packet.in.PublishInPacketHandler;
@@ -20,7 +20,7 @@
2020
import javasabr.mqtt.legacy.handler.publish.out.Qos0PublishOutHandler;
2121
import javasabr.mqtt.legacy.handler.publish.out.Qos1PublishOutHandler;
2222
import javasabr.mqtt.legacy.handler.publish.out.Qos2PublishOutHandler;
23-
import javasabr.mqtt.legacy.network.packet.PacketType;
23+
import javasabr.mqtt.network.packet.PacketType;
2424
import javasabr.mqtt.legacy.service.AuthenticationService;
2525
import javasabr.mqtt.legacy.service.ClientIdRegistry;
2626
import javasabr.mqtt.legacy.service.CredentialSource;

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

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

3-
import javasabr.mqtt.legacy.handler.client.MqttClientReleaseHandler;
4-
import javasabr.mqtt.legacy.handler.packet.in.PacketInHandler;
3+
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
4+
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
55
import javasabr.mqtt.model.MqttProperties;
66
import javasabr.mqtt.model.QoS;
7-
import javasabr.mqtt.legacy.network.MqttConnection;
8-
import javasabr.mqtt.legacy.network.client.ExternalMqttClient;
9-
import javasabr.mqtt.legacy.network.client.InternalMqttClient;
10-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
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;
1111
import java.net.InetSocketAddress;
1212
import java.nio.channels.AsynchronousSocketChannel;
1313
import java.util.function.BiFunction;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/client/AbstractMqttClientReleaseHandler.java‎

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

3-
import javasabr.mqtt.legacy.network.client.AbstractMqttClient;
4-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
3+
import javasabr.mqtt.network.client.AbstractMqttClient;
4+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
55
import javasabr.mqtt.legacy.service.ClientIdRegistry;
66
import javasabr.mqtt.legacy.service.MqttSessionService;
77
import javasabr.mqtt.legacy.service.SubscriptionService;
8+
import javasabr.mqtt.network.handler.client.MqttClientReleaseHandler;
89
import javasabr.rlib.common.util.StringUtils;
910
import lombok.RequiredArgsConstructor;
1011
import lombok.extern.log4j.Log4j2;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/client/DefaultMqttClientReleaseHandler.java‎

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

3-
import javasabr.mqtt.legacy.network.client.ExternalMqttClient;
3+
import javasabr.mqtt.network.client.ExternalMqttClient;
44
import javasabr.mqtt.legacy.service.ClientIdRegistry;
55
import javasabr.mqtt.legacy.service.MqttSessionService;
66
import javasabr.mqtt.legacy.service.SubscriptionService;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/AbstractPacketHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package javasabr.mqtt.legacy.handler.packet.in;
22

3-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
4-
import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket;
3+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
4+
import javasabr.mqtt.network.handler.packet.in.PacketInHandler;
5+
import javasabr.mqtt.network.packet.in.MqttReadablePacket;
56

67
public abstract class AbstractPacketHandler<C extends UnsafeMqttClient, R extends MqttReadablePacket> implements
78
PacketInHandler {

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/ConnectInPacketHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import static javasabr.mqtt.model.reason.code.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID;
1212
import static javasabr.mqtt.legacy.util.ReactorUtils.ifTrue;
1313

14-
import javasabr.mqtt.legacy.exception.ConnectionRejectException;
15-
import javasabr.mqtt.legacy.exception.MalformedPacketMqttException;
16-
import javasabr.mqtt.legacy.network.MqttSession;
14+
import javasabr.mqtt.model.exception.ConnectionRejectException;
15+
import javasabr.mqtt.model.exception.MalformedPacketMqttException;
16+
import javasabr.mqtt.network.MqttSession;
1717
import javasabr.mqtt.model.MqttVersion;
1818
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode;
19-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
20-
import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket;
19+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
20+
import javasabr.mqtt.network.packet.in.ConnectInPacket;
2121
import javasabr.mqtt.legacy.service.AuthenticationService;
2222
import javasabr.mqtt.legacy.service.ClientIdRegistry;
2323
import javasabr.mqtt.legacy.service.MqttSessionService;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/DisconnetInPacketHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package javasabr.mqtt.legacy.handler.packet.in;
22

33
import javasabr.mqtt.model.reason.code.DisconnectReasonCode;
4-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
5-
import javasabr.mqtt.legacy.network.packet.in.DisconnectInPacket;
4+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
5+
import javasabr.mqtt.network.packet.in.DisconnectInPacket;
66
import lombok.extern.log4j.Log4j2;
77

88
@Log4j2

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PendingOutResponseInPacketHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package javasabr.mqtt.legacy.handler.packet.in;
22

3-
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
4-
import javasabr.mqtt.legacy.network.packet.HasPacketId;
5-
import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket;
3+
import javasabr.mqtt.network.MqttClient.UnsafeMqttClient;
4+
import javasabr.mqtt.network.packet.HasPacketId;
5+
import javasabr.mqtt.network.packet.in.MqttReadablePacket;
66
import lombok.RequiredArgsConstructor;
77

88
@RequiredArgsConstructor

0 commit comments

Comments
 (0)