From 2b17808ef0f0c4d2c02b6a52c0c59fcf81c438f1 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 12 Feb 2020 18:59:43 +0100
Subject: [PATCH] Enable SpotBugs enforcement in yang-validation-tool

There are just two issues reported, fix/suppress them and flip
enforcement on.

Change-Id: Id145facbd6da836108d8d938150e34462f9fde5e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang-validation-tool/pom.xml                             | 5 -----
 .../yangtools/yang/validation/tool/Params.java           | 9 +++++++--
 .../yangtools/yang/validation/tool/ParamsUtil.java       | 4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index 1e1fc8e4a0..b8f6368113 100644
--- a/yang-validation-tool/pom.xml
+++ b/yang-validation-tool/pom.xml
@@ -20,11 +20,6 @@
     <artifactId>yang-validation-tool</artifactId>
     <version>4.0.8-SNAPSHOT</version>
 
-    <properties>
-        <!-- FIXME: we have some violations here -->
-        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/Params.java b/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/Params.java
index 82b92cfcea..aab1789532 100644
--- a/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/Params.java
+++ b/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/Params.java
@@ -15,8 +15,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 final class Params {
-
     private static final Logger LOG = LoggerFactory.getLogger(Params.class);
+
     @Arg(dest = "yang-source-dir")
     private File yangSourceDir;
 
@@ -48,7 +48,12 @@ final class Params {
             LOG.error("Yang source directory has to be readable");
             return false;
         }
-        if (yangSourceDir.list().length == 0) {
+        final String[] listed = yangSourceDir.list();
+        if (listed == null) {
+            LOG.error("Yang source directory {} is not a directory or cannot be read", yangSourceDir.getPath());
+            return false;
+        }
+        if (listed.length == 0) {
             LOG.error("Yang source directory {} doesn't contain any model", yangSourceDir.getPath());
             return false;
         }
diff --git a/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/ParamsUtil.java b/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/ParamsUtil.java
index bfdfc3c7f0..498c00b0a8 100644
--- a/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/ParamsUtil.java
+++ b/yang-validation-tool/src/main/java/org/opendaylight/yangtools/yang/validation/tool/ParamsUtil.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.yangtools.yang.validation.tool;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 
@@ -15,7 +16,8 @@ final class ParamsUtil {
 
     }
 
-    public static Params parseArgs(final String[] args, final ArgumentParser parser) {
+    @SuppressFBWarnings(value = "DM_EXIT", justification = "We do expect to terminate the JVM")
+    static Params parseArgs(final String[] args, final ArgumentParser parser) {
         final Params params = new Params();
         try {
             parser.parseArgs(args, params);
-- 
2.36.6