Skip to content

Commit b7027a4

Browse files
crazyrokrcrazyrokr
authored
Merge pull request #19 from JavaSaBr/feature-broker-18
[broker-18] update project structure
2 parents e5ab083 + d05de40 commit b7027a4

File tree

88 files changed

+171
-167
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

+171
-167
lines changed

‎src/main/java/com/ss/mqtt/broker/config/MqttBrokerConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.ss.mqtt.broker.config;
22

3+
import com.ss.mqtt.broker.handler.packet.in.*;
34
import com.ss.mqtt.broker.model.MqttPropertyConstants;
45
import com.ss.mqtt.broker.model.QoS;
56
import com.ss.mqtt.broker.network.MqttConnection;
6-
import com.ss.mqtt.broker.network.client.MqttClientReleaseHandler;
7-
import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
8-
import com.ss.mqtt.broker.network.client.impl.DeviceMqttClient;
9-
import com.ss.mqtt.broker.network.client.impl.DeviceMqttClientReleaseHandler;
7+
import com.ss.mqtt.broker.handler.client.MqttClientReleaseHandler;
8+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
9+
import com.ss.mqtt.broker.network.client.DeviceMqttClient;
10+
import com.ss.mqtt.broker.handler.client.DeviceMqttClientReleaseHandler;
1011
import com.ss.mqtt.broker.network.packet.PacketType;
11-
import com.ss.mqtt.broker.network.packet.in.handler.*;
1212
import com.ss.mqtt.broker.service.*;
1313
import com.ss.mqtt.broker.service.impl.*;
1414
import com.ss.rlib.network.BufferAllocator;

‎src/main/java/com/ss/mqtt/broker/exception/ConnectionRejectException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ss.mqtt.broker.exception;
22

3-
import com.ss.mqtt.broker.model.ConnectAckReasonCode;
3+
import com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode;
44
import lombok.Getter;
55
import org.jetbrains.annotations.NotNull;
66

‎src/main/java/com/ss/mqtt/broker/network/packet/factory/Mqtt311PacketOutFactory.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/factory/packet/out/Mqtt311PacketOutFactory.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.ss.mqtt.broker.network.packet.factory;
1+
package com.ss.mqtt.broker.factory.packet.out;
22

33
import com.ss.mqtt.broker.model.*;
4+
import com.ss.mqtt.broker.model.data.type.StringPair;
5+
import com.ss.mqtt.broker.model.reason.code.*;
46
import com.ss.mqtt.broker.network.client.MqttClient;
57
import com.ss.mqtt.broker.network.packet.out.*;
68
import com.ss.rlib.common.util.array.Array;

‎src/main/java/com/ss/mqtt/broker/network/packet/factory/Mqtt5PacketOutFactory.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/factory/packet/out/Mqtt5PacketOutFactory.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.ss.mqtt.broker.network.packet.factory;
1+
package com.ss.mqtt.broker.factory.packet.out;
22

33
import com.ss.mqtt.broker.model.*;
4+
import com.ss.mqtt.broker.model.data.type.StringPair;
5+
import com.ss.mqtt.broker.model.reason.code.*;
46
import com.ss.mqtt.broker.network.client.MqttClient;
57
import com.ss.mqtt.broker.network.packet.out.*;
68
import com.ss.rlib.common.util.array.Array;

‎src/main/java/com/ss/mqtt/broker/network/packet/factory/MqttPacketOutFactory.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/factory/packet/out/MqttPacketOutFactory.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.ss.mqtt.broker.network.packet.factory;
1+
package com.ss.mqtt.broker.factory.packet.out;
22

33
import com.ss.mqtt.broker.model.*;
4+
import com.ss.mqtt.broker.model.data.type.StringPair;
5+
import com.ss.mqtt.broker.model.reason.code.*;
46
import com.ss.mqtt.broker.network.client.MqttClient;
57
import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket;
68
import com.ss.rlib.common.util.ArrayUtils;

‎src/main/java/com/ss/mqtt/broker/network/client/impl/AbstractMqttClientReleaseHandler.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/handler/client/AbstractMqttClientReleaseHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.ss.mqtt.broker.network.client.impl;
1+
package com.ss.mqtt.broker.handler.client;
22

3-
import com.ss.mqtt.broker.network.client.MqttClientReleaseHandler;
4-
import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
3+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
4+
import com.ss.mqtt.broker.network.client.AbstractMqttClient;
55
import com.ss.mqtt.broker.service.ClientIdRegistry;
66
import com.ss.mqtt.broker.service.MqttSessionService;
77
import com.ss.rlib.common.util.StringUtils;

‎src/main/java/com/ss/mqtt/broker/network/client/impl/DeviceMqttClientReleaseHandler.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/handler/client/DeviceMqttClientReleaseHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.ss.mqtt.broker.network.client.impl;
1+
package com.ss.mqtt.broker.handler.client;
22

3+
import com.ss.mqtt.broker.network.client.DeviceMqttClient;
34
import com.ss.mqtt.broker.service.ClientIdRegistry;
45
import com.ss.mqtt.broker.service.MqttSessionService;
56
import org.jetbrains.annotations.NotNull;

‎src/main/java/com/ss/mqtt/broker/network/client/MqttClientReleaseHandler.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/handler/client/MqttClientReleaseHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.ss.mqtt.broker.network.client;
1+
package com.ss.mqtt.broker.handler.client;
22

3+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
34
import org.jetbrains.annotations.NotNull;
45
import reactor.core.publisher.Mono;
56

‎src/main/java/com/ss/mqtt/broker/network/packet/in/handler/AbstractPacketHandler.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/handler/packet/in/AbstractPacketHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.ss.mqtt.broker.network.packet.in.handler;
1+
package com.ss.mqtt.broker.handler.packet.in;
22

3-
import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
3+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
44
import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket;
55
import org.jetbrains.annotations.NotNull;
66

‎src/main/java/com/ss/mqtt/broker/network/packet/in/handler/ConnectInPacketHandler.java‎ renamed to ‎src/main/java/com/ss/mqtt/broker/handler/packet/in/ConnectInPacketHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.ss.mqtt.broker.network.packet.in.handler;
1+
package com.ss.mqtt.broker.handler.packet.in;
22

3-
import static com.ss.mqtt.broker.model.ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD;
4-
import static com.ss.mqtt.broker.model.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID;
3+
import static com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode.BAD_USER_NAME_OR_PASSWORD;
4+
import static com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode.CLIENT_IDENTIFIER_NOT_VALID;
55
import static com.ss.mqtt.broker.model.MqttPropertyConstants.*;
66
import static com.ss.mqtt.broker.util.ReactorUtils.ifTrue;
77
import com.ss.mqtt.broker.exception.ConnectionRejectException;
88
import com.ss.mqtt.broker.exception.MalformedPacketMqttException;
9-
import com.ss.mqtt.broker.model.ConnectAckReasonCode;
9+
import com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode;
1010
import com.ss.mqtt.broker.model.MqttSession;
11-
import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
11+
import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
1212
import com.ss.mqtt.broker.network.packet.in.ConnectInPacket;
1313
import com.ss.mqtt.broker.service.AuthenticationService;
1414
import com.ss.mqtt.broker.service.ClientIdRegistry;

0 commit comments

Comments
 (0)