You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/04/15 22:23:29 UTC
svn commit: r1739361 - in /commons/proper/validator/trunk/src:
main/java/org/apache/commons/validator/
main/java/org/apache/commons/validator/routines/
main/java/org/apache/commons/validator/util/
test/java/org/apache/commons/validator/ test/java/org/a...
Author: ggregory
Date: Fri Apr 15 20:23:29 2016
New Revision: 1739361
URL: http://svn.apache.org/viewvc?rev=1739361&view=rev
Log:
Unnecessary casts.
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Field.java
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/ValidatorAction.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResources.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResult.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResults.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Field.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Field.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Field.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/Field.java Fri Apr 15 20:23:29 2016
@@ -288,7 +288,7 @@ public class Field implements Cloneable,
* @return A validation message for a specified validator.
*/
public Msg getMessage(String key) {
- return (Msg) getMsgMap().get(key);
+ return getMsgMap().get(key);
}
/**
@@ -432,7 +432,7 @@ public class Field implements Cloneable,
return null;
}
- Arg arg = (Arg) args[position].get(key);
+ Arg arg = args[position].get(key);
// Didn't find default arg so exit, otherwise we would get into
// infinite recursion
@@ -485,7 +485,7 @@ public class Field implements Cloneable,
* @return the Variable
*/
public Var getVar(String mainKey) {
- return (Var) getVarMap().get(mainKey);
+ return getVarMap().get(mainKey);
}
/**
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=1739361&r1=1739360&r2=1739361&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 Fri Apr 15 20:23:29 2016
@@ -149,7 +149,7 @@ public class Form implements Serializabl
Map<String, Field> temphFields = new FastHashMap();
Iterator<Field> dependsIt = depends.getFields().iterator();
while (dependsIt.hasNext()) {
- Field defaultField = (Field) dependsIt.next();
+ Field defaultField = dependsIt.next();
if (defaultField != null) {
String fieldKey = defaultField.getKey();
if (!this.containsField(fieldKey)) {
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=1739361&r1=1739360&r2=1739361&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 Fri Apr 15 20:23:29 2016
@@ -274,7 +274,7 @@ public class FormSet implements Serializ
* @return The form
*/
public Form getForm(String formName) {
- return (Form) this.forms.get(formName);
+ return this.forms.get(formName);
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java Fri Apr 15 20:23:29 2016
@@ -647,7 +647,7 @@ public class ValidatorAction implements
Class<?>[] parameterClasses = new Class[this.methodParameterList.size()];
for (int i = 0; i < this.methodParameterList.size(); i++) {
- String paramClassName = (String) this.methodParameterList.get(i);
+ String paramClassName = this.methodParameterList.get(i);
try {
parameterClasses[i] = loader.loadClass(paramClassName);
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=1739361&r1=1739360&r2=1739361&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 Fri Apr 15 20:23:29 2016
@@ -573,16 +573,16 @@ public class ValidatorResources implemen
if (fs.getType() == FormSet.LANGUAGE_FORMSET) {
parent = defaultFormSet;
} else if (fs.getType() == FormSet.COUNTRY_FORMSET) {
- parent = (FormSet) getFormSets().get(buildLocale(fs.getLanguage(),
+ parent = getFormSets().get(buildLocale(fs.getLanguage(),
null, null));
if (parent == null) {
parent = defaultFormSet;
}
} else if (fs.getType() == FormSet.VARIANT_FORMSET) {
- parent = (FormSet) getFormSets().get(buildLocale(fs.getLanguage(), fs
+ parent = getFormSets().get(buildLocale(fs.getLanguage(), fs
.getCountry(), null));
if (parent == null) {
- parent = (FormSet) getFormSets().get(buildLocale(fs.getLanguage(),
+ parent = getFormSets().get(buildLocale(fs.getLanguage(),
null, null));
if (parent == null) {
parent = defaultFormSet;
@@ -609,7 +609,7 @@ public class ValidatorResources implemen
return defaultFormSet;
}
- return (FormSet)getFormSets().get(key);
+ return getFormSets().get(key);
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResult.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResult.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResult.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResult.java Fri Apr 15 20:23:29 2016
@@ -88,7 +88,7 @@ public class ValidatorResult implements
* @return true if the validation passed.
*/
public boolean isValid(String validatorName) {
- ResultStatus status = (ResultStatus) hAction.get(validatorName);
+ ResultStatus status = hAction.get(validatorName);
return (status == null) ? false : status.isValid();
}
@@ -98,7 +98,7 @@ public class ValidatorResult implements
* @return The validation result.
*/
public Object getResult(String validatorName) {
- ResultStatus status = (ResultStatus) hAction.get(validatorName);
+ ResultStatus status = hAction.get(validatorName);
return (status == null) ? null : status.getResult();
}
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResults.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResults.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResults.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorResults.java Fri Apr 15 20:23:29 2016
@@ -111,7 +111,7 @@ public class ValidatorResults implements
* @return The result of a specified key.
*/
public ValidatorResult getValidatorResult(String key) {
- return (ValidatorResult) this.hResults.get(key);
+ return this.hResults.get(key);
}
/**
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java Fri Apr 15 20:23:29 2016
@@ -151,7 +151,7 @@ public class InetAddressValidator implem
int validOctets = 0;
int emptyOctets = 0;
for (int index = 0; index < octets.length; index++) {
- String octet = (String) octets[index];
+ String octet = octets[index];
if (octet.length() == 0) {
emptyOctets++;
if (emptyOctets > 1) {
Modified: commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java (original)
+++ commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java Fri Apr 15 20:23:29 2016
@@ -148,7 +148,7 @@ public class ValidatorUtils {
Iterator<Entry<String, ?>> i = map.entrySet().iterator();
while (i.hasNext()) {
Entry<String, ?> entry = i.next();
- String key = (String) entry.getKey();
+ String key = entry.getKey();
Object value = entry.getValue();
if (value instanceof Msg) {
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java Fri Apr 15 20:23:29 2016
@@ -348,16 +348,16 @@ public class ExtensionTest extends TestC
assertTrue("There should only be 2 fields in " + FORM_KEY2, form2.getFields().size() == 2);
//get the first field
- Field fieldFirstName = (Field)form.getFields().get(0);
+ Field fieldFirstName = form.getFields().get(0);
//get the second field
- Field fieldLastName = (Field)form.getFields().get(1);
+ Field fieldLastName = form.getFields().get(1);
assertTrue("firstName in " + FORM_KEY + " should be the first in the list", fieldFirstName.getKey().equals("firstName"));
assertTrue("lastName in " + FORM_KEY + " should be the first in the list", fieldLastName.getKey().equals("lastName"));
// get the second field
- fieldLastName = (Field)form2.getFields().get(0);
+ fieldLastName = form2.getFields().get(0);
//get the first field
- fieldFirstName = (Field)form2.getFields().get(1);
+ fieldFirstName = form2.getFields().get(1);
assertTrue("firstName in " + FORM_KEY2 + " should be the first in the list", fieldFirstName.getKey().equals("firstName"));
assertTrue("lastName in " + FORM_KEY2 + " should be the first in the list", fieldLastName.getKey().equals("lastName"));
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java Fri Apr 15 20:23:29 2016
@@ -428,7 +428,7 @@ public class DomainValidatorTest extends
unicodeTld = asciiTld;
}
if (!dv.isValidTld(asciiTld)) {
- String [] info = (String[]) htmlInfo.get(asciiTld);
+ String [] info = htmlInfo.get(asciiTld);
if (info != null) {
String type = info[0];
String comment = info[1];
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java?rev=1739361&r1=1739360&r2=1739361&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java (original)
+++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java Fri Apr 15 20:23:29 2016
@@ -156,7 +156,7 @@ public class IBANCheckDigitTest extends
}
}
- return (String[])list.toArray(new String[list.size()]);
+ return list.toArray(new String[list.size()]);
}
/**