Fixed order of widget bundle and types updload

application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java

@@ -151,16 +151,17 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     public void sync(TenantId tenantId, Edge edge) {
         log.trace("[{}][{}] Staring edge sync process", tenantId, edge.getId());
         try {
-            syncWidgetsBundleAndWidgetTypes(tenantId, edge);
+            syncWidgetsBundles(tenantId, edge);
             // TODO: voba - implement this functionality
             // syncAdminSettings(edge);
-            syncRuleChains(tenantId, edge);
             syncDeviceProfiles(tenantId, edge);
+            syncRuleChains(tenantId, edge);
             syncUsers(tenantId, edge);
-            syncDevices(tenantId, edge);
             syncAssets(tenantId, edge);
             syncEntityViews(tenantId, edge);
             syncDashboards(tenantId, edge);
+            syncWidgetsTypes(tenantId, edge);
+            syncDevices(tenantId, edge);
         } catch (Exception e) {
             log.error("[{}][{}] Exception during sync process", tenantId, edge.getId(), e);
         }
@@ -340,22 +341,35 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
 
-    private void syncWidgetsBundleAndWidgetTypes(TenantId tenantId, Edge edge) {
+    private void syncWidgetsBundles(TenantId tenantId, Edge edge) {
-        log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", tenantId, edge.getName());
+        log.trace("[{}] syncWidgetsBundles [{}]", tenantId, edge.getName());
         List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
-        List<WidgetType> widgetTypesToPush = new ArrayList<>();
         widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId));
         widgetsBundlesToPush.addAll(widgetsBundleService.findSystemWidgetsBundles(tenantId));
         try {
             for (WidgetsBundle widgetsBundle: widgetsBundlesToPush) {
                 saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.WIDGETS_BUNDLE, EdgeEventActionType.ADDED, widgetsBundle.getId(), null);
-                widgetTypesToPush.addAll(widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(widgetsBundle.getTenantId(), widgetsBundle.getAlias()));
             }
-            for (WidgetType widgetType: widgetTypesToPush) {
+        } catch (Exception e) {
-                saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.WIDGET_TYPE, EdgeEventActionType.ADDED, widgetType.getId(), null);
+            log.error("Exception during loading widgets bundle(s) on sync!", e);
+        }
+    }
+
+    private void syncWidgetsTypes(TenantId tenantId, Edge edge) {
+        log.trace("[{}] syncWidgetsTypes [{}]", tenantId, edge.getName());
+        List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
+        widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId));
+        widgetsBundlesToPush.addAll(widgetsBundleService.findSystemWidgetsBundles(tenantId));
+        try {
+            for (WidgetsBundle widgetsBundle: widgetsBundlesToPush) {
+                List<WidgetType> widgetTypesToPush =
+                        widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(widgetsBundle.getTenantId(), widgetsBundle.getAlias());
+                for (WidgetType widgetType: widgetTypesToPush) {
+                    saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.WIDGET_TYPE, EdgeEventActionType.ADDED, widgetType.getId(), null);
+                }
             }
         } catch (Exception e) {
-            log.error("Exception during loading widgets bundle(s) and widget type(s) on sync!", e);
+            log.error("Exception during loading widgets type(s) on sync!", e);
         }
     }