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

Migrated 17 deprecated Validator.validateId(UUIDBased, String) calls to the Function-based signature on lts-4.2 

Wrapped each literal error message in an id-ignoring lambda so the
IncorrectParameterException message stays byte-identical.
pull/15512/head
Oleksandra Matviienko 5 months ago
parent
4fdc92287d
commit
8314e1403c
3 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      application/src/main/java/org/thingsboard/server/controller/BaseController.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
  3. 28
      dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java

4
application/src/main/java/org/thingsboard/server/controller/BaseController.java
View File

@ -657,7 +657,7 @@ public abstract class BaseController {
protected <E extends HasId<I> & HasTenantId, I extends EntityId> E checkEntityId(I entityId, ThrowingBiFunction<TenantId, I, E> findingFunction, Operation operation) throws ThingsboardException {
try {
validateId((UUIDBased) entityId, "Invalid entity id");
validateId((UUIDBased) entityId, id -> "Invalid entity id");
SecurityUser user = getCurrentUser();
E entity = findingFunction.apply(user.getTenantId(), entityId);
checkNotNull(entity, entityId.getEntityType().getNormalName() + " with id [" + entityId + "] is not found");
@ -939,7 +939,7 @@ public abstract class BaseController {
}
private CalculatedField checkCalculatedFieldId(CalculatedFieldId calculatedFieldId, Operation operation) throws ThingsboardException {
validateId(calculatedFieldId, "Invalid entity id");
validateId(calculatedFieldId, id -> "Invalid entity id");
SecurityUser user = getCurrentUser();
CalculatedField cf = calculatedFieldService.findById(user.getTenantId(), calculatedFieldId);
checkNotNull(cf, calculatedFieldId.getEntityType().getNormalName() + " with id [" + calculatedFieldId + "] is not found");

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

@ -60,7 +60,7 @@ public class BaseComponentDescriptorService implements ComponentDescriptorServic
@Override
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);
}

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

@ -182,7 +182,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Transactional
@Override
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());
if (ruleChain == null) {
return RuleChainUpdateResult.failed();
@ -335,7 +335,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) {
Validator.validateId(ruleChainId, "Incorrect rule chain id.");
Validator.validateId(ruleChainId, id -> "Incorrect rule chain id.");
RuleChain ruleChain = findRuleChainById(tenantId, ruleChainId);
if (ruleChain == null) {
return null;
@ -376,37 +376,37 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
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());
}
@Override
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());
}
@Override
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());
}
@Override
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());
}
@Override
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);
}
@Override
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<RuleNode> ruleNodes = new ArrayList<>();
for (EntityRelation relation : relations) {
@ -422,7 +422,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
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<RuleNode> ruleNodes = new ArrayList<>();
for (EntityRelation relation : relations) {
@ -436,7 +436,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
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> validRelations = new ArrayList<>();
for (EntityRelation relation : relations) {
@ -463,7 +463,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
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);
return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink);
}
@ -476,7 +476,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
@Transactional
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());
if (ruleChain == null) {
return;
@ -515,7 +515,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Transactional
@Override
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);
}
@ -527,7 +527,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
@Override
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);
PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
List<RuleChain> ruleChains = ruleChainData.getData();

Write Preview
Loading…
Cancel
Save