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/server/extensions/CharacterSetPasswordValidator.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
index a6956fc..ccf8d57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.forgerock.i18n.LocalizableMessage;
@@ -159,9 +160,10 @@
int usedOptionalCharacterSets = 0;
int optionalCharacterSets = 0;
int mandatoryCharacterSets = 0;
- for (String characterSet : characterSets.keySet())
+ for (Map.Entry<String, Integer> entry : characterSets.entrySet())
{
- int minimumCount = characterSets.get(characterSet);
+ String characterSet = entry.getKey();
+ int minimumCount = entry.getValue();
Integer passwordCount = setCounts.get(characterSet);
if (minimumCount > 0)
{
@@ -185,9 +187,10 @@
}
}
}
- for (String characterRange : characterRanges.keySet())
+ for (Map.Entry<String, Integer> entry : characterRanges.entrySet())
{
- int minimumCount = characterRanges.get(characterRange);
+ String characterRange = entry.getKey();
+ int minimumCount = entry.getValue();
Integer passwordCount = rangeCounts.get(characterRange);
if (minimumCount > 0)
{
@@ -229,9 +232,10 @@
if (usedOptionalCharacterSets < requiredOptionalCharacterSets)
{
StringBuilder builder = new StringBuilder();
- for (String characterSet : characterSets.keySet())
+ for (Map.Entry<String, Integer> entry : characterSets.entrySet())
{
- if (characterSets.get(characterSet) == 0)
+ String characterSet = entry.getKey();
+ if (entry.getValue() == 0)
{
if (builder.length() > 0)
{
@@ -242,9 +246,10 @@
builder.append('\'');
}
}
- for (String characterRange : characterRanges.keySet())
+ for (Map.Entry<String, Integer> entry : characterRanges.entrySet())
{
- if (characterRanges.get(characterRange) == 0)
+ String characterRange = entry.getKey();
+ if (entry.getValue() == 0)
{
if (builder.length() > 0)
{
--
Gitblit v1.10.0