Remove unused code

common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java

@@ -59,7 +59,5 @@ public interface DashboardService {
 
     Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId);
 
-    void unassignEdgeDashboards(TenantId tenantId, EdgeId edgeId);
-
     ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink);
 }

common/dao-api/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java

@@ -71,8 +71,6 @@ public interface RuleChainService {
 
     RuleChain unassignRuleChainFromEdge(TenantId tenantId, RuleChainId ruleChainId, EdgeId edgeId, boolean remove);
 
-    void unassignEdgeRuleChains(TenantId tenantId, EdgeId edgeId);
-
     ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink);
 
     RuleChain getDefaultRootEdgeRuleChain(TenantId tenantId);

dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java

@@ -260,17 +260,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         return dashboard;
     }
 
-    @Override
-    public void unassignEdgeDashboards(TenantId tenantId, EdgeId edgeId) {
-        log.trace("Executing unassignEdgeDashboards, edgeId [{}]", edgeId);
-        Validator.validateId(edgeId, "Incorrect edgeId " + edgeId);
-        Edge edge = edgeDao.findById(tenantId, edgeId.getId());
-        if (edge == null) {
-            throw new DataValidationException("Can't unassign dashboards from non-existent edge!");
-        }
-        new EdgeDashboardsUnassigner(edge).removeEntities(tenantId, edge);
-    }
-
     @Override
     public ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
         log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
@@ -369,29 +358,4 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         }
 
     }
-
-    private class EdgeDashboardsUnassigner extends TimePaginatedRemover<Edge, DashboardInfo> {
-
-        private Edge edge;
-
-        EdgeDashboardsUnassigner(Edge edge) {
-            this.edge = edge;
-        }
-
-        @Override
-        protected List<DashboardInfo> findEntities(TenantId tenantId, Edge edge, TimePageLink pageLink) {
-            try {
-                return dashboardInfoDao.findDashboardsByTenantIdAndEdgeId(edge.getTenantId().getId(), edge.getId().getId(), pageLink).get();
-            } catch (InterruptedException | ExecutionException e) {
-                log.warn("Failed to get dashboards by tenantId [{}] and edgeId [{}].", edge.getTenantId().getId(), edge.getId().getId());
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        protected void removeEntity(TenantId tenantId, DashboardInfo entity) {
-            unassignDashboardFromEdge(edge.getTenantId(), new DashboardId(entity.getUuidId()), this.edge.getId());
-        }
-
-    }
 }

dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

@@ -104,18 +104,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     @Autowired
     private CacheManager cacheManager;
 
-    @Autowired
-    private AssetService assetService;
-
-    @Autowired
-    private DeviceService deviceService;
-
-    @Autowired
-    private EntityViewService entityViewService;
-
-    @Autowired
-    private DashboardService dashboardService;
-
     @Autowired
     private RuleChainService ruleChainService;
 
@@ -181,10 +169,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
 
         Edge edge = edgeDao.findById(tenantId, edgeId.getId());
 
-        dashboardService.unassignEdgeDashboards(tenantId, edgeId);
-        // TODO: validate that rule chains are removed by deleteEntityRelations(tenantId, edgeId); call
-        ruleChainService.unassignEdgeRuleChains(tenantId, edgeId);
-
         List<Object> list = new ArrayList<>();
         list.add(edge.getTenantId());
         list.add(edge.getName());

dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java

@@ -445,17 +445,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         return ruleChain;
     }
 
-    @Override
-    public void unassignEdgeRuleChains(TenantId tenantId, EdgeId edgeId) {
-        log.trace("Executing unassignEdgeRuleChains, edgeId [{}]", edgeId);
-        Validator.validateId(edgeId, "Incorrect edgeId " + edgeId);
-        Edge edge = edgeService.findEdgeById(tenantId, edgeId);
-        if (edge == null) {
-            throw new DataValidationException("Can't unassign ruleChains from non-existent edge!");
-        }
-        new EdgeRuleChainsUnassigner(edge).removeEntities(tenantId, edge);
-    }
-
     @Override
     public ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
         log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
@@ -603,28 +592,4 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
                     checkRuleNodesAndDelete(tenantId, entity.getId());
                 }
             };
-
-    private class EdgeRuleChainsUnassigner extends TimePaginatedRemover<Edge, RuleChain> {
-
-        private Edge edge;
-
-        EdgeRuleChainsUnassigner(Edge edge) {
-            this.edge = edge;
-        }
-
-        @Override
-        protected List<RuleChain> findEntities(TenantId tenantId, Edge edge, TimePageLink pageLink) {
-            try {
-                return ruleChainDao.findRuleChainsByTenantIdAndEdgeId(edge.getTenantId().getId(), edge.getId().getId(), pageLink).get();
-            } catch (InterruptedException | ExecutionException e) {
-                log.warn("Failed to get ruleChains by tenantId [{}] and edgeId [{}].", edge.getTenantId().getId(), edge.getId().getId());
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        protected void removeEntity(TenantId tenantId, RuleChain entity) {
-            unassignRuleChainFromEdge(edge.getTenantId(), new RuleChainId(entity.getUuidId()), this.edge.getId(), true);
-        }
-    }
 }