tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Technical cleanup of deprecated validator API calls

pull/15663/head
Oleksandra Matviienko 5 months ago
parent
90fc84ea31
commit
f79a13c79f
2 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
  2. 28
      dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java

2
dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
View File

@ -60,7 +60,7 @@ public class BaseComponentDescriptorService implements ComponentDescriptorServic
@Override @Override
public ComponentDescriptor findById(TenantId tenantId, ComponentDescriptorId componentId) { public ComponentDescriptor findById(TenantId tenantId, ComponentDescriptorId componentId) {
Validator.validateId(componentId, "Incorrect component id for search request."); Validator.validateId(componentId, id -> "Incorrect component id for search request.");
return componentDescriptorDao.findById(tenantId, componentId); return componentDescriptorDao.findById(tenantId, componentId);
} }

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

@ -191,7 +191,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Transactional @Transactional
@Override @Override
public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) { public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id."); Validator.validateId(ruleChainMetaData.getRuleChainId(), id -> "Incorrect rule chain id.");
RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId()); RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
if (ruleChain == null) { if (ruleChain == null) {
return RuleChainUpdateResult.failed(); return RuleChainUpdateResult.failed();
@ -346,7 +346,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) { public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id.");
RuleChainDetails ruleChainDetails = ruleChainDetailsDao.findById(tenantId, ruleChainId.getId()); RuleChainDetails ruleChainDetails = ruleChainDetailsDao.findById(tenantId, ruleChainId.getId());
if (ruleChainDetails == null) { if (ruleChainDetails == null) {
return null; return null;
@ -388,37 +388,37 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId) { public RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
return ruleChainDao.findById(tenantId, ruleChainId.getId()); return ruleChainDao.findById(tenantId, ruleChainId.getId());
} }
@Override @Override
public RuleNode findRuleNodeById(TenantId tenantId, RuleNodeId ruleNodeId) { public RuleNode findRuleNodeById(TenantId tenantId, RuleNodeId ruleNodeId) {
Validator.validateId(ruleNodeId, "Incorrect rule node id for search request."); Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
return ruleNodeDao.findById(tenantId, ruleNodeId.getId()); return ruleNodeDao.findById(tenantId, ruleNodeId.getId());
} }
@Override @Override
public ListenableFuture<RuleChain> findRuleChainByIdAsync(TenantId tenantId, RuleChainId ruleChainId) { public ListenableFuture<RuleChain> findRuleChainByIdAsync(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
return ruleChainDao.findByIdAsync(tenantId, ruleChainId.getId()); return ruleChainDao.findByIdAsync(tenantId, ruleChainId.getId());
} }
@Override @Override
public ListenableFuture<RuleNode> findRuleNodeByIdAsync(TenantId tenantId, RuleNodeId ruleNodeId) { public ListenableFuture<RuleNode> findRuleNodeByIdAsync(TenantId tenantId, RuleNodeId ruleNodeId) {
Validator.validateId(ruleNodeId, "Incorrect rule node id for search request."); Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
return ruleNodeDao.findByIdAsync(tenantId, ruleNodeId.getId()); return ruleNodeDao.findByIdAsync(tenantId, ruleNodeId.getId());
} }
@Override @Override
public RuleChain getRootTenantRuleChain(TenantId tenantId) { public RuleChain getRootTenantRuleChain(TenantId tenantId) {
Validator.validateId(tenantId, "Incorrect tenant id for search request."); Validator.validateId(tenantId, id -> "Incorrect tenant id for search request.");
return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.CORE); return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.CORE);
} }
@Override @Override
public List<RuleNode> getRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) { public List<RuleNode> getRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
List<EntityRelation> relations = getRuleChainToNodeRelations(tenantId, ruleChainId); List<EntityRelation> relations = getRuleChainToNodeRelations(tenantId, ruleChainId);
List<RuleNode> ruleNodes = new ArrayList<>(); List<RuleNode> ruleNodes = new ArrayList<>();
for (EntityRelation relation : relations) { for (EntityRelation relation : relations) {
@ -434,7 +434,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public List<RuleNode> getReferencingRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) { public List<RuleNode> getReferencingRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id for search request."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
List<EntityRelation> relations = getNodeToRuleChainRelations(tenantId, ruleChainId); List<EntityRelation> relations = getNodeToRuleChainRelations(tenantId, ruleChainId);
List<RuleNode> ruleNodes = new ArrayList<>(); List<RuleNode> ruleNodes = new ArrayList<>();
for (EntityRelation relation : relations) { for (EntityRelation relation : relations) {
@ -448,7 +448,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId) { public List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId) {
Validator.validateId(ruleNodeId, "Incorrect rule node id for search request."); Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
List<EntityRelation> relations = relationService.findByFrom(tenantId, ruleNodeId, RelationTypeGroup.RULE_NODE); List<EntityRelation> relations = relationService.findByFrom(tenantId, ruleNodeId, RelationTypeGroup.RULE_NODE);
List<EntityRelation> validRelations = new ArrayList<>(); List<EntityRelation> validRelations = new ArrayList<>();
for (EntityRelation relation : relations) { for (EntityRelation relation : relations) {
@ -475,7 +475,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public PageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, PageLink pageLink) { public PageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, PageLink pageLink) {
Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request."); Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
Validator.validatePageLink(pageLink); Validator.validatePageLink(pageLink);
return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink); return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink);
} }
@ -488,7 +488,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
@Transactional @Transactional
public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) { public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id for delete request."); Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for delete request.");
RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId()); RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId());
if (ruleChain == null) { if (ruleChain == null) {
return; return;
@ -527,7 +527,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Transactional @Transactional
@Override @Override
public void deleteRuleChainsByTenantId(TenantId tenantId) { public void deleteRuleChainsByTenantId(TenantId tenantId) {
Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request."); Validator.validateId(tenantId, id -> "Incorrect tenant id for delete rule chains request.");
tenantRuleChainsRemover.removeEntities(tenantId, tenantId); tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
} }
@ -539,7 +539,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override @Override
public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) { public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request."); Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
Validator.validatePageLink(pageLink); Validator.validatePageLink(pageLink);
PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink); PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
List<RuleChain> ruleChains = ruleChainData.getData(); List<RuleChain> ruleChains = ruleChainData.getData();

Write Preview
Loading…
Cancel
Save