简柏林 / thingskit · Commits

Commit 1de29d7b51f02f8afd0286a40beafb3a257f9823

Authored by Volodymyr Babak
1 parent c991ab96

Remove unused code

Inline Side-by-side
Showing 5 changed files with 0 additions and 91 deletions
@@ -59,7 +59,5 @@ public interface DashboardService { @@ -59,7 +59,5 @@ public interface DashboardService {
59 59
60 Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId); 60 Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId);
61 61
62 - void unassignEdgeDashboards(TenantId tenantId, EdgeId edgeId);  
63 -  
64 ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 62 ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink);
65 } 63 }
@@ -71,8 +71,6 @@ public interface RuleChainService { @@ -71,8 +71,6 @@ public interface RuleChainService {
71 71
72 RuleChain unassignRuleChainFromEdge(TenantId tenantId, RuleChainId ruleChainId, EdgeId edgeId, boolean remove); 72 RuleChain unassignRuleChainFromEdge(TenantId tenantId, RuleChainId ruleChainId, EdgeId edgeId, boolean remove);
73 73
74 - void unassignEdgeRuleChains(TenantId tenantId, EdgeId edgeId);  
75 -  
76 ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 74 ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink);
77 75
78 RuleChain getDefaultRootEdgeRuleChain(TenantId tenantId); 76 RuleChain getDefaultRootEdgeRuleChain(TenantId tenantId);
@@ -261,17 +261,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb @@ -261,17 +261,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
261 } 261 }
262 262
263 @Override 263 @Override
264 - public void unassignEdgeDashboards(TenantId tenantId, EdgeId edgeId) {  
265 - log.trace("Executing unassignEdgeDashboards, edgeId [{}]", edgeId);  
266 - Validator.validateId(edgeId, "Incorrect edgeId " + edgeId);  
267 - Edge edge = edgeDao.findById(tenantId, edgeId.getId());  
268 - if (edge == null) {  
269 - throw new DataValidationException("Can't unassign dashboards from non-existent edge!");  
270 - }  
271 - new EdgeDashboardsUnassigner(edge).removeEntities(tenantId, edge);  
272 - }  
273 -  
274 - @Override  
275 public ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 264 public ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
276 log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 265 log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
277 Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 266 Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
@@ -369,29 +358,4 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb @@ -369,29 +358,4 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
369 } 358 }
370 359
371 } 360 }
372 -  
373 - private class EdgeDashboardsUnassigner extends TimePaginatedRemover<Edge, DashboardInfo> {  
374 -  
375 - private Edge edge;  
376 -  
377 - EdgeDashboardsUnassigner(Edge edge) {  
378 - this.edge = edge;  
379 - }  
380 -  
381 - @Override  
382 - protected List<DashboardInfo> findEntities(TenantId tenantId, Edge edge, TimePageLink pageLink) {  
383 - try {  
384 - return dashboardInfoDao.findDashboardsByTenantIdAndEdgeId(edge.getTenantId().getId(), edge.getId().getId(), pageLink).get();  
385 - } catch (InterruptedException | ExecutionException e) {  
386 - log.warn("Failed to get dashboards by tenantId [{}] and edgeId [{}].", edge.getTenantId().getId(), edge.getId().getId());  
387 - throw new RuntimeException(e);  
388 - }  
389 - }  
390 -  
391 - @Override  
392 - protected void removeEntity(TenantId tenantId, DashboardInfo entity) {  
393 - unassignDashboardFromEdge(edge.getTenantId(), new DashboardId(entity.getUuidId()), this.edge.getId());  
394 - }  
395 -  
396 - }  
397 } 361 }
@@ -105,18 +105,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -105,18 +105,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
105 private CacheManager cacheManager; 105 private CacheManager cacheManager;
106 106
107 @Autowired 107 @Autowired
108 - private AssetService assetService;  
109 -  
110 - @Autowired  
111 - private DeviceService deviceService;  
112 -  
113 - @Autowired  
114 - private EntityViewService entityViewService;  
115 -  
116 - @Autowired  
117 - private DashboardService dashboardService;  
118 -  
119 - @Autowired  
120 private RuleChainService ruleChainService; 108 private RuleChainService ruleChainService;
121 109
122 @Autowired 110 @Autowired
@@ -181,10 +169,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -181,10 +169,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
181 169
182 Edge edge = edgeDao.findById(tenantId, edgeId.getId()); 170 Edge edge = edgeDao.findById(tenantId, edgeId.getId());
183 171
184 - dashboardService.unassignEdgeDashboards(tenantId, edgeId);  
185 - // TODO: validate that rule chains are removed by deleteEntityRelations(tenantId, edgeId); call  
186 - ruleChainService.unassignEdgeRuleChains(tenantId, edgeId);  
187 -  
188 List<Object> list = new ArrayList<>(); 172 List<Object> list = new ArrayList<>();
189 list.add(edge.getTenantId()); 173 list.add(edge.getTenantId());
190 list.add(edge.getName()); 174 list.add(edge.getName());
@@ -446,17 +446,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC @@ -446,17 +446,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
446 } 446 }
447 447
448 @Override 448 @Override
449 - public void unassignEdgeRuleChains(TenantId tenantId, EdgeId edgeId) {  
450 - log.trace("Executing unassignEdgeRuleChains, edgeId [{}]", edgeId);  
451 - Validator.validateId(edgeId, "Incorrect edgeId " + edgeId);  
452 - Edge edge = edgeService.findEdgeById(tenantId, edgeId);  
453 - if (edge == null) {  
454 - throw new DataValidationException("Can't unassign ruleChains from non-existent edge!");  
455 - }  
456 - new EdgeRuleChainsUnassigner(edge).removeEntities(tenantId, edge);  
457 - }  
458 -  
459 - @Override  
460 public ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 449 public ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
461 log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 450 log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
462 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); 451 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
@@ -603,28 +592,4 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC @@ -603,28 +592,4 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
603 checkRuleNodesAndDelete(tenantId, entity.getId()); 592 checkRuleNodesAndDelete(tenantId, entity.getId());
604 } 593 }
605 }; 594 };
606 -  
607 - private class EdgeRuleChainsUnassigner extends TimePaginatedRemover<Edge, RuleChain> {  
608 -  
609 - private Edge edge;  
610 -  
611 - EdgeRuleChainsUnassigner(Edge edge) {  
612 - this.edge = edge;  
613 - }  
614 -  
615 - @Override  
616 - protected List<RuleChain> findEntities(TenantId tenantId, Edge edge, TimePageLink pageLink) {  
617 - try {  
618 - return ruleChainDao.findRuleChainsByTenantIdAndEdgeId(edge.getTenantId().getId(), edge.getId().getId(), pageLink).get();  
619 - } catch (InterruptedException | ExecutionException e) {  
620 - log.warn("Failed to get ruleChains by tenantId [{}] and edgeId [{}].", edge.getTenantId().getId(), edge.getId().getId());  
621 - throw new RuntimeException(e);  
622 - }  
623 - }  
624 -  
625 - @Override  
626 - protected void removeEntity(TenantId tenantId, RuleChain entity) {  
627 - unassignRuleChainFromEdge(edge.getTenantId(), new RuleChainId(entity.getUuidId()), this.edge.getId(), true);  
628 - }  
629 - }  
630 } 595 }