Author: britter
Date: Tue Jan 13 20:32:15 2015
New Revision: 1651476
URL: http://svn.apache.org/r1651476
Log:
Use String.contains(String) instead of String.indexOf(String) != -1
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java?rev=1651476&r1=1651475&r2=1651476&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/CreditCardValidator.java
Tue Jan 13 20:32:15 2015
@@ -144,9 +144,8 @@ public class CreditCardValidator {
return false;
}
- Iterator types = this.cardTypes.iterator();
- while (types.hasNext()) {
- CreditCardType type = (CreditCardType) types.next();
+ for (Object cardType : this.cardTypes) {
+ CreditCardType type = (CreditCardType) cardType;
if (type.matches(card)) {
return true;
}
@@ -234,7 +233,7 @@ public class CreditCardValidator {
private static final String PREFIX = "34,37,";
public boolean matches(String card) {
String prefix2 = card.substring(0, 2) + ",";
- return ((PREFIX.indexOf(prefix2) != -1) && (card.length() == 15));
+ return ((PREFIX.contains(prefix2)) && (card.length() == 15));
}
}
@@ -249,7 +248,7 @@ public class CreditCardValidator {
private static final String PREFIX = "51,52,53,54,55,";
public boolean matches(String card) {
String prefix2 = card.substring(0, 2) + ",";
- return ((PREFIX.indexOf(prefix2) != -1) && (card.length() == 16));
+ return ((PREFIX.contains(prefix2)) && (card.length() == 16));
}
}
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=1651476&r1=1651475&r2=1651476&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
Tue Jan 13 20:32:15 2015
@@ -115,7 +115,7 @@ public class InetAddressValidator implem
* @since 1.4.1
*/
public boolean isValidInet6Address(String inet6Address) {
- boolean containsCompressedZeroes = inet6Address.indexOf("::") > -1; //
contains is Java 1.5
+ boolean containsCompressedZeroes = inet6Address.contains("::");
if (containsCompressedZeroes && (inet6Address.indexOf("::") !=
inet6Address.lastIndexOf("::"))) {
return false;
}
@@ -148,7 +148,7 @@ public class InetAddressValidator implem
}
} else {
emptyOctets = 0;
- if (octet.indexOf(".") > -1) { // contains is Java 1.5+
+ if (octet.contains(".")) { // contains is Java 1.5+
if (!inet6Address.endsWith(octet)) {
return false;
}
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java?rev=1651476&r1=1651475&r2=1651476&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CreditCardValidatorTest.java
Tue Jan 13 20:32:15 2015
@@ -80,7 +80,7 @@ public class CreditCardValidatorTest ext
private static final String PREFIX = "300,301,302,303,304,305,";
public boolean matches(String card) {
String prefix = card.substring(0, 3) + ",";
- return ((PREFIX.indexOf(prefix) != -1) && (card.length() == 14));
+ return ((PREFIX.contains(prefix)) && (card.length() == 14));
}
}
Modified:
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java?rev=1651476&r1=1651475&r2=1651476&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
(original)
+++
commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericValidatorImpl.java
Tue Jan 13 20:32:15 2015
@@ -225,7 +225,7 @@ public class GenericValidatorImpl {
boolean this_required = false;
if (field.isIndexed() && dependIndexed.equalsIgnoreCase("true")) {
String key = field.getKey();
- if ((key.indexOf("[") > -1) && (key.indexOf("]") > -1)) {
+ if ((key.contains("[")) && (key.contains("]"))) {
String ind = key.substring(0, key.indexOf(".") + 1);
dependProp = ind + dependProp;
}
