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 2020/11/21 15:57:46 UTC
[commons-validator] branch master updated: Use diamonds.
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 0d37c26 Use diamonds.
0d37c26 is described below
commit 0d37c26167f11d284d724d8bc321a950432869fb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 10:57:41 2020 -0500
Use diamonds.
---
.../java/org/apache/commons/validator/CreditCardValidator.java | 2 +-
src/main/java/org/apache/commons/validator/Form.java | 4 ++--
src/main/java/org/apache/commons/validator/FormSet.java | 4 ++--
src/main/java/org/apache/commons/validator/UrlValidator.java | 2 +-
.../java/org/apache/commons/validator/ValidatorResult.java | 2 +-
.../java/org/apache/commons/validator/ValidatorResults.java | 4 ++--
.../apache/commons/validator/routines/CreditCardValidator.java | 2 +-
.../org/apache/commons/validator/routines/IBANValidator.java | 2 +-
.../commons/validator/routines/InetAddressValidator.java | 2 +-
.../java/org/apache/commons/validator/util/ValidatorUtils.java | 2 +-
src/test/java/org/apache/commons/validator/ValidatorTest.java | 2 +-
.../apache/commons/validator/routines/DomainValidatorTest.java | 10 +++++-----
.../validator/routines/checkdigit/AbstractCheckDigitTest.java | 2 +-
.../validator/routines/checkdigit/IBANCheckDigitTest.java | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/CreditCardValidator.java b/src/main/java/org/apache/commons/validator/CreditCardValidator.java
index f72255c..e82822b 100644
--- a/src/main/java/org/apache/commons/validator/CreditCardValidator.java
+++ b/src/main/java/org/apache/commons/validator/CreditCardValidator.java
@@ -95,7 +95,7 @@ public class CreditCardValidator {
/**
* The CreditCardTypes that are allowed to pass validation.
*/
- private final Collection<CreditCardType> cardTypes = new ArrayList<CreditCardType>();
+ private final Collection<CreditCardType> cardTypes = new ArrayList<>();
/**
* Create a new CreditCardValidator with default options.
diff --git a/src/main/java/org/apache/commons/validator/Form.java b/src/main/java/org/apache/commons/validator/Form.java
index 68488bb..45b560c 100644
--- a/src/main/java/org/apache/commons/validator/Form.java
+++ b/src/main/java/org/apache/commons/validator/Form.java
@@ -50,7 +50,7 @@ public class Form implements Serializable {
* in although individual <code>Field</code>s can be retrieved using <code>Map</code>
* of <code>Field</code>s.
*/
- protected List<Field> lFields = new ArrayList<Field>();
+ protected List<Field> lFields = new ArrayList<>();
/**
* Map of <code>Field</code>s keyed on their property value.
@@ -144,7 +144,7 @@ public class Form implements Serializable {
*/
protected void merge(Form depends) {
- List<Field> templFields = new ArrayList<Field>();
+ List<Field> templFields = new ArrayList<>();
@SuppressWarnings("unchecked") // FastHashMap is not generic
Map<String, Field> temphFields = new FastHashMap();
Iterator<Field> dependsIt = depends.getFields().iterator();
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java b/src/main/java/org/apache/commons/validator/FormSet.java
index 5767c52..72aff82 100644
--- a/src/main/java/org/apache/commons/validator/FormSet.java
+++ b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -59,13 +59,13 @@ public class FormSet implements Serializable {
* A <code>Map</code> of <code>Form</code>s using the name field of the
* <code>Form</code> as the key.
*/
- private final Map<String, Form> forms = new HashMap<String, Form>();
+ private final Map<String, Form> forms = new HashMap<>();
/**
* A <code>Map</code> of <code>Constant</code>s using the name field of the
* <code>Constant</code> as the key.
*/
- private final Map<String, String> constants = new HashMap<String, String>();
+ private final Map<String, String> constants = new HashMap<>();
/**
* This is the type of <code>FormSet</code>s where no locale is specified.
diff --git a/src/main/java/org/apache/commons/validator/UrlValidator.java b/src/main/java/org/apache/commons/validator/UrlValidator.java
index 076cd91..0aa4b12 100644
--- a/src/main/java/org/apache/commons/validator/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/UrlValidator.java
@@ -176,7 +176,7 @@ public class UrlValidator implements Serializable {
/**
* The set of schemes that are allowed to be in a URL.
*/
- private final Set<String> allowedSchemes = new HashSet<String>();
+ private final Set<String> allowedSchemes = new HashSet<>();
/**
* If no schemes are provided, default to this set.
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResult.java b/src/main/java/org/apache/commons/validator/ValidatorResult.java
index 8ee444f..34c482f 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResult.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResult.java
@@ -37,7 +37,7 @@ public class ValidatorResult implements Serializable {
* Map of results. The key is the name of the <code>ValidatorAction</code>
* and the value is whether or not this field passed or not.
*/
- protected Map<String, ResultStatus> hAction = new HashMap<String, ResultStatus>();
+ protected Map<String, ResultStatus> hAction = new HashMap<>();
/**
* <code>Field</code> being validated.
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResults.java b/src/main/java/org/apache/commons/validator/ValidatorResults.java
index 144264e..50f3f55 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResults.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResults.java
@@ -37,7 +37,7 @@ public class ValidatorResults implements Serializable {
/**
* Map of validation results.
*/
- protected Map<String, ValidatorResult> hResults = new HashMap<String, ValidatorResult>();
+ protected Map<String, ValidatorResult> hResults = new HashMap<>();
/**
* Merge another ValidatorResults into mine.
@@ -130,7 +130,7 @@ public class ValidatorResults implements Serializable {
* @return Map of objections returned by validators.
*/
public Map<String, Object> getResultValueMap() {
- Map<String, Object> results = new HashMap<String, Object>();
+ Map<String, Object> results = new HashMap<>();
for (Iterator<String> i = hResults.keySet().iterator(); i.hasNext();) {
String propertyKey = i.next();
diff --git a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
index 01016a0..7d269b5 100644
--- a/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
@@ -204,7 +204,7 @@ public class CreditCardValidator implements Serializable {
/**
* The CreditCardTypes that are allowed to pass validation.
*/
- private final List<CodeValidator> cardTypes = new ArrayList<CodeValidator>();
+ private final List<CodeValidator> cardTypes = new ArrayList<>();
/**
* Luhn checkdigit validator for the card numbers.
diff --git a/src/main/java/org/apache/commons/validator/routines/IBANValidator.java b/src/main/java/org/apache/commons/validator/routines/IBANValidator.java
index 7fc9458..d95be7e 100644
--- a/src/main/java/org/apache/commons/validator/routines/IBANValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/IBANValidator.java
@@ -227,7 +227,7 @@ public class IBANValidator {
}
private Map<String, Validator> createValidators(Validator[] formatMap) {
- Map<String, Validator> m = new ConcurrentHashMap<String, Validator>();
+ Map<String, Validator> m = new ConcurrentHashMap<>();
for(Validator v : formatMap) {
m.put(v.countryCode, v);
}
diff --git a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
index a10a8bc..a9648b1 100644
--- a/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/InetAddressValidator.java
@@ -166,7 +166,7 @@ public class InetAddressValidator implements Serializable {
}
String[] octets = inet6Address.split(":");
if (containsCompressedZeroes) {
- List<String> octetList = new ArrayList<String>(Arrays.asList(octets));
+ List<String> octetList = new ArrayList<>(Arrays.asList(octets));
if (inet6Address.endsWith("::")) {
// String.split() drops ending empty segments
octetList.add("");
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 b0539bc..3e49828 100644
--- a/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
+++ b/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
@@ -176,7 +176,7 @@ public class ValidatorUtils {
* @return A copy of the <code>Map</code> that was passed in.
*/
public static Map<String, Object> copyMap(Map<String, Object> map) {
- Map<String, Object> results = new HashMap<String, Object>();
+ Map<String, Object> results = new HashMap<>();
Iterator<Entry<String, Object>> i = map.entrySet().iterator();
while (i.hasNext()) {
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index 3ec8734..08b097f 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -191,7 +191,7 @@ public class ValidatorTest extends TestCase {
resources.addFormSet(fs);
resources.process();
- List<?> l = new ArrayList<Object>();
+ List<?> l = new ArrayList<>();
TestBean bean = new TestBean();
bean.setLetter("A");
diff --git a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
index 2cd9305..3de6740 100644
--- a/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DomainValidatorTest.java
@@ -329,7 +329,7 @@ public class DomainValidatorTest extends TestCase {
System.out.println("Fix arrays before retrying; cannot continue");
return;
}
- Set<String> ianaTlds = new HashSet<String>(); // keep for comparison with array contents
+ Set<String> ianaTlds = new HashSet<>(); // keep for comparison with array contents
DomainValidator dv = DomainValidator.getInstance();
File txtFile = new File("target/tlds-alpha-by-domain.txt");
long timestamp = download(txtFile, "https://data.iana.org/TLD/tlds-alpha-by-domain.txt", 0L);
@@ -352,8 +352,8 @@ public class DomainValidatorTest extends TestCase {
// Parse html page to get entries
Map<String, String[]> htmlInfo = getHtmlInfo(htmlFile);
- Map<String, String> missingTLD = new TreeMap<String, String>(); // stores entry and comments as String[]
- Map<String, String> missingCC = new TreeMap<String, String>();
+ Map<String, String> missingTLD = new TreeMap<>(); // stores entry and comments as String[]
+ Map<String, String> missingCC = new TreeMap<>();
while((line = br.readLine()) != null) {
if (!line.startsWith("#")) {
final String unicodeTld; // only different from asciiTld if that was punycode
@@ -394,7 +394,7 @@ public class DomainValidatorTest extends TestCase {
}
br.close();
// List html entries not in TLD text list
- for(String key : (new TreeMap<String, String[]>(htmlInfo)).keySet()) {
+ for(String key : (new TreeMap<>(htmlInfo)).keySet()) {
if (!ianaTlds.contains(key)) {
if (isNotInRootZone(key)) {
System.out.println("INFO: HTML entry not yet in root zone: "+key);
@@ -431,7 +431,7 @@ public class DomainValidatorTest extends TestCase {
}
private static Map<String, String[]> getHtmlInfo(final File f) throws IOException {
- final Map<String, String[]> info = new HashMap<String, String[]>();
+ final Map<String, String[]> info = new HashMap<>();
// <td><span class="domain tld"><a href="/domains/root/db/ax.html">.ax</a></span></td>
final Pattern domain = Pattern.compile(".*<a href=\"/domains/root/db/([^.]+)\\.html");
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
index c903d37..d657612 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/AbstractCheckDigitTest.java
@@ -287,7 +287,7 @@ public abstract class AbstractCheckDigitTest extends TestCase {
* @return Codes with invalid check digits
*/
protected String[] createInvalidCodes(String[] codes) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
// create invalid check digit values
for (String fullCode : codes) {
diff --git a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
index f91485a..efb70fb 100644
--- a/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/checkdigit/IBANCheckDigitTest.java
@@ -187,7 +187,7 @@ public class IBANCheckDigitTest extends AbstractCheckDigitTest {
*/
@Override
protected String[] createInvalidCodes(String[] codes) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
// create invalid check digit values
for (int i = 0; i < codes.length; i++) {