Author: sebb
Date: Thu Jan 15 00:27:34 2015
New Revision: 1651910
URL: http://svn.apache.org/r1651910
Log:
Generics
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Form.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/FormSet.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Validator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Form.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Form.java?rev=1651910&r1=1651909&r2=1651910&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Form.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Form.java
Thu Jan 15 00:27:34 2015
@@ -243,6 +243,7 @@ public class Form implements Serializabl
* validation messages.
* @throws ValidatorException
*/
+ // TODO difficult to add generics for params as the map may contain values
with incompatible classes
ValidatorResults validate(Map params, Map<String, ValidatorAction>
actions, int page)
throws ValidatorException {
return validate(params, actions, page, null);
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/FormSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/FormSet.java?rev=1651910&r1=1651909&r2=1651910&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/FormSet.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/FormSet.java
Thu Jan 15 00:27:34 2015
@@ -149,18 +149,18 @@ public class FormSet implements Serializ
*/
protected void merge(FormSet depends) {
if (depends != null) {
- Map pForms = getForms();
- Map dForms = depends.getForms();
- for (Iterator<Entry> it = dForms.entrySet().iterator();
it.hasNext(); ) {
- Entry entry = it.next();
- Object key = entry.getKey();
- Form pForm = (Form) pForms.get(key);
+ Map<String, Form> pForms = getForms();
+ Map<String, Form> dForms = depends.getForms();
+ for (Iterator<Entry<String, Form>> it =
dForms.entrySet().iterator(); it.hasNext(); ) {
+ Entry<String, Form> entry = it.next();
+ String key = entry.getKey();
+ Form pForm = pForms.get(key);
if (pForm != null) {//merge, but principal 'rules', don't
overwrite
// anything
- pForm.merge((Form) entry.getValue());
+ pForm.merge(entry.getValue());
}
else {//just add
- addForm((Form) entry.getValue());
+ addForm(entry.getValue());
}
}
}
@@ -292,7 +292,7 @@ public class FormSet implements Serializ
*
* @param globalConstants Global constants
*/
- synchronized void process(Map globalConstants) {
+ synchronized void process(Map<String, String> globalConstants) {
for (Iterator<Form> i = forms.values().iterator(); i.hasNext(); ) {
Form f = i.next();
f.process(globalConstants, constants, forms);
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Validator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Validator.java?rev=1651910&r1=1651909&r2=1651910&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Validator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Validator.java
Thu Jan 15 00:27:34 2015
@@ -28,6 +28,7 @@ import java.util.Map;
*
* @version $Revision$
*/
+// TODO mutable fields should be made private and accessed via suitable
methods only
public class Validator implements Serializable {
private static final long serialVersionUID = -7119418755208731611L;
@@ -108,7 +109,7 @@ public class Validator implements Serial
* Maps validation method parameter class names to the objects to be passed
* into the method.
*/
- protected Map parameters = new HashMap();
+ protected Map<String, Object> parameters = new HashMap<String, Object>();
// <String, Object>
/**
* The current page number to validate.
@@ -277,7 +278,7 @@ public class Validator implements Serial
public void clear() {
this.formName = null;
this.fieldName = null;
- this.parameters = new HashMap();
+ this.parameters = new HashMap<String, Object>();
this.page = 0;
}
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java?rev=1651910&r1=1651909&r2=1651910&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
Thu Jan 15 00:27:34 2015
@@ -534,7 +534,7 @@ public class ValidatorResources implemen
// default formset
defaultFormSet = new FormSet();
}
- defaultFormSet.process(hConstants);
+ defaultFormSet.process(getConstants());
// Loop through FormSets and merge if necessary
for (Iterator<String> i = getFormSets().keySet().iterator();
i.hasNext();) {
String key = i.next();
@@ -546,7 +546,7 @@ public class ValidatorResources implemen
for (Iterator<FormSet> i = getFormSets().values().iterator();
i.hasNext();) {
FormSet fs = i.next();
if (!fs.isProcessed()) {
- fs.process(hConstants);
+ fs.process(getConstants());
}
}
}
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java?rev=1651910&r1=1651909&r2=1651910&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java
Thu Jan 15 00:27:34 2015
@@ -142,7 +142,7 @@ public class GenericTypeValidatorTest ex
info.setFloat("12,1555");
info.setDouble("129,1551511111");
info.setDate("21/12/2010");
- Map map = localeTest(info, Locale.FRENCH);
+ Map<String, ?> map = localeTest(info, Locale.FRENCH);
assertTrue("float value not correct",
((Float)map.get("float")).intValue() == 12);
assertTrue("double value not correct",
((Double)map.get("double")).intValue() == 129);
}
@@ -150,7 +150,7 @@ public class GenericTypeValidatorTest ex
/**
* Tests the locale.
*/
- private Map localeTest(TypeBean info, Locale locale) throws
ValidatorException {
+ private Map<String, ?> localeTest(TypeBean info, Locale locale) throws
ValidatorException {
// Construct validator based on the loaded resources
// and the form key
@@ -171,7 +171,7 @@ public class GenericTypeValidatorTest ex
assertNotNull("Results are null.", results);
- Map hResultValues = results.getResultValueMap();
+ Map<String, ?> hResultValues = results.getResultValueMap();
assertTrue("Expecting byte result to be an instance of Byte for locale:
"+locale, (hResultValues.get("byte") instanceof Byte));
assertTrue("Expecting short result to be an instance of Short for
locale: "+locale, (hResultValues.get("short") instanceof Short));
