Merge remote-tracking branch 'origin/master' into release-3.4

thingsboard · Jul 26, 2022 · ab209f9 · ab209f9
2 parents e48ab89 + 43daec4
commit ab209f9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/...ion/src/main/java/org/thingsboard/server/service/cloud/DefaultDownlinkMessageService.java b/...ion/src/main/java/org/thingsboard/server/service/cloud/DefaultDownlinkMessageService.java
@@ -24,6 +24,7 @@
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.edge.EdgeSettings;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.cloud.CloudEventService;
 import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg;
@@ -273,6 +274,15 @@ private ListenableFuture<Void> updateSyncRequiredState(TenantId tenantId, EdgeSe
             return Futures.transform(cloudEventService.saveEdgeSettings(tenantId, currentEdgeSettings),
                     result -> {
                         log.debug("Full sync required marked as false");
+
+                        // TODO: @voba fixme - this is not required in 3.4.1 once bug with sessionNewEvents fixed
+                        try {
+                            saveCloudEvent(tenantId, CloudEventType.EDGE,
+                                    EdgeEventActionType.ATTRIBUTES_REQUEST, new EdgeId(UUID.fromString(currentEdgeSettings.getEdgeId())), null).get();
+                        } catch (Exception e) {
+                            log.error("Can't save cloud event", e);
+                        }
+
                         return null;
                     },
                     dbCallbackExecutorService);

diff --git a/.../src/main/java/org/thingsboard/server/service/cloud/rpc/processor/BaseCloudProcessor.java b/.../src/main/java/org/thingsboard/server/service/cloud/rpc/processor/BaseCloudProcessor.java
@@ -237,24 +237,6 @@ protected ListenableFuture<Boolean> requestForAdditionalData(TenantId tenantId,
         }
     }
 
-    protected void updateEvents(TenantId tenantId, Device origin, Device destination) {
-        TimePageLink pageLink = new TimePageLink(100);
-        PageData<Event> pageData;
-        do {
-            pageData = eventService.findEvents(tenantId, origin.getId(), pageLink);
-            if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                for (Event event : pageData.getData()) {
-                    event.setEntityId(destination.getId());
-                    eventService.saveAsync(event);
-                }
-                if (pageData.hasNext()) {
-                    pageLink = pageLink.nextPageLink();
-                }
-            }
-        } while (pageData != null && pageData.hasNext());
-        log.debug("Related events updated, origin [{}], destination [{}]", origin.getId(), destination.getId());
-    }
-
     protected UUID safeGetUUID(long mSB, long lSB) {
         return mSB != 0 && lSB != 0 ? new UUID(mSB, lSB) : null;
     }

diff --git a/.../src/main/java/org/thingsboard/server/service/cloud/rpc/processor/UserCloudProcessor.java b/.../src/main/java/org/thingsboard/server/service/cloud/rpc/processor/UserCloudProcessor.java
@@ -96,19 +96,17 @@ public ListenableFuture<Void> processUserMsgFromCloud(TenantId tenantId,
             case UNRECOGNIZED:
                 return handleUnsupportedMsgType(userUpdateMsg.getMsgType());
         }
-        ListenableFuture<Void> aDRF = Futures.transform(
-                requestForAdditionalData(tenantId, userUpdateMsg.getMsgType(), userId, queueStartTs), future -> null, dbCallbackExecutor);
 
-        ListenableFuture<ListenableFuture<Void>> t = Futures.transform(aDRF, aDR -> {
+        ListenableFuture<Boolean> requestFuture = requestForAdditionalData(tenantId, userUpdateMsg.getMsgType(), userId, queueStartTs);
+
+        return Futures.transformAsync(requestFuture, ignored -> {
             if (UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE.equals(userUpdateMsg.getMsgType()) ||
                     UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE.equals(userUpdateMsg.getMsgType())) {
                 return saveCloudEvent(tenantId, CloudEventType.USER, EdgeEventActionType.CREDENTIALS_REQUEST, userId, null);
             } else {
                 return Futures.immediateFuture(null);
             }
         }, dbCallbackExecutor);
-
-        return Futures.transform(t, tt -> null, dbCallbackExecutor);
     }
 
     private void safeSetCustomerId(UserUpdateMsg userUpdateMsg, User user) {