This is an automated email from the ASF dual-hosted git repository.
pingww pushed a change to branch develop_mqtt5.0
in repository https://gitbox.apache.org/repos/asf/rocketmq-mqtt.git
from 4331ec4 Merge pull request #238 from zzjcool/feat/on-ssl-cert-change
add 516e7a6 add MqttVersionHandler to support MQTT 5 and MQTT 3.1.1 in
same port
add ddde39e framework for mqtt 5.0 handler
add 7357198 save mqtt 5 connect property to channel info
add 8818c52 save mqtt 5.0 connect package properties and add unit test
add 07a0327 send connack, but if sessionPresent = true, should load the
exist session by clientId
add db398af send connack, but if sessionPresent = true, should load the
exist session by clientId
add 5407a92 process disconnect packet
add 43463b3 add mqtt5 disconnect and ping unit test
add 2beaf60 process publish message, save mqtt 5.0 publish properties to
MQ
add 445274f process publish error code
add c0a3b91 process mqtt 5.0 PubAck,PubRec,PubRel,PubComp
add e4ae4ba add mqtt5SubcribeHandler
add 0d2873c add mqtt5UnsubcribeHandler
add ce74c6d add closeConnectWithProtocolError
add 4c1f5f0 handler protocol error in packet
add 025555f send connack with CONNECTION_REFUSED_RETAIN_NOT_SUPPORTED if
will with retain when retain is not support
add 09a01b5 fix style
add 0271418 netty-all to 4.1.100
add bec442e delete sendWill in mqtt5
add 8fd62bb delete sendWill in mqtt5
add 1769702 add mqtt5 example
add 5d4b72d delete data
new 7dbaa4d Merge pull request #231 from DongyuanPan/MQTT_5.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +++
.../ChannelPipelineLazyInit.java} | 15 +-
.../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 +-
.../Mqtt5PacketDispatcher.java} | 111 ++++-----
.../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 ++-
.../TestMqtt5PacketDispatcher.java} | 33 ++-
.../mqtt5/handler/TestMqtt5ConnectHandler.java | 236 +++++++++++++++++++
.../handler/TestMqtt5DisconnectHandler.java} | 45 +++-
.../handler/TestMqtt5PingHandler.java} | 9 +-
.../handler/TestMqtt5PublishHandler.java} | 22 +-
.../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 +
.../Mqtt5Consumer.java} | 77 ++++---
.../Mqtt5Producer.java} | 58 +++--
pom.xml | 8 +-
80 files changed, 2326 insertions(+), 397 deletions(-)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/{channel/ChannelCloseFrom.java
=> protocol/ChannelPipelineLazyInit.java} (76%)
rename mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt =>
}/MqttPacketHandler.java (96%)
create mode 100644
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/MqttVersionHandler.java
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/MqttPacketDispatcher.java
=> mqtt5/Mqtt5PacketDispatcher.java} (62%)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttDisconnectHandler.java
=> mqtt5/handler/Mqtt5AuthHandler.java} (71%)
create mode 100644
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/mqtt5/handler/Mqtt5ConnectHandler.java
create mode 100644
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/mqtt5/handler/Mqtt5DisconnectHandler.java
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttPingHandler.java
=> mqtt5/handler/Mqtt5PingHandler.java} (77%)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttPubAckHandler.java
=> mqtt5/handler/Mqtt5PubAckHandler.java} (71%)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttPubCompHandler.java
=> mqtt5/handler/Mqtt5PubCompHandler.java} (84%)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttPubRecHandler.java
=> mqtt5/handler/Mqtt5PubRecHandler.java} (56%)
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttPubRelHandler.java
=> mqtt5/handler/Mqtt5PubRelHandler.java} (60%)
create mode 100644
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/mqtt5/handler/Mqtt5PublishHandler.java
create mode 100644
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/mqtt5/handler/Mqtt5SubscribeHandler.java
copy
mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/protocol/{mqtt/handler/MqttUnSubscribeHandler.java
=> mqtt5/handler/Mqtt5UnSubscribeHandler.java} (60%)
copy
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/{mqtt/TestMqttPacketDispatcher.java
=> mqtt5/TestMqtt5PacketDispatcher.java} (77%)
create mode 100644
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/mqtt5/handler/TestMqtt5ConnectHandler.java
copy
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/{mqtt/handler/TestMqttDisconnectHandler.java
=> mqtt5/handler/TestMqtt5DisconnectHandler.java} (50%)
copy
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/{mqtt/handler/TestMqttPingHandler.java
=> mqtt5/handler/TestMqtt5PingHandler.java} (87%)
copy
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/{mqtt/handler/TestMqttPublishHandler.java
=> mqtt5/handler/TestMqtt5PublishHandler.java} (83%)
create mode 100644
mqtt-cs/src/test/java/org/apache/rocketmq/mqtt/cs/test/protocol/mqtt5/handler/TestMqtt5SubscribeHandler.java
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/UpstreamProcessor.java (96%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/UpstreamProcessorManager.java (79%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/BaseProcessor.java (91%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/ConnectProcessor.java (91%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/DisconnectProcessor.java (91%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/PublishProcessor.java (97%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/SubscribeProcessor.java (96%)
copy mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{ =>
mqtt}/processor/UnSubscribeProcessor.java (95%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{UpstreamProcessor.java
=> mqtt5/UpstreamProcessor5.java} (94%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{UpstreamProcessorManager.java
=> mqtt5/UpstreamProcessorManager5.java} (65%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/BaseProcessor.java
=> mqtt5/processor/BaseProcessor5.java} (86%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/ConnectProcessor.java
=> mqtt5/processor/ConnectProcessor5.java} (85%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/DisconnectProcessor.java
=> mqtt5/processor/DisconnectProcessor5.java} (85%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/PublishProcessor.java
=> mqtt5/processor/PublishProcessor5.java} (90%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/SubscribeProcessor.java
=> mqtt5/processor/SubscribeProcessor5.java} (94%)
rename
mqtt-ds/src/main/java/org/apache/rocketmq/mqtt/ds/upstream/{processor/UnSubscribeProcessor.java
=> mqtt5/processor/UnSubscribeProcessor5.java} (93%)
copy mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{ =>
mqtt}/TestUpstreamProcessorManager.java (94%)
copy mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{ =>
mqtt}/processor/TestPublishProcessor.java (96%)
rename mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{ =>
mqtt}/processor/TestSubscribeProcessor.java (95%)
rename mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{ =>
mqtt}/processor/TestUnSubscribeProcessor.java (95%)
rename
mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{TestUpstreamProcessorManager.java
=> mqtt5/TestUpstreamProcessorManager5.java} (93%)
rename mqtt-ds/src/test/java/org/apache/rocketmq/mqtt/ds/test/upstream/{ =>
mqtt5}/processor/TestPublishProcessor.java (62%)
copy
mqtt-example/src/main/java/org/apache/rocketmq/mqtt/example/{MqttConsumer.java
=> mqtt5/Mqtt5Consumer.java} (60%)
copy
mqtt-example/src/main/java/org/apache/rocketmq/mqtt/example/{MqttProducer.java
=> mqtt5/Mqtt5Producer.java} (69%)
