dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused code

Browse Source
This commit is contained in:
Volodymyr Babak 2020-08-28 15:27:43 +03:00
parent c991ab96f1
commit 1de29d7b51
5 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

36
dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View File

@ -260,17 +260,6 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
return dashboard; 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 @Override
public ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { public ListenableFuture<TimePageData<DashboardInfo>> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, 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());
}
}
} }

16
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View File

@ -104,18 +104,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
@Autowired @Autowired
private CacheManager cacheManager; private CacheManager cacheManager;
@Autowired
private AssetService assetService;
@Autowired
private DeviceService deviceService;
@Autowired
private EntityViewService entityViewService;
@Autowired
private DashboardService dashboardService;
@Autowired @Autowired
private RuleChainService ruleChainService; private RuleChainService ruleChainService;
@ -181,10 +169,6 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
Edge edge = edgeDao.findById(tenantId, edgeId.getId()); 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<Object> list = new ArrayList<>();
list.add(edge.getTenantId()); list.add(edge.getTenantId());
list.add(edge.getName()); list.add(edge.getName());

35
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View File

@ -445,17 +445,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
return ruleChain; 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 @Override
public ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { public ListenableFuture<TimePageData<RuleChain>> findRuleChainsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) {
log.trace("Executing findRuleChainsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, 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()); 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);
}
}
} }