getMaxLevel has refactored to simplify the code

5 years ago · caddc4d4d7
1 changed files with 1 additions and 6 deletions
--- 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) {