This is an automated email from the ASF dual-hosted git repository. pingww pushed a commit to branch develop_mqtt5.0 in repository https://gitbox.apache.org/repos/asf/rocketmq-mqtt.git
commit 7dbaa4d088323471c5328e36d18b4536c4f1a946 Merge: 4331ec4 5d4b72d Author: pingww <[email protected]> AuthorDate: Tue Mar 5 19:51:57 2024 +0800 Merge pull request #231 from DongyuanPan/MQTT_5.0 MQTT 5.0 mqtt-common/pom.xml | 4 + .../mqtt/common/hook/UpstreamHookEnum.java | 3 +- .../rocketmq/mqtt/common/model/Constants.java | 8 + .../apache/rocketmq/mqtt/common/model/Message.java | 10 + .../mqtt/common/model/MqttMessageUpContext.java | 11 + .../rocketmq/mqtt/common/model/Subscription.java | 47 +++- .../rocketmq/mqtt/common/util/MessageUtil.java | 90 +++++++- mqtt-common/src/main/proto/request.proto | 8 + mqtt-cs/pom.xml | 4 + .../rocketmq/mqtt/cs/channel/ChannelInfo.java | 87 +++++++ .../rocketmq/mqtt/cs/channel/ChannelManager.java | 4 + .../mqtt/cs/channel/DefaultChannelManager.java | 32 ++- .../rocketmq/mqtt/cs/config/ConnectConf.java | 28 +++ .../mqtt/cs/protocol/ChannelPipelineLazyInit.java | 10 +- .../cs/protocol/{mqtt => }/MqttPacketHandler.java | 2 +- .../mqtt/cs/protocol/MqttVersionHandler.java | 145 ++++++++++++ .../protocol/mqtt/facotry/MqttMessageFactory.java | 72 ++++++ .../protocol/mqtt/handler/MqttConnectHandler.java | 2 +- .../mqtt/handler/MqttDisconnectHandler.java | 2 +- .../cs/protocol/mqtt/handler/MqttPingHandler.java | 2 +- .../protocol/mqtt/handler/MqttPubAckHandler.java | 2 +- .../protocol/mqtt/handler/MqttPubCompHandler.java | 2 +- .../protocol/mqtt/handler/MqttPubRecHandler.java | 2 +- .../protocol/mqtt/handler/MqttPubRelHandler.java | 2 +- .../protocol/mqtt/handler/MqttPublishHandler.java | 2 +- .../mqtt/handler/MqttSubscribeHandler.java | 2 +- .../mqtt/handler/MqttUnSubscribeHandler.java | 2 +- .../cs/protocol/mqtt5/Mqtt5PacketDispatcher.java | 226 ++++++++++++++++++ .../handler/Mqtt5AuthHandler.java} | 18 +- .../mqtt5/handler/Mqtt5ConnectHandler.java | 256 +++++++++++++++++++++ .../mqtt5/handler/Mqtt5DisconnectHandler.java | 94 ++++++++ .../handler/Mqtt5PingHandler.java} | 11 +- .../handler/Mqtt5PubAckHandler.java} | 22 +- .../handler/Mqtt5PubCompHandler.java} | 12 +- .../handler/Mqtt5PubRecHandler.java} | 36 +-- .../handler/Mqtt5PubRelHandler.java} | 29 ++- .../mqtt5/handler/Mqtt5PublishHandler.java | 181 +++++++++++++++ .../mqtt5/handler/Mqtt5SubscribeHandler.java | 199 ++++++++++++++++ .../handler/Mqtt5UnSubscribeHandler.java} | 43 +++- .../apache/rocketmq/mqtt/cs/session/Session.java | 4 + .../rocketmq/mqtt/cs/session/loop/SessionLoop.java | 2 + .../mqtt/cs/session/loop/SessionLoopImpl.java | 15 +- .../mqtt/cs/session/match/MatchAction.java | 36 +-- .../rocketmq/mqtt/cs/starter/MqttServer.java | 27 ++- .../protocol/mqtt5/TestMqtt5PacketDispatcher.java | 116 ++++++++++ .../mqtt5/handler/TestMqtt5ConnectHandler.java | 236 +++++++++++++++++++ .../mqtt5/handler/TestMqtt5DisconnectHandler.java | 95 ++++++++ .../mqtt5/handler/TestMqtt5PingHandler.java | 64 ++++++ .../mqtt5/handler/TestMqtt5PublishHandler.java | 168 ++++++++++++++ .../mqtt5/handler/TestMqtt5SubscribeHandler.java | 224 ++++++++++++++++++ mqtt-ds/pom.xml | 4 + .../rocketmq/mqtt/ds/auth/AuthManagerSample.java | 3 + .../mqtt/ds/store/LmqQueueStoreManager.java | 57 ++--- .../ds/upstream/{ => mqtt}/UpstreamProcessor.java | 2 +- .../{ => mqtt}/UpstreamProcessorManager.java | 23 +- .../{ => mqtt}/processor/BaseProcessor.java | 4 +- .../{ => mqtt}/processor/ConnectProcessor.java | 4 +- .../{ => mqtt}/processor/DisconnectProcessor.java | 4 +- .../{ => mqtt}/processor/PublishProcessor.java | 5 +- .../{ => mqtt}/processor/SubscribeProcessor.java | 4 +- .../{ => mqtt}/processor/UnSubscribeProcessor.java | 4 +- .../UpstreamProcessor5.java} | 4 +- .../UpstreamProcessorManager5.java} | 37 ++- .../processor/BaseProcessor5.java} | 10 +- .../processor/ConnectProcessor5.java} | 6 +- .../processor/DisconnectProcessor5.java} | 6 +- .../processor/PublishProcessor5.java} | 19 +- .../processor/SubscribeProcessor5.java} | 6 +- .../processor/UnSubscribeProcessor5.java} | 6 +- .../ds/test/store/TestLmqQueueStoreManager.java | 47 ++++ .../{ => mqtt}/TestUpstreamProcessorManager.java | 6 +- .../{ => mqtt}/processor/TestPublishProcessor.java | 4 +- .../processor/TestSubscribeProcessor.java | 4 +- .../processor/TestUnSubscribeProcessor.java | 4 +- .../TestUpstreamProcessorManager5.java} | 8 +- .../processor/TestPublishProcessor.java | 39 +++- mqtt-example/pom.xml | 5 + .../rocketmq/mqtt/example/mqtt5/Mqtt5Consumer.java | 115 +++++++++ .../rocketmq/mqtt/example/mqtt5/Mqtt5Producer.java | 123 ++++++++++ pom.xml | 8 +- 80 files changed, 3019 insertions(+), 251 deletions(-) diff --cc pom.xml index c99cc65,b500df4..c34e7a2 --- a/pom.xml +++ b/pom.xml @@@ -45,8 -45,9 +45,9 @@@ <protobuf-java.version>3.8.0</protobuf-java.version> <protoc-gen-grpc-java.version>1.24.0</protoc-gen-grpc-java.version> <rpc-grpc-impl.version>1.3.8</rpc-grpc-impl.version> - <guava.version>30.1-jre</guava.version> + <guava.version>32.0.0-jre</guava.version> <jraft-core.version>1.3.11</jraft-core.version> + <mqtt.codec.version>4.1.100.Final</mqtt.codec.version> </properties>
