Removed asset profiles request msg

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

@@ -604,11 +604,6 @@ public final class EdgeGrpcSession implements Closeable {
                     result.add(ctx.getEdgeRequestsService().processDeviceProfileDevicesRequestMsg(edge.getTenantId(), edge, deviceProfileDevicesRequestMsg));
                 }
             }
-            if (uplinkMsg.getAssetProfileAssetsRequestMsgCount() > 0) {
-                for (AssetProfileAssetsRequestMsg assetProfileAssetsRequestMsg : uplinkMsg.getAssetProfileAssetsRequestMsgList()) {
-                    result.add(ctx.getEdgeRequestsService().processAssetProfileAssetsRequestMsg(edge.getTenantId(), edge, assetProfileAssetsRequestMsg));
-                }
-            }
             if (uplinkMsg.getWidgetBundleTypesRequestMsgCount() > 0) {
                 for (WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg : uplinkMsg.getWidgetBundleTypesRequestMsgList()) {
                     result.add(ctx.getEdgeRequestsService().processWidgetBundleTypesRequestMsg(edge.getTenantId(), edge, widgetBundleTypesRequestMsg));

application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java

@@ -361,44 +361,6 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
         return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
     }
 
-    @Override
-    public ListenableFuture<Void> processAssetProfileAssetsRequestMsg(TenantId tenantId, Edge edge, AssetProfileAssetsRequestMsg assetProfileAssetsRequestMsg) {
-        log.trace("[{}] processAssetProfileAssetsRequestMsg [{}][{}]", tenantId, edge.getName(), assetProfileAssetsRequestMsg);
-        if (assetProfileAssetsRequestMsg.getAssetProfileIdMSB() == 0 || assetProfileAssetsRequestMsg.getAssetProfileIdLSB() == 0) {
-            return Futures.immediateFuture(null);
-        }
-        AssetProfileId assetProfileId = new AssetProfileId(new UUID(assetProfileAssetsRequestMsg.getAssetProfileIdMSB(), assetProfileAssetsRequestMsg.getAssetProfileIdLSB()));
-        AssetProfile assetProfileById = assetProfileService.findAssetProfileById(tenantId, assetProfileId);
-        if (assetProfileById == null) {
-            return Futures.immediateFuture(null);
-        }
-        return syncAssets(tenantId, edge, assetProfileById.getName());
-    }
-
-    private ListenableFuture<Void> syncAssets(TenantId tenantId, Edge edge, String assetType) {
-        log.trace("[{}] syncAssets [{}][{}]", tenantId, edge.getName(), assetType);
-        List<ListenableFuture<Void>> futures = new ArrayList<>();
-        try {
-            PageLink pageLink = new PageLink(DEFAULT_PAGE_SIZE);
-            PageData<Asset> pageData;
-            do {
-                pageData = assetService.findAssetsByTenantIdAndEdgeIdAndType(tenantId, edge.getId(), assetType, pageLink);
-                if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-                    log.trace("[{}] [{}] asset(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
-                    for (Asset asset : pageData.getData()) {
-                        futures.add(saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.ASSET, EdgeEventActionType.ADDED, asset.getId(), null));
-                    }
-                    if (pageData.hasNext()) {
-                        pageLink = pageLink.nextPageLink();
-                    }
-                }
-            } while (pageData != null && pageData.hasNext());
-        } catch (Exception e) {
-            log.error("Exception during loading edge asset(s) on sync!", e);
-        }
-        return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService);
-    }
-
     @Override
     public ListenableFuture<Void> processWidgetBundleTypesRequestMsg(TenantId tenantId, Edge edge,
                                                                      WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/EdgeRequestsService.java

@@ -42,8 +42,6 @@ public interface EdgeRequestsService {
 
     ListenableFuture<Void> processDeviceProfileDevicesRequestMsg(TenantId tenantId, Edge edge, DeviceProfileDevicesRequestMsg deviceProfileDevicesRequestMsg);
 
-    ListenableFuture<Void> processAssetProfileAssetsRequestMsg(TenantId tenantId, Edge edge, AssetProfileAssetsRequestMsg assetProfileAssetsRequestMsg);
-
     ListenableFuture<Void> processWidgetBundleTypesRequestMsg(TenantId tenantId, Edge edge, WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg);
 
     ListenableFuture<Void> processEntityViewsRequestMsg(TenantId tenantId, Edge edge, EntityViewsRequestMsg entityViewsRequestMsg);

common/edge-api/src/main/proto/edge.proto

@@ -251,12 +251,12 @@ message AssetUpdateMsg {
   int64 idLSB = 3;
   optional int64 customerIdMSB = 4;
   optional int64 customerIdLSB = 5;
-  optional int64 assetProfileIdMSB = 6;
-  optional int64 assetProfileIdLSB = 7;
-  string name = 8;
-  string type = 9;
-  optional string label = 10;
-  optional string additionalInfo = 11;
+  string name = 6;
+  string type = 7;
+  optional string label = 8;
+  optional string additionalInfo = 9;
+  optional int64 assetProfileIdMSB = 10;
+  optional int64 assetProfileIdLSB = 11;
 }
 
 message EntityViewUpdateMsg {
@@ -405,11 +405,6 @@ message DeviceProfileDevicesRequestMsg {
   int64 deviceProfileIdLSB = 2;
 }
 
-message AssetProfileAssetsRequestMsg {
-  int64 assetProfileIdMSB = 1;
-  int64 assetProfileIdLSB = 2;
-}
-
 message WidgetBundleTypesRequestMsg {
   int64 widgetBundleIdMSB = 1;
   int64 widgetBundleIdLSB = 2;
@@ -517,7 +512,6 @@ message UplinkMsg {
   repeated DeviceProfileDevicesRequestMsg deviceProfileDevicesRequestMsg = 13;
   repeated WidgetBundleTypesRequestMsg widgetBundleTypesRequestMsg = 14;
   repeated EntityViewsRequestMsg entityViewsRequestMsg = 15;
-  repeated AssetProfileAssetsRequestMsg assetProfileAssetsRequestMsg = 16;
 }
 
 message UplinkResponseMsg {