This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push:
new 273b687f Use for-each loop
273b687f is described below
commit 273b687f81a1e48f2dc1bd1850f223ed21a8ebb5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 9 09:17:25 2022 -0400
Use for-each loop
---
.../java/org/apache/commons/validator/Field.java | 32 ++++------------------
.../java/org/apache/commons/validator/Form.java | 8 ++----
.../commons/validator/util/ValidatorUtils.java | 27 +++++-------------
3 files changed, 15 insertions(+), 52 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/Field.java
b/src/main/java/org/apache/commons/validator/Field.java
index 9e872ad8..100e4963 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -608,11 +608,8 @@ public class Field implements Cloneable, Serializable {
* Replace the vars value with the key/value pairs passed in.
*/
private void processVars(final String key, final String replaceValue) {
- final Iterator<String> i = getVarMap().keySet().iterator();
- while (i.hasNext()) {
- final String varKey = i.next();
+ for (final String varKey : getVarMap().keySet()) {
final Var var = this.getVar(varKey);
-
var.setValue(ValidatorUtils.replace(var.getValue(), key,
replaceValue));
}
@@ -639,18 +636,12 @@ public class Field implements Cloneable, Serializable {
*/
private void processArg(final String key, final String replaceValue) {
for (final Map<String, Arg> argMap : this.args) {
-
if (argMap == null) {
continue;
}
-
- final Iterator<Arg> iter = argMap.values().iterator();
- while (iter.hasNext()) {
- final Arg arg = iter.next();
-
+ for (final Arg arg : argMap.values()) {
if (arg != null) {
- arg.setKey(
- ValidatorUtils.replace(arg.getKey(), key,
replaceValue));
+ arg.setKey(ValidatorUtils.replace(arg.getKey(), key,
replaceValue));
}
}
}
@@ -696,13 +687,7 @@ public class Field implements Cloneable, Serializable {
}
final Map<String, Arg> argMap = new HashMap<>(this.args[i]);
- final Iterator<Entry<String, Arg>> iter =
argMap.entrySet().iterator();
- while (iter.hasNext()) {
- final Entry<String, Arg> entry = iter.next();
- final String validatorName = entry.getKey();
- final Arg arg = entry.getValue();
- argMap.put(validatorName, (Arg) arg.clone());
- }
+ argMap.forEach((validatorName, arg) -> argMap.put(validatorName,
(Arg) arg.clone()));
field.args[i] = argMap;
}
@@ -851,10 +836,7 @@ public class Field implements Cloneable, Serializable {
return true;
}
- final Iterator<String> iter = dependentValidators.iterator();
- while (iter.hasNext()) {
- final String depend = iter.next();
-
+ for (final String depend : dependentValidators) {
final ValidatorAction action = actions.get(depend);
if (action == null) {
this.handleMissingAction(depend);
@@ -896,9 +878,7 @@ public class Field implements Cloneable, Serializable {
final ValidatorResults results = new ValidatorResults();
synchronized(dependencyList) {
- final Iterator<String> dependencies =
this.dependencyList.iterator();
- while (dependencies.hasNext()) {
- final String depend = dependencies.next();
+ for (final String depend : this.dependencyList) {
final ValidatorAction action = actions.get(depend);
if (action == null) {
diff --git a/src/main/java/org/apache/commons/validator/Form.java
b/src/main/java/org/apache/commons/validator/Form.java
index 6de70925..79e4e78e 100644
--- a/src/main/java/org/apache/commons/validator/Form.java
+++ b/src/main/java/org/apache/commons/validator/Form.java
@@ -148,9 +148,7 @@ public class Form implements Serializable {
@SuppressWarnings("unchecked") // FastHashMap is not generic
final
Map<String, Field> temphFields = new FastHashMap();
- final Iterator<Field> dependsIt = depends.getFields().iterator();
- while (dependsIt.hasNext()) {
- final Field defaultField = dependsIt.next();
+ for (final Field defaultField : depends.getFields()) {
if (defaultField != null) {
final String fieldKey = defaultField.getKey();
if (!this.containsField(fieldKey)) {
@@ -283,9 +281,7 @@ public class Form implements Serializable {
results.merge(field.validate(params, actions));
}
} else {
- final Iterator<Field> fields = this.lFields.iterator();
- while (fields.hasNext()) {
- final Field field = fields.next();
+ for (final Field field : this.lFields) {
params.put(Validator.FIELD_PARAM, field);
diff --git
a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
index 6ef31ac2..e3ccb688 100644
--- a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
+++ b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
@@ -129,7 +129,7 @@ public class ValidatorUtils {
* are <code>Msg</code>, <code>Arg</code>,
* or <code>Var</code>. Otherwise it is a shallow copy.
*
- * @param map <code>FastHashMap</code> to copy.
+ * @param fastHashMap <code>FastHashMap</code> to copy.
* @return FastHashMap A copy of the <code>FastHashMap</code> that was
* passed in.
* @deprecated This method is not part of Validator's public API.
Validator
@@ -137,17 +137,11 @@ public class ValidatorUtils {
* copyMap() instead.
*/
@Deprecated
- public static FastHashMap copyFastHashMap(final FastHashMap map) {
+ public static FastHashMap copyFastHashMap(final FastHashMap fastHashMap) {
final FastHashMap results = new FastHashMap();
-
@SuppressWarnings("unchecked") // FastHashMap is not generic
- final
- Iterator<Entry<String, ?>> i = map.entrySet().iterator();
- while (i.hasNext()) {
- final Entry<String, ?> entry = i.next();
- final String key = entry.getKey();
- final Object value = entry.getValue();
-
+ final HashMap<String, ?> map = fastHashMap;
+ map.forEach((key, value) -> {
if (value instanceof Msg) {
results.put(key, ((Msg) value).clone());
} else if (value instanceof Arg) {
@@ -157,8 +151,7 @@ public class ValidatorUtils {
} else {
results.put(key, value);
}
- }
-
+ });
results.setFast(true);
return results;
}
@@ -174,13 +167,7 @@ public class ValidatorUtils {
*/
public static Map<String, Object> copyMap(final Map<String, Object> map) {
final Map<String, Object> results = new HashMap<>();
-
- final Iterator<Entry<String, Object>> i = map.entrySet().iterator();
- while (i.hasNext()) {
- final Entry<String, Object> entry = i.next();
- final String key = entry.getKey();
- final Object value = entry.getValue();
-
+ map.forEach((key, value) -> {
if (value instanceof Msg) {
results.put(key, ((Msg) value).clone());
} else if (value instanceof Arg) {
@@ -190,7 +177,7 @@ public class ValidatorUtils {
} else {
results.put(key, value);
}
- }
+ });
return results;
}
