yuanbiao
/
jetlinks-official-protocol
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化协议

This commit is contained in:
zhou-hao 2021-01-21 11:21:28 +08:00
parent 40c3f5c535
commit 59c981bf95
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java
View File

@ -11,7 +11,6 @@ import org.jetlinks.core.message.function.FunctionInvokeMessage;
import org.jetlinks.core.message.function.FunctionInvokeMessageReply; import org.jetlinks.core.message.function.FunctionInvokeMessageReply;
import org.jetlinks.core.message.property.*; import org.jetlinks.core.message.property.*;
import org.jetlinks.core.utils.TopicUtils; import org.jetlinks.core.utils.TopicUtils;
import org.jetlinks.supports.utils.MqttTopicUtils;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.util.Map; import java.util.Map;

22
src/test/java/org/jetlinks/protocol/official/JetLinksMqttDeviceMessageCodecTest.java
View File

@ -180,10 +180,9 @@ public class JetLinksMqttDeviceMessageCodecTest {
.payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes())) .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes()))
.build())).block(); .build())).block();
Assert.assertTrue(message instanceof ChildDeviceMessageReply); Assert.assertTrue(message instanceof ChildDeviceMessage);
ChildDeviceMessageReply childReply = ((ChildDeviceMessageReply) message); ChildDeviceMessage childReply = ((ChildDeviceMessage) message);
Assert.assertTrue(childReply.isSuccess());
Assert.assertEquals(childReply.getDeviceId(),"device1"); Assert.assertEquals(childReply.getDeviceId(),"device1");
Assert.assertEquals(childReply.getMessageId(),"test"); Assert.assertEquals(childReply.getMessageId(),"test");
@ -251,10 +250,9 @@ public class JetLinksMqttDeviceMessageCodecTest {
.payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"output\":\"ok\"}".getBytes())) .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"output\":\"ok\"}".getBytes()))
.build())).block(); .build())).block();
Assert.assertTrue(message instanceof ChildDeviceMessageReply); Assert.assertTrue(message instanceof ChildDeviceMessage);
ChildDeviceMessageReply childReply = ((ChildDeviceMessageReply) message); ChildDeviceMessage childReply = ((ChildDeviceMessage) message);
Assert.assertTrue(childReply.isSuccess());
Assert.assertEquals(childReply.getDeviceId(),"device1"); Assert.assertEquals(childReply.getDeviceId(),"device1");
Assert.assertEquals(childReply.getMessageId(),"test"); Assert.assertEquals(childReply.getMessageId(),"test");
@ -288,9 +286,9 @@ public class JetLinksMqttDeviceMessageCodecTest {
.payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"data\":100}".getBytes())) .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"data\":100}".getBytes()))
.build())).block(); .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.getDeviceId(), "test");
Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getMessageId(), "test");
Assert.assertEquals(reply.getData(), 100); Assert.assertEquals(reply.getData(), 100);
@ -320,9 +318,9 @@ public class JetLinksMqttDeviceMessageCodecTest {
.payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes())) .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"properties\":{\"sn\":\"test\"}}".getBytes()))
.build())).block(); .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.getDeviceId(), "test");
Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getMessageId(), "test");
Assert.assertEquals(reply.getProperties(), Collections.singletonMap("sn", "test")); Assert.assertEquals(reply.getProperties(), Collections.singletonMap("sn", "test"));
@ -352,9 +350,9 @@ public class JetLinksMqttDeviceMessageCodecTest {
.payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"metadata\":\"1\"}".getBytes())) .payload(Unpooled.wrappedBuffer("{\"messageId\":\"test\",\"metadata\":\"1\"}".getBytes()))
.build())).block(); .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.getDeviceId(), "test");
Assert.assertEquals(reply.getMessageId(), "test"); Assert.assertEquals(reply.getMessageId(), "test");
Assert.assertEquals(reply.getMetadata(), "1"); Assert.assertEquals(reply.getMetadata(), "1");