Skip to content

Commit 765acd7

Browse files
JavaSaBrJavaSaBr
committed
continue restructuring project
1 parent 7667143 commit 765acd7

File tree

88 files changed

+390
-398
lines changed

Some content is hidden

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

88 files changed

+390
-398
lines changed

‎legacy/src/main/java/javasabr/mqtt/legacy/util/DebugUtils.java‎ renamed to ‎base/src/main/java/javasabr/mqtt/base/utils/DebugUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.mqtt.legacy.util;
1+
package javasabr.mqtt.base.utils;
22

33
import com.google.gson.ExclusionStrategy;
44
import com.google.gson.FieldAttributes;

‎legacy/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55
apply from: "$rootDir/gradle/configure-java.gradle"
66

77
dependencies {
8+
implementation projects.model
9+
implementation projects.base
810

911
testImplementation projects.testSupport
1012
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import javasabr.mqtt.legacy.network.MqttConnection;
88
import javasabr.mqtt.legacy.network.client.ExternalMqttClient;
99
import javasabr.mqtt.legacy.network.client.InternalMqttClient;
10-
import javasabr.mqtt.model.network.MqttClient.UnsafeMqttClient;
10+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
1111
import java.net.InetSocketAddress;
1212
import java.nio.channels.AsynchronousSocketChannel;
1313
import java.util.function.BiFunction;
1414
import java.util.function.Consumer;
15-
import javasabr.mqtt.model.network.connection.MqttConnectionConfig;
15+
import javasabr.mqtt.model.MqttConnectionConfig;
1616
import javasabr.rlib.network.BufferAllocator;
1717
import javasabr.rlib.network.Network;
1818
import javasabr.rlib.network.NetworkFactory;

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

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

33
import javasabr.mqtt.legacy.network.client.AbstractMqttClient;
4-
import javasabr.mqtt.legacy.network.client.MqttClient.UnsafeMqttClient;
4+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
55
import javasabr.mqtt.legacy.service.ClientIdRegistry;
66
import javasabr.mqtt.legacy.service.MqttSessionService;
77
import javasabr.mqtt.legacy.service.SubscriptionService;

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/client/MqttClientReleaseHandler.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.MqttClient.UnsafeMqttClient;
3+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
44
import reactor.core.publisher.Mono;
55

66
public interface MqttClientReleaseHandler {

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/AbstractPacketHandler.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.packet.in;
22

3-
import javasabr.mqtt.legacy.network.client.MqttClient.UnsafeMqttClient;
3+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
44
import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket;
55

66
public abstract class AbstractPacketHandler<C extends UnsafeMqttClient, R extends MqttReadablePacket> implements

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

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

3-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.MAXIMUM_PACKET_SIZE_UNDEFINED;
4-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.RECEIVE_MAXIMUM_UNDEFINED;
5-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.SERVER_KEEP_ALIVE_DISABLED;
6-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.SESSION_EXPIRY_INTERVAL_DISABLED;
7-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.SESSION_EXPIRY_INTERVAL_UNDEFINED;
8-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.TOPIC_ALIAS_MAXIMUM_DISABLED;
9-
import static javasabr.mqtt.legacy.model.MqttPropertyConstants.TOPIC_ALIAS_MAXIMUM_UNDEFINED;
10-
import static javasabr.mqtt.legacy.model.reason.code.ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD;
11-
import static javasabr.mqtt.legacy.model.reason.code.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID;
3+
import static javasabr.mqtt.model.MqttProperties.MAXIMUM_PACKET_SIZE_UNDEFINED;
4+
import static javasabr.mqtt.model.MqttProperties.RECEIVE_MAXIMUM_UNDEFINED;
5+
import static javasabr.mqtt.model.MqttProperties.SERVER_KEEP_ALIVE_DISABLED;
6+
import static javasabr.mqtt.model.MqttProperties.SESSION_EXPIRY_INTERVAL_DISABLED;
7+
import static javasabr.mqtt.model.MqttProperties.SESSION_EXPIRY_INTERVAL_UNDEFINED;
8+
import static javasabr.mqtt.model.MqttProperties.TOPIC_ALIAS_MAXIMUM_DISABLED;
9+
import static javasabr.mqtt.model.MqttProperties.TOPIC_ALIAS_MAXIMUM_UNDEFINED;
10+
import static javasabr.mqtt.model.reason.code.ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD;
11+
import static javasabr.mqtt.model.reason.code.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID;
1212
import static javasabr.mqtt.legacy.util.ReactorUtils.ifTrue;
1313

1414
import javasabr.mqtt.legacy.exception.ConnectionRejectException;
1515
import javasabr.mqtt.legacy.exception.MalformedPacketMqttException;
16-
import javasabr.mqtt.legacy.model.MqttSession;
17-
import javasabr.mqtt.legacy.model.MqttVersion;
18-
import javasabr.mqtt.legacy.model.reason.code.ConnectAckReasonCode;
19-
import javasabr.mqtt.legacy.network.client.MqttClient.UnsafeMqttClient;
16+
import javasabr.mqtt.legacy.network.MqttSession;
17+
import javasabr.mqtt.model.MqttVersion;
18+
import javasabr.mqtt.model.reason.code.ConnectAckReasonCode;
19+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
2020
import javasabr.mqtt.legacy.network.packet.in.ConnectInPacket;
2121
import javasabr.mqtt.legacy.service.AuthenticationService;
2222
import javasabr.mqtt.legacy.service.ClientIdRegistry;

‎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,7 +1,7 @@
11
package javasabr.mqtt.legacy.handler.packet.in;
22

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

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PacketInHandler.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.packet.in;
22

3-
import javasabr.mqtt.legacy.network.client.MqttClient;
3+
import javasabr.mqtt.legacy.network.MqttClient;
44
import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket;
55

66
public interface PacketInHandler {

‎legacy/src/main/java/javasabr/mqtt/legacy/handler/packet/in/PendingOutResponseInPacketHandler.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.packet.in;
22

3-
import javasabr.mqtt.legacy.network.client.MqttClient.UnsafeMqttClient;
3+
import javasabr.mqtt.legacy.network.MqttClient.UnsafeMqttClient;
44
import javasabr.mqtt.legacy.network.packet.HasPacketId;
55
import javasabr.mqtt.legacy.network.packet.in.MqttReadablePacket;
66
import lombok.RequiredArgsConstructor;

0 commit comments

Comments
 (0)