Fixed some major sonar issues

[yangtools.git] / common / checkstyle-logging / src / main / java / org / opendaylight / yangtools / checkstyle / LoggerVariableModifiersCheck.java

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
index 63249cba40f2aaf92931982b56de8d64903c0573..126041b47fe8ff4da5b34c95a40f4d42da68591b 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java
@@ -23,18 +23,17 @@ public class LoggerVariableModifiersCheck extends Check {
 
     @Override
     public void visitToken(DetailAST aAST) {
-        if (CheckLoggingUtil.isAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST) && !hasPrivatStaticFinalModifier(aAST)) {
+        if (CheckLoggingUtil.isAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST)
+                && !hasPrivatStaticFinalModifier(aAST)) {
             log(aAST.getLineNo(), LOG_MESSAGE);
         }
     }
 
     private boolean hasPrivatStaticFinalModifier(DetailAST aAST) {
         DetailAST modifiers = aAST.findFirstToken(TokenTypes.MODIFIERS);
-        if(modifiers != null) {
-            if(modifiers.branchContains(TokenTypes.LITERAL_PRIVATE) && modifiers.branchContains(TokenTypes.LITERAL_STATIC)
-                    && modifiers.branchContains(TokenTypes.FINAL)) {
-                return true;
-            }
+        if (modifiers != null && modifiers.branchContains(TokenTypes.LITERAL_PRIVATE) && modifiers.branchContains
+                    (TokenTypes.LITERAL_STATIC) && modifiers.branchContains(TokenTypes.FINAL)) {
+            return true;
         }
         return false;
     }