Bug 4654: Logging checker throws a NPE

fixed test, added invalid log msg

Change-Id: I8abd90d9e304829a989b110029d9fd8d062ca9fa
Signed-off-by: Filip.Gregor <fgregor@cisco.com>

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java
index 8007aecdf5bb1775517d8268a0c333b1aa8b2ccb..4fb0af6ece05053a4b54b68e5e2fb548b2f3d051 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java
@@ -19,7 +19,7 @@ public class LoggerFactoryClassParameterCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.METHOD_CALL};
+        return new int[] { TokenTypes.METHOD_CALL };
     }
 
     @Override
@@ -27,11 +27,16 @@ public class LoggerFactoryClassParameterCheck extends Check {
         final String methodName = CheckLoggingUtil.getMethodName(aAST);
         if(methodName.equals(METHOD_NAME)) {
             final String className = CheckLoggingUtil.getClassName(aAST);
-            final String parameter = aAST.findFirstToken(TokenTypes.ELIST).getFirstChild().getFirstChild().getFirstChild().getText();
-            if(!parameter.equals(className)) {
-                log(aAST.getLineNo(), LOG_MESSAGE);
+            try {
+                final String token = aAST.findFirstToken(TokenTypes.ELIST).getFirstChild().getFirstChild()
+                    .getFirstChild().getText();
+                if (!token.equals(className)) {
+                    log(aAST.getLineNo(), LOG_MESSAGE);
+                }
+            } catch (NullPointerException e) {
+                log(aAST.getLineNo(), String.format("Invalid parameter in \"getLogger\" method call in class: %s",
+                    className));
             }
         }
     }
-
-}
+}
\ No newline at end of file

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
index fd1be938bf097a0eddec682ef640241dadae4e45..f723ecfaaa5a5538315eee847177a27647cb3c37 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest.java
@@ -95,7 +95,7 @@ public class DataTreeCandidateValidatorTest {
 
     private static QName leafrefLeafList;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest2.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest2.java
index 3dd40c159204db93e7b94d936f8ca79fe5d125bf..eb5e7bcca6482d62456626d58920d57ff504c2cb 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest2.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest2.java
@@ -73,7 +73,7 @@ public class DataTreeCandidateValidatorTest2 {
     private static QName type;
     private static QName desc;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest2.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest3.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest3.java
index 8442fabb25a686be142fc17dfd2f2b93603e7cb6..fb57f9b660261329a7de77f082276b08862d4b0f 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest3.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/DataTreeCandidateValidatorTest3.java
@@ -76,7 +76,7 @@ public class DataTreeCandidateValidatorTest3 {
     private static QName type3;
     private static QName desc;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest3.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
index 733cf8466d1323a1d803fd23ffd367664faf587c..c8c10f0375ee11ed0294bcabbc2dee56fdd3e6f4 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest.java
@@ -95,7 +95,7 @@ public class DataTreeCandidateValidatorTest {
 
     private static QName leafrefLeafList;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest2.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest2.java
index 5f8ba0b82524014476b4ba8490e0593474c000d7..fd465383b0e8f95455b3d4e69c2daf60653abbb0 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest2.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest2.java
@@ -73,7 +73,7 @@ public class DataTreeCandidateValidatorTest2 {
     private static QName type;
     private static QName desc;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest2.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest3.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest3.java
index 132b7ef565e34210243c052235c13385374a4976..22022332f9b028e0fd9fcfcff91a8f5c2fa90c64 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest3.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/test/retest/DataTreeCandidateValidatorTest3.java
@@ -76,7 +76,7 @@ public class DataTreeCandidateValidatorTest3 {
     private static QName type3;
     private static QName desc;
 
-    private static final Logger LOG = LoggerFactory.getLogger("");
+    private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest3.class);
     private static final String NEW_LINE = System.getProperty("line.separator");
 
     static {