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

deleted redundant constraint check, refactoring

Browse Source
This commit is contained in:
dashevchenko 2025-10-14 15:57:24 +03:00
parent 374b6cf22f
commit 3fa9b877ab
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
View File

@ -178,18 +178,25 @@ public abstract class AbstractEntityService {
.filter(e -> (oldEntity == null || !e.getId().equals(oldEntity.getId()))) .filter(e -> (oldEntity == null || !e.getId().equals(oldEntity.getId())))
.map(EntityInfo::getName) .map(EntityInfo::getName)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (!existingNames.isEmpty()) {
int idx = 1; if (existingNames.contains(entity.getName())) {
String suffix = (strategy.uniquifyStrategy() == RANDOM) ? StringUtils.randomAlphanumeric(6) : String.valueOf(idx); String uniqueName = generateUniqueName(entity.getName(), existingNames, strategy);
while (true) { setName.accept(uniqueName);
String newName = entity.getName() + strategy.separator() + suffix;
if (!existingNames.contains(newName)) {
setName.accept(newName);
break;
}
suffix = (strategy.uniquifyStrategy() == RANDOM) ? StringUtils.randomAlphanumeric(6) : String.valueOf(idx++);
}
} }
} }
private String generateUniqueName(String baseName, Set<String> existingNames, NameConflictStrategy strategy) {
String newName;
int index = 1;
String separator = strategy.separator();
boolean isRandom = strategy.uniquifyStrategy() == RANDOM;
do {
String suffix = isRandom ? StringUtils.randomAlphanumeric(6) : String.valueOf(index++);
newName = baseName + separator + suffix;
} while (existingNames.contains(newName));
return newName;
}
} }

3
dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
View File

@ -139,8 +139,7 @@ public class EntityViewServiceImpl extends CachedVersionedEntityService<EntityVi
return saved; return saved;
} catch (Exception t) { } catch (Exception t) {
checkConstraintViolation(t, checkConstraintViolation(t,
"entity_view_external_id_unq_key", "Entity View with such external id already exists!", "entity_view_external_id_unq_key", "Entity View with such external id already exists!");
"entity_view_name_unq_key", "Entity View with such name already exists!");
throw t; throw t;
} }
} }