Merge branch 'develop' of https://github.com/JavaSaBr/mqtt-broker into feature-broker-14

� Conflicts:
�	src/main/java/com/ss/mqtt/broker/service/SubscriptionService.java
�	src/main/java/com/ss/mqtt/broker/service/Subscriptions.java
�	src/main/java/com/ss/mqtt/broker/service/impl/SimplePublishingService.java
�	src/main/java/com/ss/mqtt/broker/service/impl/SimpleSubscriptionService.java
�	src/main/java/com/ss/mqtt/broker/service/impl/SimpleSubscriptions.java

Author: crazyrokr

.github/workflows/gradle.yml

@@ -0,0 +1,15 @@
+name: Java CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: joschi/setup-jdk@v1
+      with:
+        java-version: 'openjdk13'
+        architecture: 'x64'
+    - name: Build with Gradle
+      run: ./gradlew build

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

@@ -1,14 +1,14 @@
 package com.ss.mqtt.broker.config;
 
+import com.ss.mqtt.broker.handler.packet.in.*;
 import com.ss.mqtt.broker.model.MqttPropertyConstants;
 import com.ss.mqtt.broker.model.QoS;
 import com.ss.mqtt.broker.network.MqttConnection;
-import com.ss.mqtt.broker.network.client.MqttClientReleaseHandler;
-import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
-import com.ss.mqtt.broker.network.client.impl.DeviceMqttClient;
-import com.ss.mqtt.broker.network.client.impl.DeviceMqttClientReleaseHandler;
+import com.ss.mqtt.broker.handler.client.MqttClientReleaseHandler;
+import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
+import com.ss.mqtt.broker.network.client.DeviceMqttClient;
+import com.ss.mqtt.broker.handler.client.DeviceMqttClientReleaseHandler;
 import com.ss.mqtt.broker.network.packet.PacketType;
-import com.ss.mqtt.broker.network.packet.in.handler.*;
 import com.ss.mqtt.broker.service.*;
 import com.ss.mqtt.broker.service.impl.*;
 import com.ss.rlib.network.BufferAllocator;

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

@@ -1,6 +1,6 @@
 package com.ss.mqtt.broker.exception;
 
-import com.ss.mqtt.broker.model.ConnectAckReasonCode;
+import com.ss.mqtt.broker.model.reason.code.ConnectAckReasonCode;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 

…ket/factory/Mqtt311PacketOutFactory.java …/packet/out/Mqtt311PacketOutFactory.javasrc/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 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

@@ -1,6 +1,8 @@
-package com.ss.mqtt.broker.network.packet.factory;
+package com.ss.mqtt.broker.factory.packet.out;
 
 import com.ss.mqtt.broker.model.*;
+import com.ss.mqtt.broker.model.data.type.StringPair;
+import com.ss.mqtt.broker.model.reason.code.*;
 import com.ss.mqtt.broker.network.client.MqttClient;
 import com.ss.mqtt.broker.network.packet.out.*;
 import com.ss.rlib.common.util.array.Array;

…acket/factory/Mqtt5PacketOutFactory.java …ry/packet/out/Mqtt5PacketOutFactory.javasrc/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 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

@@ -1,6 +1,8 @@
-package com.ss.mqtt.broker.network.packet.factory;
+package com.ss.mqtt.broker.factory.packet.out;
 
 import com.ss.mqtt.broker.model.*;
+import com.ss.mqtt.broker.model.data.type.StringPair;
+import com.ss.mqtt.broker.model.reason.code.*;
 import com.ss.mqtt.broker.network.client.MqttClient;
 import com.ss.mqtt.broker.network.packet.out.*;
 import com.ss.rlib.common.util.array.Array;

…packet/factory/MqttPacketOutFactory.java …ory/packet/out/MqttPacketOutFactory.javasrc/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 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

@@ -1,6 +1,8 @@
-package com.ss.mqtt.broker.network.packet.factory;
+package com.ss.mqtt.broker.factory.packet.out;
 
 import com.ss.mqtt.broker.model.*;
+import com.ss.mqtt.broker.model.data.type.StringPair;
+import com.ss.mqtt.broker.model.reason.code.*;
 import com.ss.mqtt.broker.network.client.MqttClient;
 import com.ss.mqtt.broker.network.packet.out.MqttWritablePacket;
 import com.ss.rlib.common.util.ArrayUtils;

…pl/AbstractMqttClientReleaseHandler.java …nt/AbstractMqttClientReleaseHandler.javasrc/main/java/com/ss/mqtt/broker/network/client/impl/AbstractMqttClientReleaseHandler.java renamed to src/main/java/com/ss/mqtt/broker/handler/client/AbstractMqttClientReleaseHandler.java 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

@@ -1,7 +1,7 @@
-package com.ss.mqtt.broker.network.client.impl;
+package com.ss.mqtt.broker.handler.client;
 
-import com.ss.mqtt.broker.network.client.MqttClientReleaseHandler;
-import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
+import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
+import com.ss.mqtt.broker.network.client.AbstractMqttClient;
 import com.ss.mqtt.broker.service.ClientIdRegistry;
 import com.ss.mqtt.broker.service.MqttSessionService;
 import com.ss.rlib.common.util.StringUtils;

…impl/DeviceMqttClientReleaseHandler.java …ient/DeviceMqttClientReleaseHandler.javasrc/main/java/com/ss/mqtt/broker/network/client/impl/DeviceMqttClientReleaseHandler.java renamed to src/main/java/com/ss/mqtt/broker/handler/client/DeviceMqttClientReleaseHandler.java 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

@@ -1,5 +1,6 @@
-package com.ss.mqtt.broker.network.client.impl;
+package com.ss.mqtt.broker.handler.client;
 
+import com.ss.mqtt.broker.network.client.DeviceMqttClient;
 import com.ss.mqtt.broker.service.ClientIdRegistry;
 import com.ss.mqtt.broker.service.MqttSessionService;
 import org.jetbrains.annotations.NotNull;

…ork/client/MqttClientReleaseHandler.java …ler/client/MqttClientReleaseHandler.javasrc/main/java/com/ss/mqtt/broker/network/client/MqttClientReleaseHandler.java renamed to src/main/java/com/ss/mqtt/broker/handler/client/MqttClientReleaseHandler.java src/main/java/com/ss/mqtt/broker/network/client/MqttClientReleaseHandler.java renamed to src/main/java/com/ss/mqtt/broker/handler/client/MqttClientReleaseHandler.java

@@ -1,5 +1,6 @@
-package com.ss.mqtt.broker.network.client;
+package com.ss.mqtt.broker.handler.client;
 
+import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
 

…et/in/handler/AbstractPacketHandler.java …ler/packet/in/AbstractPacketHandler.javasrc/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 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

@@ -1,6 +1,6 @@
-package com.ss.mqtt.broker.network.packet.in.handler;
+package com.ss.mqtt.broker.handler.packet.in;
 
-import com.ss.mqtt.broker.network.client.UnsafeMqttClient;
+import com.ss.mqtt.broker.network.client.MqttClient.UnsafeMqttClient;
 import com.ss.mqtt.broker.network.packet.in.MqttReadablePacket;
 import org.jetbrains.annotations.NotNull;