From 59c981bf9568e35f7795d7156b9689abc81b704a Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 21 Jan 2021 11:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../official/JetlinksTopicMessageCodec.java | 17 +++++++------- .../JetLinksMqttDeviceMessageCodecTest.java | 22 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java b/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java index 762259b..744a793 100644 --- a/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java +++ b/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java @@ -11,7 +11,6 @@ import org.jetlinks.core.message.function.FunctionInvokeMessage; import org.jetlinks.core.message.function.FunctionInvokeMessageReply; import org.jetlinks.core.message.property.*; import org.jetlinks.core.utils.TopicUtils; -import org.jetlinks.supports.utils.MqttTopicUtils; import org.springframework.util.Assert; import java.util.Map; @@ -86,7 +85,7 @@ class JetlinksTopicMessageCodec { Assert.notNull(message, "message can not be null"); if (message instanceof ReadPropertyMessage) { - String topic = "/" .concat(deviceId).concat("/properties/read"); + String topic = "/".concat(deviceId).concat("/properties/read"); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); mqttData.put("properties", ((ReadPropertyMessage) message).getProperties()); @@ -94,7 +93,7 @@ class JetlinksTopicMessageCodec { return new EncodedTopic(topic, mqttData); } else if (message instanceof WritePropertyMessage) { - String topic = "/" .concat(deviceId).concat("/properties/write"); + String topic = "/".concat(deviceId).concat("/properties/write"); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); mqttData.put("properties", ((WritePropertyMessage) message).getProperties()); @@ -102,7 +101,7 @@ class JetlinksTopicMessageCodec { return new EncodedTopic(topic, mqttData); } else if (message instanceof FunctionInvokeMessage) { - String topic = "/" .concat(deviceId).concat("/function/invoke"); + String topic = "/".concat(deviceId).concat("/function/invoke"); FunctionInvokeMessage invokeMessage = ((FunctionInvokeMessage) message); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); @@ -112,7 +111,7 @@ class JetlinksTopicMessageCodec { return new EncodedTopic(topic, mqttData); } else if (message instanceof UpgradeFirmwareMessage) { - String topic = "/" .concat(deviceId).concat("/firmware/upgrade"); + String topic = "/".concat(deviceId).concat("/firmware/upgrade"); UpgradeFirmwareMessage firmwareMessage = ((UpgradeFirmwareMessage) message); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); @@ -125,13 +124,13 @@ class JetlinksTopicMessageCodec { return new EncodedTopic(topic, mqttData); } else if (message instanceof ReadFirmwareMessage) { - String topic = "/" .concat(deviceId).concat("/firmware/read"); + String topic = "/".concat(deviceId).concat("/firmware/read"); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); mqttData.put("deviceId", deviceId); return new EncodedTopic(topic, mqttData); } else if (message instanceof RequestFirmwareMessageReply) { - String topic = "/" .concat(deviceId).concat("/firmware/pull/reply"); + String topic = "/".concat(deviceId).concat("/firmware/pull/reply"); RequestFirmwareMessageReply firmwareMessage = ((RequestFirmwareMessageReply) message); JSONObject mqttData = new JSONObject(); mqttData.put("messageId", message.getMessageId()); @@ -145,7 +144,7 @@ class JetlinksTopicMessageCodec { } else if (message instanceof ChildDeviceMessage) { ChildDeviceMessage childDeviceMessage = ((ChildDeviceMessage) message); EncodedTopic result = encode(childDeviceMessage.getChildDeviceId(), childDeviceMessage.getChildDeviceMessage()); - String topic = "/" .concat(deviceId).concat("/child").concat(result.topic); + String topic = "/".concat(deviceId).concat("/child").concat(result.topic); result.payload.put("deviceId", childDeviceMessage.getChildDeviceId()); return new EncodedTopic(topic, result.payload); @@ -180,7 +179,7 @@ class JetlinksTopicMessageCodec { message = object.toJavaObject(ReportFirmwareMessage.class); } else if (result.isUpgradeFirmwareProgress()) { message = object.toJavaObject(UpgradeFirmwareProgressMessage.class); - }else if (topic.endsWith("connected")) { + } else if (topic.endsWith("connected")) { message = object.toJavaObject(DeviceOnlineMessage.class); } else if (topic.endsWith("disconnect")) { message = object.toJavaObject(DeviceOfflineMessage.class); diff --git a/src/test/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodecTest.java b/src/test/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodecTest.java index 2079c84..ea3314b 100644 --- a/src/test/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodecTest.java +++ b/src/test/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodecTest.java @@ -180,10 +180,9 @@ public class JetLinksMqttDeviceMessageCodecTest { .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes())) .build())).block(); - Assert.assertTrue(message instanceof ChildDeviceMessageReply); - ChildDeviceMessageReply childReply = ((ChildDeviceMessageReply) message); + Assert.assertTrue(message instanceof ChildDeviceMessage); + ChildDeviceMessage childReply = ((ChildDeviceMessage) message); - Assert.assertTrue(childReply.isSuccess()); Assert.assertEquals(childReply.getDeviceId(),"device1"); Assert.assertEquals(childReply.getMessageId(),"test"); @@ -251,10 +250,9 @@ public class JetLinksMqttDeviceMessageCodecTest { .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"output\":\"ok\"}".getBytes())) .build())).block(); - Assert.assertTrue(message instanceof ChildDeviceMessageReply); - ChildDeviceMessageReply childReply = ((ChildDeviceMessageReply) message); + Assert.assertTrue(message instanceof ChildDeviceMessage); + ChildDeviceMessage childReply = ((ChildDeviceMessage) message); - Assert.assertTrue(childReply.isSuccess()); Assert.assertEquals(childReply.getDeviceId(),"device1"); Assert.assertEquals(childReply.getMessageId(),"test"); @@ -288,9 +286,9 @@ public class JetLinksMqttDeviceMessageCodecTest { .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"data\":100}".getBytes())) .build())).block(); - Assert.assertTrue(message instanceof ChildDeviceMessageReply); + Assert.assertTrue(message instanceof ChildDeviceMessage); - EventMessage reply = ((EventMessage) ((ChildDeviceMessageReply) message).getChildDeviceMessage()); + EventMessage reply = ((EventMessage) ((ChildDeviceMessage) message).getChildDeviceMessage()); Assert.assertEquals(reply.getDeviceId(), "test"); Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getData(), 100); @@ -320,9 +318,9 @@ public class JetLinksMqttDeviceMessageCodecTest { .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes())) .build())).block(); - Assert.assertTrue(message instanceof ChildDeviceMessageReply); + Assert.assertTrue(message instanceof ChildDeviceMessage); - ReportPropertyMessage reply = ((ReportPropertyMessage) ((ChildDeviceMessageReply) message).getChildDeviceMessage()); + ReportPropertyMessage reply = ((ReportPropertyMessage) ((ChildDeviceMessage) message).getChildDeviceMessage()); Assert.assertEquals(reply.getDeviceId(), "test"); Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getProperties(), Collections.singletonMap("sn", "test")); @@ -352,9 +350,9 @@ public class JetLinksMqttDeviceMessageCodecTest { .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"metadata\":\"1\"}".getBytes())) .build())).block(); - Assert.assertTrue(message instanceof ChildDeviceMessageReply); + Assert.assertTrue(message instanceof ChildDeviceMessage); - DerivedMetadataMessage reply = ((DerivedMetadataMessage) ((ChildDeviceMessageReply) message).getChildDeviceMessage()); + DerivedMetadataMessage reply = ((DerivedMetadataMessage) ((ChildDeviceMessage) message).getChildDeviceMessage()); Assert.assertEquals(reply.getDeviceId(), "test"); Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getMetadata(), "1");