From 7028d9f1483d6f1e77bb0f5ebd0ecc6239e431c5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 14 Nov 2016 15:38:45 +0000
Subject: [PATCH] AutoRefactor'ed use Map.entrySet() instead of Map.keySet() in a loop

---
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index a8769bc..4661f63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -330,9 +330,10 @@
     DN dn = makeDNFromServerProperties(serverProperties);
 
     AddRequest request = newAddRequest(dn);
-    for (ServerProperty prop : serverProperties.keySet())
+    for (Map.Entry<ServerProperty, Object> entry : serverProperties.entrySet())
     {
-      Attribute attribute = makeAttrFromServerProperty(prop, serverProperties.get(prop));
+      ServerProperty prop = entry.getKey();
+      Attribute attribute = makeAttrFromServerProperty(prop, entry.getValue());
       if (attribute != null)
       {
         request.addAttribute(attribute);
@@ -414,9 +415,10 @@
     try
     {
       ModifyRequest request = newModifyRequest(dn);
-      for (ServerProperty prop : serverProperties.keySet())
+      for (Map.Entry<ServerProperty, Object> entry : serverProperties.entrySet())
       {
-        Attribute attr = makeAttrFromServerProperty(prop, serverProperties.get(prop));
+        ServerProperty prop = entry.getKey();
+        Attribute attr = makeAttrFromServerProperty(prop, entry.getValue());
         if (attr != null)
         {
           request.addModification(new Modification(REPLACE, attr));
@@ -725,9 +727,10 @@
     String dn = makeDNFromServerGroupProperties(serverGroupProperties);
     AddRequest request = newAddRequest(dn)
         .addAttribute("objectclass", "top", "groupOfUniqueNames");
-    for (ServerGroupProperty prop : serverGroupProperties.keySet())
+    for (Map.Entry<ServerGroupProperty, Object> entry : serverGroupProperties.entrySet())
     {
-      request.addAttribute(makeAttrFromServerGroupProperty(prop, serverGroupProperties.get(prop)));
+      ServerGroupProperty prop = entry.getKey();
+      request.addAttribute(makeAttrFromServerGroupProperty(prop, entry.getValue()));
     }
 
     try
@@ -782,10 +785,11 @@
 
       // Transform 'properties' into 'attributes'
       ModifyRequest request = newModifyRequest(dn);
-      for (ServerGroupProperty prop : serverGroupProperties.keySet())
+      for (Map.Entry<ServerGroupProperty, Object> entry : serverGroupProperties.entrySet())
       {
+        ServerGroupProperty prop = entry.getKey();
         request.addModification(new Modification(
-            REPLACE, makeAttrFromServerGroupProperty(prop, serverGroupProperties.get(prop))));
+            REPLACE, makeAttrFromServerGroupProperty(prop, entry.getValue())));
       }
       throwIfNotSuccess(connectionWrapper.getConnection().modify(request));
     }

--
Gitblit v1.10.0