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 2019/12/19 02:16:47 UTC
[commons-text] branch master updated: Remove unnecessary array
creation for 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-text.git
The following commit(s) were added to refs/heads/master by this push:
new 282e4aa Remove unnecessary array creation for varargs.
282e4aa is described below
commit 282e4aa2eceffdb8c824250c13e098aa3bfe7f38
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Dec 18 21:16:43 2019 -0500
Remove unnecessary array creation for varargs.
---
.../text/translate/NumericEntityUnescaper.java | 2 +-
.../org/apache/commons/text/CaseUtilsTest.java | 17 ++++++++---------
.../commons/text/StrBuilderAppendInsertTest.java | 22 +++++++++++-----------
.../org/apache/commons/text/StrMatcherTest.java | 2 +-
.../apache/commons/text/StringTokenizerTest.java | 6 +++---
.../text/TextStringBuilderAppendInsertTest.java | 22 +++++++++++-----------
.../commons/text/matcher/StringMatcherTest.java | 2 +-
7 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
index c06d7f2..d0b398b 100644
--- a/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
+++ b/src/main/java/org/apache/commons/text/translate/NumericEntityUnescaper.java
@@ -57,7 +57,7 @@ public class NumericEntityUnescaper extends CharSequenceTranslator {
if (options.length > 0) {
this.options = EnumSet.copyOf(Arrays.asList(options));
} else {
- this.options = EnumSet.copyOf(Arrays.asList(new OPTION[] {OPTION.semiColonRequired}));
+ this.options = EnumSet.copyOf(Arrays.asList(OPTION.semiColonRequired));
}
}
diff --git a/src/test/java/org/apache/commons/text/CaseUtilsTest.java b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
index c3f4353..f990b36 100644
--- a/src/test/java/org/apache/commons/text/CaseUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
@@ -46,9 +46,9 @@ public class CaseUtilsTest {
assertThat(CaseUtils.toCamelCase("", true, null)).isEqualTo("");
assertThat(CaseUtils.toCamelCase(" ", false, null)).isEqualTo(" ");
assertThat(CaseUtils.toCamelCase("a b c @def", false, null)).isEqualTo("aBC@def");
- assertThat(CaseUtils.toCamelCase("a b c @def", true, new char[]{})).isEqualTo("ABC@def");
- assertThat(CaseUtils.toCamelCase("a b c @def", true, new char[]{'-'})).isEqualTo("ABC@def");
- assertThat(CaseUtils.toCamelCase("a b c @def", true, new char[]{'-'})).isEqualTo("ABC@def");
+ assertThat(CaseUtils.toCamelCase("a b c @def", true)).isEqualTo("ABC@def");
+ assertThat(CaseUtils.toCamelCase("a b c @def", true, '-')).isEqualTo("ABC@def");
+ assertThat(CaseUtils.toCamelCase("a b c @def", true, '-')).isEqualTo("ABC@def");
final char[] chars = {'-', '+', ' ', '@'};
assertThat(CaseUtils.toCamelCase("-+@ ", true, chars)).isEqualTo("-+@ ");
@@ -56,10 +56,10 @@ public class CaseUtilsTest {
assertThat(CaseUtils.toCamelCase("@@@@ to+CAMEL@cASE ", true, chars)).isEqualTo("ToCamelCase");
assertThat(CaseUtils.toCamelCase("To+CA+ME L@cASE", true, chars)).isEqualTo("ToCaMeLCase");
- assertThat(CaseUtils.toCamelCase("To.Camel.Case", false, new char[]{'.'})).isEqualTo("toCamelCase");
- assertThat(CaseUtils.toCamelCase("To.Camel-Case", false, new char[]{'-', '.'})).isEqualTo("toCamelCase");
- assertThat(CaseUtils.toCamelCase(" to @ Camel case", false, new char[]{'-', '@'})).isEqualTo("toCamelCase");
- assertThat(CaseUtils.toCamelCase(" @to @ Camel case", true, new char[]{'-', '@'})).isEqualTo("ToCamelCase");
+ assertThat(CaseUtils.toCamelCase("To.Camel.Case", false, '.')).isEqualTo("toCamelCase");
+ assertThat(CaseUtils.toCamelCase("To.Camel-Case", false, '-', '.')).isEqualTo("toCamelCase");
+ assertThat(CaseUtils.toCamelCase(" to @ Camel case", false, '-', '@')).isEqualTo("toCamelCase");
+ assertThat(CaseUtils.toCamelCase(" @to @ Camel case", true, '-', '@')).isEqualTo("ToCamelCase");
assertThat(CaseUtils.toCamelCase("TO CAMEL CASE", true, null)).isEqualTo("ToCamelCase");
assertThat(CaseUtils.toCamelCase("TO CAMEL CASE", false, null)).isEqualTo("toCamelCase");
@@ -72,8 +72,7 @@ public class CaseUtilsTest {
assertThat(CaseUtils.toCamelCase("tocamelcase", false)).isEqualTo("tocamelcase");
assertThat(CaseUtils.toCamelCase("\uD800\uDF00 \uD800\uDF02", true)).isEqualTo("\uD800\uDF00\uD800\uDF02");
- assertThat(CaseUtils.toCamelCase("\uD800\uDF00\uD800\uDF01\uD800\uDF14\uD800\uDF02\uD800\uDF03", true,
- new char[]{'\uD800', '\uDF14'}))
+ assertThat(CaseUtils.toCamelCase("\uD800\uDF00\uD800\uDF01\uD800\uDF14\uD800\uDF02\uD800\uDF03", true, '\uD800', '\uDF14'))
.isEqualTo("\uD800\uDF00\uD800\uDF01\uD800\uDF02\uD800\uDF03");
}
}
diff --git a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
index ae973e1..18178b1 100644
--- a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
+++ b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
@@ -1064,11 +1064,11 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(new Object[0]);
+ sb.appendAll();
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(new Object[]{"foo", "bar", "baz"});
+ sb.appendAll("foo", "bar", "baz");
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
@@ -1088,7 +1088,7 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(Arrays.asList(new Object[]{"foo", "bar", "baz"}));
+ sb.appendAll(Arrays.asList("foo", "bar", "baz"));
assertThat(sb.toString()).isEqualTo("foobarbaz");
}
@@ -1104,7 +1104,7 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator());
+ sb.appendAll(Arrays.asList("foo", "bar", "baz").iterator());
assertThat(sb.toString()).isEqualTo("foobarbaz");
}
@@ -1144,15 +1144,15 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,bar,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}), null);
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz"), null);
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,,baz");
}
@@ -1168,15 +1168,15 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator(), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz").iterator(), ",");
assertThat(sb.toString()).isEqualTo("foo,bar,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator(), null);
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz").iterator(), null);
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}).iterator(), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz").iterator(), ",");
assertThat(sb.toString()).isEqualTo("foo,,baz");
}
@@ -1189,7 +1189,7 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("foo,null,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,null,baz");
}
diff --git a/src/test/java/org/apache/commons/text/StrMatcherTest.java b/src/test/java/org/apache/commons/text/StrMatcherTest.java
index f35647f..661c5d7 100644
--- a/src/test/java/org/apache/commons/text/StrMatcherTest.java
+++ b/src/test/java/org/apache/commons/text/StrMatcherTest.java
@@ -181,7 +181,7 @@ public class StrMatcherTest {
assertThat(matcher.isMatch(BUFFER2, 3)).isEqualTo(0);
assertThat(matcher.isMatch(BUFFER2, 4)).isEqualTo(1);
assertThat(matcher.isMatch(BUFFER2, 5)).isEqualTo(0);
- assertThat(StrMatcher.charSetMatcher(new char[0])).isSameAs(StrMatcher.noneMatcher());
+ assertThat(StrMatcher.charSetMatcher()).isSameAs(StrMatcher.noneMatcher());
assertThat(StrMatcher.charSetMatcher((char[]) null)).isSameAs(StrMatcher.noneMatcher());
assertThat(StrMatcher.charSetMatcher("a".toCharArray()) instanceof StrMatcher.CharMatcher).isTrue();
}
diff --git a/src/test/java/org/apache/commons/text/StringTokenizerTest.java b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
index b6e3a3b..b4ec07a 100644
--- a/src/test/java/org/apache/commons/text/StringTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
@@ -309,7 +309,7 @@ public class StringTokenizerTest {
@Test
public void testDelimMatcher() {
final String input = "a/b\\c";
- final StringMatcher delimMatcher = StringMatcherFactory.INSTANCE.charSetMatcher(new char[] {'/', '\\' });
+ final StringMatcher delimMatcher = StringMatcherFactory.INSTANCE.charSetMatcher('/', '\\');
final StringTokenizer tok = new StringTokenizer(input, delimMatcher);
assertEquals("a", tok.next());
@@ -321,8 +321,8 @@ public class StringTokenizerTest {
@Test
public void testDelimMatcherQuoteMatcher() {
final String input = "`a`;`b`;`c`";
- final StringMatcher delimMatcher = StringMatcherFactory.INSTANCE.charSetMatcher(new char[] {';' });
- final StringMatcher quoteMatcher = StringMatcherFactory.INSTANCE.charSetMatcher(new char[] {'`' });
+ final StringMatcher delimMatcher = StringMatcherFactory.INSTANCE.charSetMatcher(';');
+ final StringMatcher quoteMatcher = StringMatcherFactory.INSTANCE.charSetMatcher('`');
final StringTokenizer tok = new StringTokenizer(input, delimMatcher, quoteMatcher);
assertEquals("a", tok.next());
diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java b/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
index 92711ea..26870c5 100644
--- a/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
+++ b/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
@@ -1089,11 +1089,11 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(new Object[0]);
+ sb.appendAll();
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(new Object[]{"foo", "bar", "baz"});
+ sb.appendAll("foo", "bar", "baz");
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
@@ -1113,7 +1113,7 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(Arrays.asList(new Object[]{"foo", "bar", "baz"}));
+ sb.appendAll(Arrays.asList("foo", "bar", "baz"));
assertThat(sb.toString()).isEqualTo("foobarbaz");
}
@@ -1129,7 +1129,7 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendAll(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator());
+ sb.appendAll(Arrays.asList("foo", "bar", "baz").iterator());
assertThat(sb.toString()).isEqualTo("foobarbaz");
}
@@ -1169,15 +1169,15 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,bar,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}), null);
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz"), null);
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,,baz");
}
@@ -1193,15 +1193,15 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator(), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz").iterator(), ",");
assertThat(sb.toString()).isEqualTo("foo,bar,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", "bar", "baz"}).iterator(), null);
+ sb.appendWithSeparators(Arrays.asList("foo", "bar", "baz").iterator(), null);
assertThat(sb.toString()).isEqualTo("foobarbaz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}).iterator(), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz").iterator(), ",");
assertThat(sb.toString()).isEqualTo("foo,,baz");
}
@@ -1214,7 +1214,7 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("foo,null,baz");
sb.clear();
- sb.appendWithSeparators(Arrays.asList(new Object[]{"foo", null, "baz"}), ",");
+ sb.appendWithSeparators(Arrays.asList("foo", null, "baz"), ",");
assertThat(sb.toString()).isEqualTo("foo,null,baz");
}
diff --git a/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java b/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
index 8dd54e7..a46182a 100644
--- a/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
+++ b/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
@@ -49,7 +49,7 @@ public class StringMatcherTest {
assertThat(matcher.isMatch(BUFFER2, 3, 0, BUFFER2.length)).isEqualTo(0);
assertThat(matcher.isMatch(BUFFER2, 4, 0, BUFFER2.length)).isEqualTo(1);
assertThat(matcher.isMatch(BUFFER2, 5, 0, BUFFER2.length)).isEqualTo(0);
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher(new char[0]))
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher())
.isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
assertThat(StringMatcherFactory.INSTANCE.charSetMatcher((char[]) null))
.isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());