Bump upstreams

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / query / DefaultQueryResultItem.java

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryResultItem.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryResultItem.java
index cecc684fc547e55fb041f43c702c630c3bd85e44..3b373c8b7186fa12d17a91e6d1c805766fb582c6 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryResultItem.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryResultItem.java
@@ -37,18 +37,22 @@ final class DefaultQueryResultItem<T extends DataObject> implements QueryResult.
         }
     }
 
-    private final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> domItem;
+    private final Entry<YangInstanceIdentifier, NormalizedNode> domItem;
     private final DefaultQueryResult<T> result;
 
     @SuppressWarnings("unused")
-    @SuppressFBWarnings(value = "NP_STORE_INTO_NONNULL_FIELD", justification = "Ungrokked type annotation")
+    @SuppressFBWarnings(
+        value = { "NP_STORE_INTO_NONNULL_FIELD", "URF_UNREAD_FIELD" },
+        justification = "Ungrokked type annotation. https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile @Nullable InstanceIdentifier<T> path = null;
     @SuppressWarnings("unused")
-    @SuppressFBWarnings(value = "NP_STORE_INTO_NONNULL_FIELD", justification = "Ungrokked type annotation")
+    @SuppressFBWarnings(
+        value = { "NP_STORE_INTO_NONNULL_FIELD", "URF_UNREAD_FIELD" },
+        justification = "Ungrokked type annotation. https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile @Nullable T object = null;
 
     DefaultQueryResultItem(final DefaultQueryResult<T> result,
-            final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> domItem) {
+            final Entry<YangInstanceIdentifier, NormalizedNode> domItem) {
         this.result = requireNonNull(result);
         this.domItem = requireNonNull(domItem);
     }