Address spotbugs warnings

StringIdentityrefCodecs seem to be unused, fix them up a bit
and note their Beta status.

Change-Id: Ia758c3211419411e5934bc66b804057ec4581535
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringIdentityrefCodec.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringIdentityrefCodec.java
index 3c58ffbb7c231004c0b55cb15e01f38d24b6253f..b2b1d0891af0230986b2582d042a7f0a91f76884 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringIdentityrefCodec.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringIdentityrefCodec.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.util;
 
 import com.google.common.annotations.Beta;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.codec.IdentityrefCodec;
 

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java
index f931175bf6c9709e31065562e308817f70af9e41..9a22d7cdda041975cc2a80db955d7300d6780135 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ModuleStringIdentityrefCodec.java
@@ -9,24 +9,37 @@ package org.opendaylight.yangtools.yang.data.util;
 
 import static java.util.Objects.requireNonNull;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import com.google.common.annotations.Beta;
 import java.net.URI;
 import java.util.Iterator;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
 
-public abstract class ModuleStringIdentityrefCodec extends AbstractModuleStringIdentityrefCodec {
-    // FIXME: 3.0.0: hide these fields
-    protected final SchemaContext context;
-    @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    protected final QNameModule parentModuleQname;
+/**
+ * Base class for implementing identityref codecs on based on module names.
+ */
+@Beta
+public abstract class ModuleStringIdentityrefCodec extends AbstractModuleStringIdentityrefCodec
+        implements SchemaContextProvider {
+    private final SchemaContext context;
+    private final QNameModule parentModule;
 
     protected ModuleStringIdentityrefCodec(final @NonNull SchemaContext context,
             final @NonNull QNameModule parentModule) {
         this.context = requireNonNull(context);
-        this.parentModuleQname = requireNonNull(parentModule);
+        this.parentModule = requireNonNull(parentModule);
+    }
+
+    @Override
+    public final SchemaContext getSchemaContext() {
+        return context;
+    }
+
+    protected final QNameModule getParentModule() {
+        return parentModule;
     }
 
     @Override