From 5d4e721f00910fe920be00faa84d4d77a0abb2ad Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 12 Feb 2020 18:45:08 +0100
Subject: [PATCH] Enable SpotBugs enforcement in yang-data-impl

Fix up the few remaining issues reported and enable enforcement
so we do not regress.

Change-Id: I282c0905fea741cb2200e08e62bf2ba86353f0f3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 yang/yang-data-impl/pom.xml                            |  5 -----
 .../data/impl/schema/ResultAlreadySetException.java    |  2 +-
 .../impl/schema/nodes/UnmodifiableChildrenMap.java     | 10 +++++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index e6a868544c..7b0627939c 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -18,11 +18,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <properties>
-        <!-- FIXME: fixup/suppress remaining bugs and remove this -->
-        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
index 483a86c276..81f510b614 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
@@ -12,7 +12,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 public class ResultAlreadySetException extends IllegalStateException {
     private static final long serialVersionUID = 1L;
 
-    private final NormalizedNode<?, ?> resultData;
+    private final transient NormalizedNode<?, ?> resultData;
 
     public ResultAlreadySetException(final String message, final NormalizedNode<?, ?> resultData) {
         this(message, resultData, null);
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
index 2334a5ccb1..6a2c3d2b20 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/UnmodifiableChildrenMap.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableMap;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
@@ -26,13 +27,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 final class UnmodifiableChildrenMap
         implements CloneableMap<PathArgument, DataContainerChild<? extends PathArgument, ?>>, Serializable {
     private static final long serialVersionUID = 1L;
+
     /*
-     * Do not wrap maps which are smaller than this and instead copy them into
-     * an ImmutableMap.
+     * Do not wrap maps which are smaller than this and instead copy them into an ImmutableMap.
      */
     private static final int WRAP_THRESHOLD = 9;
+
+    @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Delegate is expected to be Serializable")
     private final Map<PathArgument, DataContainerChild<? extends PathArgument, ?>> delegate;
-    private transient Collection<DataContainerChild<? extends PathArgument, ?>> values;
+
+    private transient Collection<DataContainerChild<? extends PathArgument, ?>> values = null;
 
     private UnmodifiableChildrenMap(final Map<PathArgument, DataContainerChild<? extends PathArgument, ?>> delegate) {
         this.delegate = requireNonNull(delegate);
-- 
2.36.6