Added LATEST tag to EdgeVersion proto

thingsboard · Apr 11, 2024 · 791f647 · 791f647
1 parent 5813501
commit 791f647
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/application/src/main/java/org/thingsboard/server/service/cloud/CloudManagerService.java b/application/src/main/java/org/thingsboard/server/service/cloud/CloudManagerService.java
@@ -468,7 +468,7 @@ private List<UplinkMsg> convertToUplinkMsgsPack(List<CloudEvent> cloudEvents) {
 
     private UplinkMsg convertEntityEventToUplink(TenantId tenantId, CloudEvent cloudEvent) {
         log.trace("Executing convertEntityEventToUplink, cloudEvent [{}], edgeEventAction [{}]", cloudEvent, cloudEvent.getAction());
-        EdgeVersion edgeVersion = EdgeVersion.V_3_6_2;
+        EdgeVersion edgeVersion = EdgeVersion.V_LATEST;
         switch (cloudEvent.getType()) {
             case DEVICE:
                 return deviceProcessor.convertDeviceEventToUplink(tenantId, cloudEvent, edgeVersion);

diff --git a/...rc/main/java/org/thingsboard/server/service/cloud/rpc/processor/DeviceCloudProcessor.java b/...rc/main/java/org/thingsboard/server/service/cloud/rpc/processor/DeviceCloudProcessor.java
@@ -211,7 +211,7 @@ private void reply(ToDeviceRpcRequest rpcRequest, int requestId, FromDeviceRpcRe
 
     public UplinkMsg convertRpcCallEventToUplink(CloudEvent cloudEvent) {
         log.trace("Executing convertRpcCallEventToUplink, cloudEvent [{}]", cloudEvent);
-        DeviceRpcCallMsg rpcResponseMsg = ((DeviceMsgConstructor) deviceMsgConstructorFactory.getMsgConstructorByEdgeVersion(EdgeVersion.V_3_6_2)).constructDeviceRpcCallMsg(cloudEvent.getEntityId(), cloudEvent.getEntityBody());
+        DeviceRpcCallMsg rpcResponseMsg = ((DeviceMsgConstructor) deviceMsgConstructorFactory.getMsgConstructorByEdgeVersion(EdgeVersion.V_LATEST)).constructDeviceRpcCallMsg(cloudEvent.getEntityId(), cloudEvent.getEntityBody());
         return UplinkMsg.newBuilder()
                 .setUplinkMsgId(EdgeUtils.nextPositiveInt())
                 .addDeviceRpcCallMsg(rpcResponseMsg).build();

diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
@@ -38,6 +38,8 @@ enum EdgeVersion {
   V_3_6_1 = 4;
   V_3_6_2 = 5;
   V_3_6_4 = 6;
+
+  V_LATEST = 999;
 }
 
 /**

diff --git a/docker-edge/.env b/docker-edge/.env
@@ -1,7 +1,7 @@
 DOCKER_REPO=thingsboard
 
 TB_NODE_DOCKER_NAME=tb-node
-TB_VERSION=3.6.3
+TB_VERSION=3.6.3-SNAPSHOT
 
 TB_EDGE_DOCKER_NAME=tb-edge
 TB_EDGE_VERSION=3.6.4EDGE-SNAPSHOT
diff --git a/docker-edge/docker-compose.postgres.yml b/docker-edge/docker-compose.postgres.yml
@@ -19,7 +19,7 @@ version: '3.0'
 services:
   postgres:
     restart: always
-    image: "postgres:12"
+    image: "postgres:15"
     ports:
     - "5432"
     environment: