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 2023/01/30 00:04:30 UTC
[commons-validator] 03/03: Use varargs
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
commit 60942db1c52e6dade67e0f3342a469fc412276b1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 29 19:04:22 2023 -0500
Use varargs
---
.../validator/routines/DomainValidator.java | 4 +-
.../routines/DomainValidatorStartupTest.java | 60 +++++++++++-----------
.../validator/routines/EmailValidatorTest.java | 2 +-
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
index 50c3b1c7..0f327248 100644
--- a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
@@ -2087,7 +2087,7 @@ public class DomainValidator implements Serializable {
* @param type ArrayType, e.g. GENERIC_PLUS, LOCAL_PLUS
* @param values array of TLDs. Will be lower-cased and sorted
*/
- public Item(final ArrayType type, final String[] values) {
+ public Item(final ArrayType type, final String... values) {
this.type = type;
this.values = values; // no need to copy here
}
@@ -2118,7 +2118,7 @@ public class DomainValidator implements Serializable {
* @throws IllegalArgumentException if one of the read-only tables is requested
* @since 1.5.0
*/
- public static synchronized void updateTLDOverride(final ArrayType table, final String [] tlds) {
+ public static synchronized void updateTLDOverride(final ArrayType table, final String... tlds) {
if (inUse) {
throw new IllegalStateException("Can only invoke this method before calling getInstance");
}
diff --git a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
index 12021f00..5d3d5c20 100644
--- a/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/DomainValidatorStartupTest.java
@@ -40,28 +40,28 @@ public class DomainValidatorStartupTest {
@Test
public void testUpdateBaseArrayCC() {
final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
- () -> DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_RO, new String[] { "com" }));
+ () -> DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_RO, "com"));
assertThat(thrown.getMessage(), is(equalTo("Cannot update the table: COUNTRY_CODE_RO")));
}
@Test
public void testUpdateBaseArrayGeneric() {
final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
- () -> DomainValidator.updateTLDOverride(ArrayType.GENERIC_RO, new String[] { "com" }));
+ () -> DomainValidator.updateTLDOverride(ArrayType.GENERIC_RO, "com"));
assertThat(thrown.getMessage(), is(equalTo("Cannot update the table: GENERIC_RO")));
}
@Test
public void testUpdateBaseArrayInfra() {
final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
- () -> DomainValidator.updateTLDOverride(ArrayType.INFRASTRUCTURE_RO, new String[] { "com" }));
+ () -> DomainValidator.updateTLDOverride(ArrayType.INFRASTRUCTURE_RO, "com"));
assertThat(thrown.getMessage(), is(equalTo("Cannot update the table: INFRASTRUCTURE_RO")));
}
@Test
public void testUpdateBaseArrayLocal() {
final IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
- () -> DomainValidator.updateTLDOverride(ArrayType.LOCAL_RO, new String[] { "com" }));
+ () -> DomainValidator.updateTLDOverride(ArrayType.LOCAL_RO, "com"));
assertThat(thrown.getMessage(), is(equalTo("Cannot update the table: LOCAL_RO")));
}
@@ -73,15 +73,15 @@ public class DomainValidatorStartupTest {
@Test
public void testUpdateCountryCode1b() {
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[] { "com" });
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, "com");
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidCountryCodeTld("com")); // it is now!
}
@Test
public void testUpdateCountryCode2() {
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[] { "com" });
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[] { "com" });
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, "com");
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, "com");
final DomainValidator validator = DomainValidator.getInstance();
assertFalse(validator.isValidCountryCodeTld("com")); // show that minus overrides the rest
}
@@ -94,15 +94,15 @@ public class DomainValidatorStartupTest {
@Test
public void testUpdateCountryCode3b() { // show ch can be made invalid
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[] { "ch" });
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, "ch");
final DomainValidator validator = DomainValidator.getInstance();
assertFalse(validator.isValidCountryCodeTld("ch"));
}
@Test
public void testUpdateCountryCode3c() { // show ch can be made valid again by replacing the CC array
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[] { "xx" });
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, "xx");
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidCountryCodeTld("ch"));
}
@@ -115,15 +115,15 @@ public class DomainValidatorStartupTest {
@Test
public void testUpdateGeneric2() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch");
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidGenericTld("ch")); // it is now!
}
@Test
public void testUpdateGeneric3() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "ch" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "ch");
final DomainValidator validator = DomainValidator.getInstance();
assertFalse(validator.isValidGenericTld("ch")); // show that minus overrides the rest
assertTrue(validator.isValidGenericTld("com"));
@@ -131,19 +131,19 @@ public class DomainValidatorStartupTest {
@Test
public void testUpdateGeneric4() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "com" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "com");
final DomainValidator validator = DomainValidator.getInstance();
assertFalse(validator.isValidGenericTld("com"));
}
@Test
public void testUpdateGeneric5() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "ch" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "com" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "xx" }); // change the minus list
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "ch");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "com");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "xx"); // change the minus list
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidGenericTld("com"));
}
@@ -159,7 +159,7 @@ public class DomainValidatorStartupTest {
@Test
public void testVALIDATOR_412b() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "local", "pvt" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "local", "pvt");
final DomainValidator validator = DomainValidator.getInstance();
assertTrue(validator.isValidGenericTld("local"));
assertTrue(validator.isValid("abc.local"));
@@ -178,7 +178,7 @@ public class DomainValidatorStartupTest {
@Test
public void testVALIDATOR_412d() {
- DomainValidator.updateTLDOverride(ArrayType.LOCAL_PLUS, new String[] { "local", "pvt" });
+ DomainValidator.updateTLDOverride(ArrayType.LOCAL_PLUS, "local", "pvt");
final DomainValidator validator = DomainValidator.getInstance(true);
assertTrue(validator.isValidLocalTld("local"));
assertTrue(validator.isValidLocalTld("pvt"));
@@ -188,11 +188,11 @@ public class DomainValidatorStartupTest {
@Test
public void testCannotUpdate() {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" }); // OK
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch"); // OK
final DomainValidator dv = DomainValidator.getInstance();
assertNotNull(dv);
try {
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "ch" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "ch");
fail("Expected IllegalStateException");
} catch (final IllegalStateException ise) {
// expected
@@ -201,10 +201,10 @@ public class DomainValidatorStartupTest {
@Test
public void testInstanceOverride() { // Show that the instance picks up static values
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, new String[] { "gp" });
- DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, new String[] { "com" });
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, new String[] { "cp" });
- DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, new String[] { "ch" });
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_PLUS, "gp");
+ DomainValidator.updateTLDOverride(ArrayType.GENERIC_MINUS, "com");
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_PLUS, "cp");
+ DomainValidator.updateTLDOverride(ArrayType.COUNTRY_CODE_MINUS, "ch");
DomainValidator validator = DomainValidator.getInstance(false);
assertTrue(validator.isValidGenericTld("gp"));
assertFalse(validator.isValidGenericTld("com"));
@@ -213,8 +213,8 @@ public class DomainValidatorStartupTest {
// show we can override them for a new instance
final List<DomainValidator.Item> items = new ArrayList<>();
- items.add(new DomainValidator.Item(ArrayType.GENERIC_MINUS, new String[] { "" }));
- items.add(new DomainValidator.Item(ArrayType.COUNTRY_CODE_MINUS, new String[] { "" }));
+ items.add(new DomainValidator.Item(ArrayType.GENERIC_MINUS, "" ));
+ items.add(new DomainValidator.Item(ArrayType.COUNTRY_CODE_MINUS, ""));
validator = DomainValidator.getInstance(false, items);
assertTrue(validator.isValidGenericTld("gp"));
assertTrue(validator.isValidGenericTld("com")); // Should be true again
diff --git a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
index e55e1c56..27770801 100644
--- a/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java
@@ -596,7 +596,7 @@ public class EmailValidatorTest {
public void testValidator473_4() { // Show that can override domain validation
assertFalse(validator.isValidDomain("test.local"));
final List<DomainValidator.Item> items = new ArrayList<>();
- items.add(new DomainValidator.Item(DomainValidator.ArrayType.GENERIC_PLUS, new String[]{"local"}));
+ items.add(new DomainValidator.Item(DomainValidator.ArrayType.GENERIC_PLUS, "local"));
final EmailValidator val = new EmailValidator(true, false, DomainValidator.getInstance(true, items));
assertTrue(val.isValidDomain("test.local"));
}