dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated protobuf version to 3.17.2 & added explicit fields presence support

Browse Source
This commit is contained in:
ShvaykaD 2021-06-09 17:03:05 +03:00 committed by Andrew Shvayka
parent 0c3d1556da
commit a1336f3893
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/ProtoMqttAdaptor.java
View File

@ -223,7 +223,7 @@ public class ProtoMqttAdaptor implements MqttTransportAdaptor {
private String dynamicMsgToJson(byte[] bytes, Descriptors.Descriptor descriptor) throws InvalidProtocolBufferException { private String dynamicMsgToJson(byte[] bytes, Descriptors.Descriptor descriptor) throws InvalidProtocolBufferException {
DynamicMessage dynamicMessage = DynamicMessage.parseFrom(descriptor, bytes); DynamicMessage dynamicMessage = DynamicMessage.parseFrom(descriptor, bytes);
return JsonFormat.printer().includingDefaultValueFields().print(dynamicMessage); return JsonFormat.printer().print(dynamicMessage);
} }
} }

10
pom.xml
View File

@ -75,8 +75,8 @@
<mail.version>1.6.2</mail.version> <mail.version>1.6.2</mail.version>
<curator.version>4.2.0</curator.version> <curator.version>4.2.0</curator.version>
<zookeeper.version>3.5.5</zookeeper.version> <zookeeper.version>3.5.5</zookeeper.version>
<protobuf.version>3.11.4</protobuf.version> <protobuf.version>3.17.2</protobuf.version>
<grpc.version>1.36.0</grpc.version> <grpc.version>1.38.0</grpc.version>
<lombok.version>1.18.18</lombok.version> <lombok.version>1.18.18</lombok.version>
<paho.client.version>1.2.4</paho.client.version> <paho.client.version>1.2.4</paho.client.version>
<netty.version>4.1.60.Final</netty.version> <netty.version>4.1.60.Final</netty.version>
@ -113,7 +113,7 @@
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<java-websocket.version>1.5.0</java-websocket.version> <java-websocket.version>1.5.0</java-websocket.version>
<micrometer.version>1.5.2</micrometer.version> <micrometer.version>1.5.2</micrometer.version>
<protobuf-dynamic.version>1.0.2TB</protobuf-dynamic.version> <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version>
<wire-schema.version>3.4.0</wire-schema.version> <wire-schema.version>3.4.0</wire-schema.version>
<twilio.version>7.54.2</twilio.version> <twilio.version>7.54.2</twilio.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version> <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
@ -684,7 +684,7 @@
<plugin> <plugin>
<groupId>org.xolstice.maven.plugins</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.0</version> <version>0.6.1</version>
<configuration> <configuration>
<!-- <!--
The version of protoc must match protobuf-java. If you don't depend on The version of protoc must match protobuf-java. If you don't depend on
@ -694,7 +694,7 @@
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
</protocArtifact> </protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
</pluginArtifact> </pluginArtifact>
</configuration> </configuration>
<executions> <executions>