Bump odlparent to 3.0.0-SNAPSHOT and fix breakages

[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 2076d44381510160f748dbce6863381beae12fa4..1856a1fe047e2e3935abf295a1c68f1a5dc4ac66 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
@@ -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 ast) {
+    public int[] getAcceptableTokens() {
+        return TOKENS;
+    }
+
+    @Override
+    public int[] getRequiredTokens() {
+        return TOKENS;
+    }
+
+    @Override
+    public void visitToken(final DetailAST ast) {
         if (CheckLoggingUtil.isAFieldVariable(ast) && CheckLoggingUtil.isLoggerType(ast)
                 && !hasPrivatStaticFinalModifier(ast)) {
             log(ast.getLineNo(), LOG_MESSAGE);
         }
     }
 
-    private boolean hasPrivatStaticFinalModifier(DetailAST ast) {
-        DetailAST modifiers = ast.findFirstToken(TokenTypes.MODIFIERS);
-        if (modifiers != null && modifiers.branchContains(TokenTypes.LITERAL_PRIVATE)
-                && modifiers.branchContains(TokenTypes.LITERAL_STATIC) && modifiers.branchContains(TokenTypes.FINAL)) {
-            return true;
-        }
-        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);
     }
-
 }