From 84bd9f087c04b0eb4d46fd6e781c88cac1fce901 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 22 Aug 2019 14:44:39 +0200
Subject: [PATCH] Enable spotbugs in yang-model-export

SpotBugs is getting confused by our use of checkArgument, not
understanding we will catch nulls. Refactor the code removing
the violation and remove enforcement override.

Change-Id: I787359c01f2761448cb4f3d33aea0baf5e642ed8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-model-export/pom.xml                              | 5 -----
 .../yangtools/yang/model/export/ExportUtils.java            | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml
index 7ff27cb506..75d72a5f6d 100644
--- a/yang/yang-model-export/pom.xml
+++ b/yang/yang-model-export/pom.xml
@@ -21,11 +21,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <properties>
-        <!-- FIXME: we have some violations here -->
-        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ExportUtils.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ExportUtils.java
index 1baf8002fc..585cfeac6a 100644
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ExportUtils.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/ExportUtils.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.export;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Verify.verify;
 
 import java.util.Map;
@@ -59,7 +58,10 @@ final class ExportUtils {
             }
         }
 
-        checkArgument(prefix != null, "Failed to find prefix for statement %s", stmtName);
+        if (prefix == null) {
+            throw new IllegalArgumentException("Failed to find prefix for statement " + stmtName);
+        }
+
         verify(!prefix.isEmpty(), "Empty prefix for statement %s", stmtName);
         return Optional.of(prefix);
     }
-- 
2.36.6