Use Map.entry() instead of SimpleImmutableEntry

We are using these a dumb DTOs, hence using a value-based
non-serializable implementation is more appropriate.

JIRA: MDSAL-605
Change-Id: Ie36c397a6e265328f31b70dce05b8c72b8756584
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 6ef51407a2c1731520c3a246442386093e67aeeb)

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/query/DOMQueryIterator.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/query/DOMQueryIterator.java
index 892e56650c31fed351a4979b4603c25645f8b818..e911456d4397dac874fec994762520add9b8f1b4 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/query/DOMQueryIterator.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/query/DOMQueryIterator.java
@@ -14,10 +14,10 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.AbstractIterator;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayDeque;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -262,7 +262,7 @@ final class DOMQueryIterator extends AbstractIterator<Entry<YangInstanceIdentifi
 
         // Push the frame back to work, return the result
         frames.push(frame);
-        return new SimpleImmutableEntry<>(childPath, child);
+        return Map.entry(childPath, child);
     }
 
     // Unwind any leftover frames and return a matching item
@@ -270,7 +270,7 @@ final class DOMQueryIterator extends AbstractIterator<Entry<YangInstanceIdentifi
             final PathArgument next, final NormalizedNode<?, ?> child) {
         final YangInstanceIdentifier childPath = createIdentifier(child);
         unwind(frame, next);
-        return new SimpleImmutableEntry<>(childPath, child);
+        return Map.entry(childPath, child);
     }
 
     /**