X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fcheckstyle-logging%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fcheckstyle%2FLoggerVariableModifiersCheck.java;h=1856a1fe047e2e3935abf295a1c68f1a5dc4ac66;hb=a93d098c5ea45c25d61db588c8082d1b8553628e;hp=126041b47fe8ff4da5b34c95a40f4d42da68591b;hpb=9fcd6c6dee1956012f8a70b3a1b369fd2baef116;p=yangtools.git

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 126041b47f..1856a1fe04 100644
--- 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
@@ -8,34 +8,41 @@
 
 package org.opendaylight.yangtools.checkstyle;
 
-import com.puppycrawl.tools.checkstyle.api.Check;
+import com.puppycrawl.tools.checkstyle.api.AbstractCheck;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 
-public class LoggerVariableModifiersCheck extends Check {
+public class LoggerVariableModifiersCheck extends AbstractCheck {
 
     private static final String LOG_MESSAGE = "Logger must be declared as private static final.";
+    private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF };
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.VARIABLE_DEF};
+        return TOKENS;
     }
 
     @Override
-    public void visitToken(DetailAST aAST) {
-        if (CheckLoggingUtil.isAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST)
-                && !hasPrivatStaticFinalModifier(aAST)) {
-            log(aAST.getLineNo(), LOG_MESSAGE);
-        }
+    public int[] getAcceptableTokens() {
+        return TOKENS;
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return TOKENS;
     }
 
-    private boolean hasPrivatStaticFinalModifier(DetailAST aAST) {
-        DetailAST modifiers = aAST.findFirstToken(TokenTypes.MODIFIERS);
-        if (modifiers != null && modifiers.branchContains(TokenTypes.LITERAL_PRIVATE) && modifiers.branchContains
-                    (TokenTypes.LITERAL_STATIC) && modifiers.branchContains(TokenTypes.FINAL)) {
-            return true;
+    @Override
+    public void visitToken(final DetailAST ast) {
+        if (CheckLoggingUtil.isAFieldVariable(ast) && CheckLoggingUtil.isLoggerType(ast)
+                && !hasPrivatStaticFinalModifier(ast)) {
+            log(ast.getLineNo(), LOG_MESSAGE);
         }
-        return false;
     }
 
+    private static boolean hasPrivatStaticFinalModifier(final DetailAST ast) {
+        final DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
+        return modifiers != null && modifiers.branchContains(TokenTypes.LITERAL_PRIVATE)
+                && modifiers.branchContains(TokenTypes.LITERAL_STATIC) && modifiers.branchContains(TokenTypes.FINAL);
+    }
 }