From 62daf56698879e16e0c65aba3b5cb44a78cdb3e1 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 11 Oct 2018 20:49:01 +0200
Subject: [PATCH] Enable spotbugs in yang-binding

This fixes up the issues reported and flips enforcement to on.

Change-Id: I2e9b0c82af063d322428216be40e7562959f0824
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/yang-binding/pom.xml                               | 7 +++++++
 .../opendaylight/yangtools/yang/binding/Identifier.java    | 6 ++++--
 .../yangtools/yang/binding/InstanceIdentifierV3.java       | 2 +-
 .../yangtools/yang/binding/KeyedInstanceIdentifierV2.java  | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/binding/yang-binding/pom.xml b/binding/yang-binding/pom.xml
index bdadde93b3..6460de1a1d 100644
--- a/binding/yang-binding/pom.xml
+++ b/binding/yang-binding/pom.xml
@@ -59,6 +59,13 @@
                     <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <failOnError>true</failOnError>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Identifier.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Identifier.java
index 60b85d52b5..343088f70e 100644
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Identifier.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/Identifier.java
@@ -7,13 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.binding;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Object is unique identifier for another object.
  *
- * @param <T>
- *            Class of object for which this object is identifier
+ * @param <T> Class of object for which this object is identifier
  * @author ttkacik
  */
+@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_INTERFACE", justification = "This is binding specialization")
 public interface Identifier<T extends Identifiable<?>> extends org.opendaylight.yangtools.concepts.Identifier {
 
 }
diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierV3.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierV3.java
index 4a9023da6a..7f6ce11e55 100644
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierV3.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/InstanceIdentifierV3.java
@@ -80,7 +80,7 @@ class InstanceIdentifierV3<T extends DataObject> implements Externalizable {
         pathArguments = ImmutableList.copyOf(args);
     }
 
-    private Object readResolve() throws ObjectStreamException {
+    Object readResolve() throws ObjectStreamException {
         return new InstanceIdentifier<>(targetType, pathArguments, wildcarded, hash);
     }
 }
diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifierV2.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifierV2.java
index fbce0dee8d..a7f2546dd8 100644
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifierV2.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifierV2.java
@@ -41,7 +41,8 @@ final class KeyedInstanceIdentifierV2<T extends Identifiable<K> & DataObject, K
         key = (K) in.readObject();
     }
 
-    private Object readResolve() throws ObjectStreamException {
+    @Override
+    Object readResolve() throws ObjectStreamException {
         return new KeyedInstanceIdentifier<>(getTargetType(), getPathArguments(), isWildcarded(), getHash(), key);
     }
 }
-- 
2.36.6