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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 2238145 array_style (#537)
2238145 is described below
commit 2238145f563e911c02d6179afb27e883c0ec6b37
Author: XenoAmess <[email protected]>
AuthorDate: Sat Jun 13 23:06:06 2020 +0800
array_style (#537)
---
.../java/org/apache/commons/lang3/StringUtils.java | 14 +++++-----
.../commons/lang3/exception/ExceptionUtils.java | 6 ++--
.../commons/lang3/reflect/ConstructorUtils.java | 4 +--
.../org/apache/commons/lang3/text/StrBuilder.java | 22 +++++++--------
.../org/apache/commons/lang3/text/StrMatcher.java | 2 +-
.../apache/commons/lang3/text/StrTokenizer.java | 4 +--
.../lang3/builder/CompareToBuilderTest.java | 12 ++++----
.../commons/lang3/builder/EqualsBuilderTest.java | 8 +++---
.../commons/lang3/text/StrTokenizerTest.java | 32 +++++++++++-----------
9 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 4f20fd8..f9143c5 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -541,7 +541,7 @@ public class StringUtils {
return str;
}
- final int newCodePoints[] = new int[strLen]; // cannot be longer than
the char array
+ final int[] newCodePoints = new int[strLen]; // cannot be longer than
the char array
int outOffset = 0;
newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
for (int inOffset = Character.charCount(firstCodepoint); inOffset <
strLen; ) {
@@ -2311,7 +2311,7 @@ public class StringUtils {
m = t.length();
}
- final int p[] = new int[n + 1];
+ final int[] p = new int[n + 1];
// indexes into strings s and t
int i; // iterates through s
int j; // iterates through t
@@ -2452,9 +2452,9 @@ public class StringUtils {
m = t.length();
}
- int p[] = new int[n + 1]; // 'previous' cost array, horizontally
- int d[] = new int[n + 1]; // cost array, horizontally
- int _d[]; // placeholder to assist in swapping p and d
+ int[] p = new int[n + 1]; // 'previous' cost array, horizontally
+ int[] d = new int[n + 1]; // cost array, horizontally
+ int[] _d; // placeholder to assist in swapping p and d
// fill in starting table values
final int boundary = Math.min(n, threshold) + 1;
@@ -8863,7 +8863,7 @@ public class StringUtils {
}
final int strLen = str.length();
- final int newCodePoints[] = new int[strLen]; // cannot be longer than
the char array
+ final int[] newCodePoints = new int[strLen]; // cannot be longer than
the char array
int outOffset = 0;
for (int i = 0; i < strLen; ) {
final int oldCodepoint = str.codePointAt(i);
@@ -9207,7 +9207,7 @@ public class StringUtils {
return str;
}
- final int newCodePoints[] = new int[strLen]; // cannot be longer than
the char array
+ final int[] newCodePoints = new int[strLen]; // cannot be longer than
the char array
int outOffset = 0;
newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
for (int inOffset = Character.charCount(firstCodepoint); inOffset <
strLen; ) {
diff --git
a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
index 205e1ae..5b48b0e 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -259,7 +259,7 @@ public class ExceptionUtils {
if (throwable == null) {
return ArrayUtils.EMPTY_STRING_ARRAY;
}
- final Throwable throwables[] = getThrowables(throwable);
+ final Throwable[] throwables = getThrowables(throwable);
final int count = throwables.length;
final List<String> frames = new ArrayList<>();
List<String> nextTrace = getStackFrameList(throwables[count - 1]);
@@ -633,7 +633,7 @@ public class ExceptionUtils {
return;
}
Validate.notNull(stream, "The PrintStream must not be null");
- final String trace[] = getRootCauseStackTrace(throwable);
+ final String[] trace = getRootCauseStackTrace(throwable);
for (final String element : trace) {
stream.println(element);
}
@@ -664,7 +664,7 @@ public class ExceptionUtils {
return;
}
Validate.notNull(writer, "The PrintWriter must not be null");
- final String trace[] = getRootCauseStackTrace(throwable);
+ final String[] trace = getRootCauseStackTrace(throwable);
for (final String element : trace) {
writer.println(element);
}
diff --git
a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
index 082bc89..72e6be6 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
@@ -81,7 +81,7 @@ public class ConstructorUtils {
throws NoSuchMethodException, IllegalAccessException,
InvocationTargetException,
InstantiationException {
args = ArrayUtils.nullToEmpty(args);
- final Class<?> parameterTypes[] = ClassUtils.toClass(args);
+ final Class<?>[] parameterTypes = ClassUtils.toClass(args);
return invokeConstructor(cls, args, parameterTypes);
}
@@ -145,7 +145,7 @@ public class ConstructorUtils {
throws NoSuchMethodException, IllegalAccessException,
InvocationTargetException,
InstantiationException {
args = ArrayUtils.nullToEmpty(args);
- final Class<?> parameterTypes[] = ClassUtils.toClass(args);
+ final Class<?>[] parameterTypes = ClassUtils.toClass(args);
return invokeExactConstructor(cls, args, parameterTypes);
}
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 0fabc10..d8b2159 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -363,7 +363,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
if (size == 0) {
return ArrayUtils.EMPTY_CHAR_ARRAY;
}
- final char chars[] = new char[size];
+ final char[] chars = new char[size];
System.arraycopy(buffer, 0, chars, 0, size);
return chars;
}
@@ -384,7 +384,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
if (len == 0) {
return ArrayUtils.EMPTY_CHAR_ARRAY;
}
- final char chars[] = new char[len];
+ final char[] chars = new char[len];
System.arraycopy(buffer, startIndex, chars, 0, len);
return chars;
}
@@ -414,7 +414,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* @throws NullPointerException if the array is null
* @throws IndexOutOfBoundsException if any index is invalid
*/
- public void getChars(final int startIndex, final int endIndex, final char
destination[], final int destinationIndex) {
+ public void getChars(final int startIndex, final int endIndex, final
char[] destination, final int destinationIndex) {
if (startIndex < 0) {
throw new StringIndexOutOfBoundsException(startIndex);
}
@@ -1640,7 +1640,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* @return this, to enable chaining
* @throws IndexOutOfBoundsException if the index is invalid
*/
- public StrBuilder insert(final int index, final char chars[]) {
+ public StrBuilder insert(final int index, final char[] chars) {
validateIndex(index);
if (chars == null) {
return insert(index, nullText);
@@ -1666,7 +1666,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* @return this, to enable chaining
* @throws IndexOutOfBoundsException if any index is invalid
*/
- public StrBuilder insert(final int index, final char chars[], final int
offset, final int length) {
+ public StrBuilder insert(final int index, final char[] chars, final int
offset, final int length) {
validateIndex(index);
if (chars == null) {
return insert(index, nullText);
@@ -2772,8 +2772,8 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
if (this.size != other.size) {
return false;
}
- final char thisBuf[] = this.buffer;
- final char otherBuf[] = other.buffer;
+ final char[] thisBuf = this.buffer;
+ final char[] otherBuf = other.buffer;
for (int i = size - 1; i >= 0; i--) {
final char c1 = thisBuf[i];
final char c2 = otherBuf[i];
@@ -2801,8 +2801,8 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
if (this.size != other.size) {
return false;
}
- final char thisBuf[] = this.buffer;
- final char otherBuf[] = other.buffer;
+ final char[] thisBuf = this.buffer;
+ final char[] otherBuf = other.buffer;
for (int i = size - 1; i >= 0; i--) {
if (thisBuf[i] != otherBuf[i]) {
return false;
@@ -2830,7 +2830,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
*/
@Override
public int hashCode() {
- final char buf[] = buffer;
+ final char[] buf = buffer;
int hash = 0;
for (int i = size - 1; i >= 0; i--) {
hash = 31 * hash + buf[i];
@@ -2987,7 +2987,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/** {@inheritDoc} */
@Override
- public int read(final char b[], final int off, int len) {
+ public int read(final char[] b, final int off, int len) {
if (off < 0 || len < 0 || off > b.length ||
(off + len) > b.length || (off + len) < 0) {
throw new IndexOutOfBoundsException();
diff --git a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
index 97d01c0..79801ee 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
@@ -284,7 +284,7 @@ public abstract class StrMatcher {
*
* @param chars the characters to match, must not be null
*/
- CharSetMatcher(final char chars[]) {
+ CharSetMatcher(final char[] chars) {
super();
this.chars = chars.clone();
Arrays.sort(this.chars);
diff --git a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
index 8a5c33c..23e87b8 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
@@ -110,9 +110,9 @@ public class StrTokenizer implements ListIterator<String>,
Cloneable {
}
/** The text to work on. */
- private char chars[];
+ private char[] chars;
/** The parsed tokens */
- private String tokens[];
+ private String[] tokens;
/** The current iteration position */
private int tokenPos;
diff --git
a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
index e0ff46c..7311ee3 100644
--- a/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
@@ -884,9 +884,9 @@ public class CompareToBuilderTest {
@Test
public void testRaggedArray() {
- final long array1[][] = new long[2][];
- final long array2[][] = new long[2][];
- final long array3[][] = new long[3][];
+ final long[][] array1 = new long[2][];
+ final long[][] array2 = new long[2][];
+ final long[][] array3 = new long[3][];
for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2];
array2[i] = new long[2];
@@ -912,9 +912,9 @@ public class CompareToBuilderTest {
@Test
public void testMixedArray() {
- final Object array1[] = new Object[2];
- final Object array2[] = new Object[2];
- final Object array3[] = new Object[2];
+ final Object[] array1 = new Object[2];
+ final Object[] array2 = new Object[2];
+ final Object[] array3 = new Object[2];
for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2];
array2[i] = new long[2];
diff --git
a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
index d487bac..f0fab39 100644
--- a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
@@ -925,8 +925,8 @@ public class EqualsBuilderTest {
@Test
public void testRaggedArray() {
- final long array1[][] = new long[2][];
- final long array2[][] = new long[2][];
+ final long[][] array1 = new long[2][];
+ final long[][] array2 = new long[2][];
for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2];
array2[i] = new long[2];
@@ -943,8 +943,8 @@ public class EqualsBuilderTest {
@Test
public void testMixedArray() {
- final Object array1[] = new Object[2];
- final Object array2[] = new Object[2];
+ final Object[] array1 = new Object[2];
+ final Object[] array2 = new Object[2];
for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2];
array2[i] = new long[2];
diff --git a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
index 7609eee..acb18e7 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
@@ -58,9 +58,9 @@ public class StrTokenizerTest {
tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", "c", "d;\"e", "f",
"", "", ""};
+ final String[] expected = new String[]{"a", "b", "c", "d;\"e", "f",
"", "", ""};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -79,9 +79,9 @@ public class StrTokenizerTest {
tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", "c ", "d;\"e", "f", "
", " ", ""};
+ final String[] expected = new String[]{"a", "b", "c ", "d;\"e", "f", "
", " ", ""};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -100,9 +100,9 @@ public class StrTokenizerTest {
tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", " c", "d;\"e", "f", "
", " ", ""};
+ final String[] expected = new String[]{"a", "b", " c", "d;\"e", "f", "
", " ", ""};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -121,9 +121,9 @@ public class StrTokenizerTest {
tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(true);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", "c", "d;\"e", "f"};
+ final String[] expected = new String[]{"a", "b", "c", "d;\"e", "f"};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -143,9 +143,9 @@ public class StrTokenizerTest {
tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false);
tok.setEmptyTokenAsNull(true);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", "c", "d;\"e", "f",
null, null, null};
+ final String[] expected = new String[]{"a", "b", "c", "d;\"e", "f",
null, null, null};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -165,9 +165,9 @@ public class StrTokenizerTest {
tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false);
// tok.setTreatingEmptyAsNull(true);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", " c", "d;\"e", "f",
null, null, null};
+ final String[] expected = new String[]{"a", "b", " c", "d;\"e", "f",
null, null, null};
int nextCount = 0;
while (tok.hasNext()) {
@@ -198,9 +198,9 @@ public class StrTokenizerTest {
tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher());
tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "", "", "b", "c", "d e",
"f", ""};
+ final String[] expected = new String[]{"a", "", "", "b", "c", "d e",
"f", ""};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
@@ -219,9 +219,9 @@ public class StrTokenizerTest {
tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher());
tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(true);
- final String tokens[] = tok.getTokenArray();
+ final String[] tokens = tok.getTokenArray();
- final String expected[] = new String[]{"a", "b", "c", "d e", "f"};
+ final String[] expected = new String[]{"a", "b", "c", "d e", "f"};
assertEquals(expected.length, tokens.length,
ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) {
