Conform to our own Checkstyle rules in checkstyle-logging utility

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

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessagePlaceholderCountCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessagePlaceholderCountCheck.java
index 4735b1b1e4980b0a9a88b422fbc4b880fe8bc87f..1adf5408f24868142a8a85d2b79253ef5cd96dd2 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessagePlaceholderCountCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessagePlaceholderCountCheck.java
@@ -24,19 +24,19 @@ public class LogMessagePlaceholderCountCheck extends Check {
     }
 
     @Override
-    public void visitToken(DetailAST aAST) {
-        final String methodName = CheckLoggingUtil.getMethodName(aAST);
+    public void visitToken(DetailAST ast) {
+        final String methodName = CheckLoggingUtil.getMethodName(ast);
         if (CheckLoggingUtil.isLogMethod(methodName)) {
-            final String logMessage = aAST.findFirstToken(TokenTypes.ELIST).getFirstChild().getFirstChild().getText();
+            final String logMessage = ast.findFirstToken(TokenTypes.ELIST).getFirstChild().getFirstChild().getText();
             int placeholdersCount = placeholdersCount(logMessage);
-            int argumentsCount = aAST.findFirstToken(TokenTypes.ELIST).getChildCount(TokenTypes.EXPR) - 1;
-            final String lastArg = aAST.findFirstToken(TokenTypes.ELIST).getLastChild().getFirstChild().getText();
-            if (hasCatchBlockParentWithArgument(lastArg, aAST) || hasMethodDefinitionWithExceptionArgument(lastArg,
-                    aAST)) {
+            int argumentsCount = ast.findFirstToken(TokenTypes.ELIST).getChildCount(TokenTypes.EXPR) - 1;
+            final String lastArg = ast.findFirstToken(TokenTypes.ELIST).getLastChild().getFirstChild().getText();
+            if (hasCatchBlockParentWithArgument(lastArg, ast) || hasMethodDefinitionWithExceptionArgument(lastArg,
+                    ast)) {
                 argumentsCount--;
             }
             if (placeholdersCount > argumentsCount) {
-                log(aAST.getLineNo(), LOG_MESSAGE);
+                log(ast.getLineNo(), LOG_MESSAGE);
             }
         }
     }
@@ -45,28 +45,28 @@ public class LogMessagePlaceholderCountCheck extends Check {
         return (message.length() - message.replace(PLACEHOLDER, "").length()) / PLACEHOLDER.length();
     }
 
-    private boolean hasCatchBlockParentWithArgument(final String argumentName, final DetailAST aAST) {
-        DetailAST parent = aAST.getParent();
-        while(parent != null && parent.getType() != TokenTypes.LITERAL_CATCH) {
+    private boolean hasCatchBlockParentWithArgument(final String argumentName, final DetailAST ast) {
+        DetailAST parent = ast.getParent();
+        while (parent != null && parent.getType() != TokenTypes.LITERAL_CATCH) {
             parent = parent.getParent();
         }
-        if (parent != null && parent.findFirstToken(TokenTypes.PARAMETER_DEF) != null &&
-                parent.findFirstToken(TokenTypes.PARAMETER_DEF).findFirstToken(TokenTypes.IDENT).getText().equals
-                        (argumentName)) {
+        if (parent != null && parent.findFirstToken(TokenTypes.PARAMETER_DEF) != null
+                && parent.findFirstToken(TokenTypes.PARAMETER_DEF).findFirstToken(TokenTypes.IDENT).getText()
+                        .equals(argumentName)) {
             return true;
         }
         return false;
     }
 
-    private boolean hasMethodDefinitionWithExceptionArgument(final String argumentName, final DetailAST aAST) {
-        DetailAST parent = aAST.getParent();
-        while(parent != null && parent.getType() != TokenTypes.METHOD_DEF) {
+    private boolean hasMethodDefinitionWithExceptionArgument(final String argumentName, final DetailAST ast) {
+        DetailAST parent = ast.getParent();
+        while (parent != null && parent.getType() != TokenTypes.METHOD_DEF) {
             parent = parent.getParent();
         }
         if (parent != null && parent.findFirstToken(TokenTypes.PARAMETERS).findFirstToken(TokenTypes.PARAMETER_DEF)
                 != null) {
             DetailAST paramDef = parent.findFirstToken(TokenTypes.PARAMETERS).getFirstChild();
-            while(paramDef != null) {
+            while (paramDef != null) {
                 if (paramDef.getType() == TokenTypes.PARAMETER_DEF) {
                     final String paramName = paramDef.findFirstToken(TokenTypes.IDENT).getText();
                     if (paramName.equals(argumentName) && isExceptionType(paramDef)) {