BUG-4109: Correct checkstyle dependency and avoid a couple of NPEs

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

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
index 0747a85e0adb7ca07f3a5d69d181d519f8f9a258..d19555b52abb3d49cc997c57f437e73a6ce7b456 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/CheckLoggingUtil.java
@@ -23,7 +23,7 @@ public class CheckLoggingUtil {
     public static final String LOGGER_TYPE_NAME = Logger.class.getSimpleName();
     public static final String LOGGER_TYPE_FULL_NAME = Logger.class.getName();
     public static final String LOGGER_VAR_NAME = "LOG";
-    private static final List<String> LOG_METHODS = Lists.newArrayList("debug", "info", "error", "warn", "trace");
+    private static final List<String> LOG_METHODS = Lists.newArrayList("LOG.debug", "LOG.info", "LOG.error", "LOG.warn", "LOG.trace");
 
     private CheckLoggingUtil() {}
 
@@ -34,10 +34,7 @@ public class CheckLoggingUtil {
 
     public static boolean isLoggerType(final DetailAST aAST) {
         final String typeName = getTypeName(aAST);
-        if(typeName.equals(LOGGER_TYPE_FULL_NAME) || typeName.equals(LOGGER_TYPE_NAME)) {
-            return true;
-        }
-        return false;
+        return typeName.equals(LOGGER_TYPE_FULL_NAME) || typeName.equals(LOGGER_TYPE_NAME);
     }
 
     public static String getVariableName(final DetailAST aAST) {
@@ -51,7 +48,7 @@ public class CheckLoggingUtil {
 
     public static String getMethodName(final DetailAST aAST) {
         if(aAST.getFirstChild().getLastChild() != null) {
-            return aAST.getFirstChild().getLastChild().getText();
+            return aAST.getFirstChild().getFirstChild().getText() + "." + aAST.getFirstChild().getLastChild().getText();
         }
         return aAST.getFirstChild().getText();
     }