From b179d1f090147e579dde9ff6d5a1e4106eafb490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A1=E4=B8=96=E7=99=BD=E7=8E=89?= Date: Fri, 15 Jun 2018 12:12:36 +0800 Subject: [PATCH] fix Deprecated Warning. * messageId * password * willMessage --- src/main/java/io/vertx/mqtt/MqttAuth.java | 11 +++++++++++ src/main/java/io/vertx/mqtt/MqttWill.java | 18 ++++++++++++++++++ .../vertx/mqtt/impl/MqttClientConnection.java | 2 +- .../io/vertx/mqtt/impl/MqttClientImpl.java | 6 +++--- .../io/vertx/mqtt/impl/MqttEndpointImpl.java | 2 +- .../vertx/mqtt/impl/MqttServerConnection.java | 6 +++--- 6 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/vertx/mqtt/MqttAuth.java b/src/main/java/io/vertx/mqtt/MqttAuth.java index 56a53cfd..9f75c7dd 100644 --- a/src/main/java/io/vertx/mqtt/MqttAuth.java +++ b/src/main/java/io/vertx/mqtt/MqttAuth.java @@ -16,6 +16,7 @@ package io.vertx.mqtt; +import io.netty.util.CharsetUtil; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; @@ -39,6 +40,16 @@ public MqttAuth(String userName, String password) { this.password = password; } + /** + * Constructor + * + * @param userName MQTT client username + * @param passwordBytes MQTT client password + */ + public MqttAuth(String userName, byte[] passwordBytes) { + this.userName = userName; + this.password = (passwordBytes == null ? null : new String(passwordBytes, CharsetUtil.UTF_8));; + } /** * Create instance from JSON * diff --git a/src/main/java/io/vertx/mqtt/MqttWill.java b/src/main/java/io/vertx/mqtt/MqttWill.java index a6b8c310..ad31e097 100644 --- a/src/main/java/io/vertx/mqtt/MqttWill.java +++ b/src/main/java/io/vertx/mqtt/MqttWill.java @@ -16,6 +16,7 @@ package io.vertx.mqtt; +import io.netty.util.CharsetUtil; import io.vertx.codegen.annotations.CacheReturn; import io.vertx.codegen.annotations.DataObject; import io.vertx.core.json.JsonObject; @@ -49,6 +50,23 @@ public MqttWill(boolean isWillFlag, String willTopic, String willMessage, int wi this.isWillRetain = isWillRetain; } + /** + * Constructor + * + * @param isWillFlag indicates will message presence + * @param willTopic topic to publish the will + * @param willMessageBytes payload of the will + * @param willQos qos level for the will + * @param isWillRetain if the will message must be retained + */ + public MqttWill(boolean isWillFlag, String willTopic, byte[] willMessageBytes, int willQos, boolean isWillRetain) { + this.isWillFlag = isWillFlag; + this.willTopic = willTopic; + this.willMessage = (willMessageBytes == null ? null : new String(willMessageBytes, CharsetUtil.UTF_8)); + this.willQos = willQos; + this.isWillRetain = isWillRetain; + } + /** * Create instance from JSON * diff --git a/src/main/java/io/vertx/mqtt/impl/MqttClientConnection.java b/src/main/java/io/vertx/mqtt/impl/MqttClientConnection.java index 495ab2f9..e79c6372 100644 --- a/src/main/java/io/vertx/mqtt/impl/MqttClientConnection.java +++ b/src/main/java/io/vertx/mqtt/impl/MqttClientConnection.java @@ -91,7 +91,7 @@ void handleMessage(Object msg) { ByteBuf newBuf = VertxHandler.safeBuffer(publish.payload(), chctx.alloc()); MqttPublishMessage mqttPublishMessage = MqttPublishMessage.create( - publish.variableHeader().messageId(), + publish.variableHeader().packetId(), publish.fixedHeader().qosLevel(), publish.fixedHeader().isDup(), publish.fixedHeader().isRetain(), diff --git a/src/main/java/io/vertx/mqtt/impl/MqttClientImpl.java b/src/main/java/io/vertx/mqtt/impl/MqttClientImpl.java index c29f3985..a822a23b 100644 --- a/src/main/java/io/vertx/mqtt/impl/MqttClientImpl.java +++ b/src/main/java/io/vertx/mqtt/impl/MqttClientImpl.java @@ -313,11 +313,11 @@ public MqttClient publish(String topic, Buffer payload, MqttQoS qosLevel, boolea switch (qosLevel) { case AT_LEAST_ONCE: - qos1outbound.put(variableHeader.messageId(), publish); + qos1outbound.put(variableHeader.packetId(), publish); countInflightQueue++; break; case EXACTLY_ONCE: - qos2outbound.put(variableHeader.messageId(), publish); + qos2outbound.put(variableHeader.packetId(), publish); countInflightQueue++; break; } @@ -325,7 +325,7 @@ public MqttClient publish(String topic, Buffer payload, MqttQoS qosLevel, boolea this.write(publish); if (publishSentHandler != null) { - publishSentHandler.handle(Future.succeededFuture(variableHeader.messageId())); + publishSentHandler.handle(Future.succeededFuture(variableHeader.packetId())); } return this; diff --git a/src/main/java/io/vertx/mqtt/impl/MqttEndpointImpl.java b/src/main/java/io/vertx/mqtt/impl/MqttEndpointImpl.java index 1a505897..a315a411 100644 --- a/src/main/java/io/vertx/mqtt/impl/MqttEndpointImpl.java +++ b/src/main/java/io/vertx/mqtt/impl/MqttEndpointImpl.java @@ -453,7 +453,7 @@ public MqttEndpointImpl publish(String topic, Buffer payload, MqttQoS qosLevel, this.write(publish); if (publishSentHandler != null) { - publishSentHandler.handle(Future.succeededFuture(variableHeader.messageId())); + publishSentHandler.handle(Future.succeededFuture(variableHeader.packetId())); } return this; diff --git a/src/main/java/io/vertx/mqtt/impl/MqttServerConnection.java b/src/main/java/io/vertx/mqtt/impl/MqttServerConnection.java index 21f595b3..646272b3 100644 --- a/src/main/java/io/vertx/mqtt/impl/MqttServerConnection.java +++ b/src/main/java/io/vertx/mqtt/impl/MqttServerConnection.java @@ -127,7 +127,7 @@ synchronized void handleMessage(Object msg) { ByteBuf newBuf = VertxHandler.safeBuffer(publish.payload(), this.chctx.alloc()); MqttPublishMessage mqttPublishMessage = MqttPublishMessage.create( - publish.variableHeader().messageId(), + publish.variableHeader().packetId(), publish.fixedHeader().qosLevel(), publish.fixedHeader().isDup(), publish.fixedHeader().isRetain(), @@ -206,7 +206,7 @@ private void handleConnect(MqttConnectMessage msg) { MqttWill will = new MqttWill(msg.variableHeader().isWillFlag(), msg.payload().willTopic(), - msg.payload().willMessage(), + msg.payload().willMessageInBytes(), msg.variableHeader().willQos(), msg.variableHeader().isWillRetain()); @@ -215,7 +215,7 @@ private void handleConnect(MqttConnectMessage msg) { msg.variableHeader().hasPassword()) ? new MqttAuth( msg.payload().userName(), - msg.payload().password()) : null; + msg.payload().passwordInBytes()) : null; // check if remote MQTT client didn't specify a client-id boolean isZeroBytes = (msg.payload().clientIdentifier() == null) ||