From: Robert Varga <rovarga@cisco.com>
Date: Tue, 20 Sep 2016 01:48:33 +0000 (+0200)
Subject: Do not use entrySet() where values() or keySet() suffices
X-Git-Tag: release/boron-sr1~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=d64f504392ed8348735d7c609022c7eebcd38d29

Do not use entrySet() where values() or keySet() suffices

Instead of forcing instatiation of entrySet() and using only
part of the provided data, use values() and keySet() based
on what we really need.

Change-Id: I0a9333b872f9c56e1fa4eddb985309741cf77fe8
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit c935f35b6eb698878eb73ba439a57fb7f40d6539)
---

diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModification.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModification.java
index eeb8e91d66..0a4bffa9a1 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModification.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModification.java
@@ -11,7 +11,6 @@ package org.opendaylight.mdsal.dom.store.inmemory;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -50,8 +49,8 @@ final class ShardDataModification extends WriteableNodeWithSubshard {
             Map<YangInstanceIdentifier, ForeignShardModificationContext> shards) {
 
         ShardDataModificationBuilder builder = new ShardDataModificationBuilder(root);
-        for (Entry<YangInstanceIdentifier, ForeignShardModificationContext> subshard : shards.entrySet()) {
-            builder.addSubshard(subshard.getValue());
+        for (ForeignShardModificationContext subshard : shards.values()) {
+            builder.addSubshard(subshard);
         }
         return builder.build();
     }
diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeOperation.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeOperation.java
index 2908715651..11eae69abb 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeOperation.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeOperation.java
@@ -10,7 +10,6 @@ package org.opendaylight.mdsal.dom.store.inmemory;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import java.util.Map.Entry;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -101,8 +100,7 @@ abstract class WriteableNodeOperation implements WriteCursorStrategy {
             write(writtenChild.getIdentifier(), writtenChild);
         }
         // Delete step - remove subshard data that was written into current shard
-        for (Entry<PathArgument, WriteableModificationNode> shardChild : node.getChildrenWithSubshards().entrySet()) {
-            PathArgument childId = shardChild.getKey();
+        for (PathArgument childId : node.getChildrenWithSubshards().keySet()) {
             @SuppressWarnings("unchecked")
             Optional<NormalizedNode<?, ?>> writtenValue = ((NormalizedNodeContainer) data).getChild(childId);
             if (writtenValue.isPresent()) {
diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeWithSubshard.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeWithSubshard.java
index 326ab23306..58cb6d9852 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeWithSubshard.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/WriteableNodeWithSubshard.java
@@ -10,14 +10,13 @@ package org.opendaylight.mdsal.dom.store.inmemory;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 abstract class WriteableNodeWithSubshard extends WriteableModificationNode {
 
     private final Map<PathArgument, WriteableModificationNode> children;
 
-    WriteableNodeWithSubshard(Map<PathArgument, WriteableModificationNode> children) {
+    WriteableNodeWithSubshard(final Map<PathArgument, WriteableModificationNode> children) {
         this.children = ImmutableMap.copyOf(children);
     }
 
@@ -27,14 +26,14 @@ abstract class WriteableNodeWithSubshard extends WriteableModificationNode {
     }
 
     @Override
-    WriteableModificationNode getChild(PathArgument node) {
+    WriteableModificationNode getChild(final PathArgument node) {
         return children.get(node);
     }
 
     @Override
     void markDeleted() {
-        for (Entry<PathArgument, WriteableModificationNode> child : children.entrySet()) {
-            child.getValue().markDeleted();
+        for (WriteableModificationNode child : children.values()) {
+            child.markDeleted();
         }
     }
 }
\ No newline at end of file