From caddc4d4d76372ecc4a1e6a274f2c6691545308e Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Fri, 15 Oct 2021 14:56:06 +0300 Subject: [PATCH] getMaxLevel has refactored to simplify the code --- .../server/dao/sql/query/DefaultEntityQueryRepository.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java index a838dedd1a..ac78e80685 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java @@ -716,12 +716,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { } int getMaxLevel(int maxLevel) { - int level = maxLevel > 0 ? maxLevel : this.maxLevelAllowed; - if (level > this.maxLevelAllowed) { - log.debug("hierarchy level {} is reduced down to maxLevelAllowed {}", level, this.maxLevelAllowed); - return this.maxLevelAllowed; - } - return level; + return (maxLevel <= 0 || maxLevel > this.maxLevelAllowed) ? this.maxLevelAllowed : maxLevel; } private String getQueryTemplate(EntitySearchDirection direction) {