Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

array_style (#537)

This commit is contained in:
XenoAmess 2020-06-13 23:06:06 +08:00 committed by GitHub
parent 514f226b7d
commit 2238145f56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/commons/lang3/StringUtils.java
View File

@ -541,7 +541,7 @@ public static String capitalize(final String str) {
return str; 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; int outOffset = 0;
newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; ) { for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; ) {
@ -2311,7 +2311,7 @@ public static int getLevenshteinDistance(CharSequence s, CharSequence t) {
m = t.length(); m = t.length();
} }
final int p[] = new int[n + 1]; final int[] p = new int[n + 1];
// indexes into strings s and t // indexes into strings s and t
int i; // iterates through s int i; // iterates through s
int j; // iterates through t int j; // iterates through t
@ -2452,9 +2452,9 @@ distance is O(nm), but a bound of k allows us to reduce it to O(km) time by only
m = t.length(); m = t.length();
} }
int p[] = new int[n + 1]; // 'previous' cost array, horizontally int[] p = new int[n + 1]; // 'previous' cost array, horizontally
int d[] = new int[n + 1]; // cost array, horizontally int[] d = new int[n + 1]; // cost array, horizontally
int _d[]; // placeholder to assist in swapping p and d int[] _d; // placeholder to assist in swapping p and d
// fill in starting table values // fill in starting table values
final int boundary = Math.min(n, threshold) + 1; final int boundary = Math.min(n, threshold) + 1;
@ -8863,7 +8863,7 @@ public static String swapCase(final String str) {
} }
final int strLen = str.length(); 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; int outOffset = 0;
for (int i = 0; i < strLen; ) { for (int i = 0; i < strLen; ) {
final int oldCodepoint = str.codePointAt(i); final int oldCodepoint = str.codePointAt(i);
@ -9207,7 +9207,7 @@ public static String uncapitalize(final String str) {
return str; 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; int outOffset = 0;
newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint newCodePoints[outOffset++] = newCodePoint; // copy the first codepoint
for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; ) { for (int inOffset = Character.charCount(firstCodepoint); inOffset < strLen; ) {

6
src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
View File

@ -259,7 +259,7 @@ public static String[] getRootCauseStackTrace(final Throwable throwable) {
if (throwable == null) { if (throwable == null) {
return ArrayUtils.EMPTY_STRING_ARRAY; return ArrayUtils.EMPTY_STRING_ARRAY;
} }
final Throwable throwables[] = getThrowables(throwable); final Throwable[] throwables = getThrowables(throwable);
final int count = throwables.length; final int count = throwables.length;
final List<String> frames = new ArrayList<>(); final List<String> frames = new ArrayList<>();
List<String> nextTrace = getStackFrameList(throwables[count - 1]); List<String> nextTrace = getStackFrameList(throwables[count - 1]);
@ -633,7 +633,7 @@ public static void printRootCauseStackTrace(final Throwable throwable, final Pri
return; return;
} }
Validate.notNull(stream, "The PrintStream must not be null"); Validate.notNull(stream, "The PrintStream must not be null");
final String trace[] = getRootCauseStackTrace(throwable); final String[] trace = getRootCauseStackTrace(throwable);
for (final String element : trace) { for (final String element : trace) {
stream.println(element); stream.println(element);
} }
@ -664,7 +664,7 @@ public static void printRootCauseStackTrace(final Throwable throwable, final Pri
return; return;
} }
Validate.notNull(writer, "The PrintWriter must not be null"); Validate.notNull(writer, "The PrintWriter must not be null");
final String trace[] = getRootCauseStackTrace(throwable); final String[] trace = getRootCauseStackTrace(throwable);
for (final String element : trace) { for (final String element : trace) {
writer.println(element); writer.println(element);
} }

4
src/main/java/org/apache/commons/lang3/reflect/ConstructorUtils.java
View File

@ -81,7 +81,7 @@ public static <T> T invokeConstructor(final Class<T> cls, Object... args)
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, throws NoSuchMethodException, IllegalAccessException, InvocationTargetException,
InstantiationException { InstantiationException {
args = ArrayUtils.nullToEmpty(args); args = ArrayUtils.nullToEmpty(args);
final Class<?> parameterTypes[] = ClassUtils.toClass(args); final Class<?>[] parameterTypes = ClassUtils.toClass(args);
return invokeConstructor(cls, args, parameterTypes); return invokeConstructor(cls, args, parameterTypes);
} }
@ -145,7 +145,7 @@ public static <T> T invokeExactConstructor(final Class<T> cls, Object... args)
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, throws NoSuchMethodException, IllegalAccessException, InvocationTargetException,
InstantiationException { InstantiationException {
args = ArrayUtils.nullToEmpty(args); args = ArrayUtils.nullToEmpty(args);
final Class<?> parameterTypes[] = ClassUtils.toClass(args); final Class<?>[] parameterTypes = ClassUtils.toClass(args);
return invokeExactConstructor(cls, args, parameterTypes); return invokeExactConstructor(cls, args, parameterTypes);
} }

22
src/main/java/org/apache/commons/lang3/text/StrBuilder.java
View File

@ -363,7 +363,7 @@ public char[] toCharArray() {
if (size == 0) { if (size == 0) {
return ArrayUtils.EMPTY_CHAR_ARRAY; return ArrayUtils.EMPTY_CHAR_ARRAY;
} }
final char chars[] = new char[size]; final char[] chars = new char[size];
System.arraycopy(buffer, 0, chars, 0, size); System.arraycopy(buffer, 0, chars, 0, size);
return chars; return chars;
} }
@ -384,7 +384,7 @@ public char[] toCharArray(final int startIndex, int endIndex) {
if (len == 0) { if (len == 0) {
return ArrayUtils.EMPTY_CHAR_ARRAY; return ArrayUtils.EMPTY_CHAR_ARRAY;
} }
final char chars[] = new char[len]; final char[] chars = new char[len];
System.arraycopy(buffer, startIndex, chars, 0, len); System.arraycopy(buffer, startIndex, chars, 0, len);
return chars; return chars;
} }
@ -414,7 +414,7 @@ public char[] getChars(char[] destination) {
* @throws NullPointerException if the array is null * @throws NullPointerException if the array is null
* @throws IndexOutOfBoundsException if any index is invalid * @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) { if (startIndex < 0) {
throw new StringIndexOutOfBoundsException(startIndex); throw new StringIndexOutOfBoundsException(startIndex);
} }
@ -1640,7 +1640,7 @@ public StrBuilder insert(final int index, String str) {
* @return this, to enable chaining * @return this, to enable chaining
* @throws IndexOutOfBoundsException if the index is invalid * @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); validateIndex(index);
if (chars == null) { if (chars == null) {
return insert(index, nullText); return insert(index, nullText);
@ -1666,7 +1666,7 @@ public StrBuilder insert(final int index, final char chars[]) {
* @return this, to enable chaining * @return this, to enable chaining
* @throws IndexOutOfBoundsException if any index is invalid * @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); validateIndex(index);
if (chars == null) { if (chars == null) {
return insert(index, nullText); return insert(index, nullText);
@ -2772,8 +2772,8 @@ public boolean equalsIgnoreCase(final StrBuilder other) {
if (this.size != other.size) { if (this.size != other.size) {
return false; return false;
} }
final char thisBuf[] = this.buffer; final char[] thisBuf = this.buffer;
final char otherBuf[] = other.buffer; final char[] otherBuf = other.buffer;
for (int i = size - 1; i >= 0; i--) { for (int i = size - 1; i >= 0; i--) {
final char c1 = thisBuf[i]; final char c1 = thisBuf[i];
final char c2 = otherBuf[i]; final char c2 = otherBuf[i];
@ -2801,8 +2801,8 @@ public boolean equals(final StrBuilder other) {
if (this.size != other.size) { if (this.size != other.size) {
return false; return false;
} }
final char thisBuf[] = this.buffer; final char[] thisBuf = this.buffer;
final char otherBuf[] = other.buffer; final char[] otherBuf = other.buffer;
for (int i = size - 1; i >= 0; i--) { for (int i = size - 1; i >= 0; i--) {
if (thisBuf[i] != otherBuf[i]) { if (thisBuf[i] != otherBuf[i]) {
return false; return false;
@ -2830,7 +2830,7 @@ public boolean equals(final Object obj) {
*/ */
@Override @Override
public int hashCode() { public int hashCode() {
final char buf[] = buffer; final char[] buf = buffer;
int hash = 0; int hash = 0;
for (int i = size - 1; i >= 0; i--) { for (int i = size - 1; i >= 0; i--) {
hash = 31 * hash + buf[i]; hash = 31 * hash + buf[i];
@ -2987,7 +2987,7 @@ public int read() {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @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 || if (off < 0 || len < 0 || off > b.length ||
(off + len) > b.length || (off + len) < 0) { (off + len) > b.length || (off + len) < 0) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();

2
src/main/java/org/apache/commons/lang3/text/StrMatcher.java
View File

@ -284,7 +284,7 @@ static final class CharSetMatcher extends StrMatcher {
* *
* @param chars the characters to match, must not be null * @param chars the characters to match, must not be null
*/ */
CharSetMatcher(final char chars[]) { CharSetMatcher(final char[] chars) {
super(); super();
this.chars = chars.clone(); this.chars = chars.clone();
Arrays.sort(this.chars); Arrays.sort(this.chars);

4
src/main/java/org/apache/commons/lang3/text/StrTokenizer.java
View File

@ -110,9 +110,9 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
} }
/** The text to work on. */ /** The text to work on. */
private char chars[]; private char[] chars;
/** The parsed tokens */ /** The parsed tokens */
private String tokens[]; private String[] tokens;
/** The current iteration position */ /** The current iteration position */
private int tokenPos; private int tokenPos;

12
src/test/java/org/apache/commons/lang3/builder/CompareToBuilderTest.java
View File

@ -884,9 +884,9 @@ public void testMultiBooleanArray() {
@Test @Test
public void testRaggedArray() { public void testRaggedArray() {
final long array1[][] = new long[2][]; final long[][] array1 = new long[2][];
final long array2[][] = new long[2][]; final long[][] array2 = new long[2][];
final long array3[][] = new long[3][]; final long[][] array3 = new long[3][];
for (int i = 0; i < array1.length; ++i) { for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2]; array1[i] = new long[2];
array2[i] = new long[2]; array2[i] = new long[2];
@ -912,9 +912,9 @@ public void testRaggedArray() {
@Test @Test
public void testMixedArray() { public void testMixedArray() {
final Object array1[] = new Object[2]; final Object[] array1 = new Object[2];
final Object array2[] = new Object[2]; final Object[] array2 = new Object[2];
final Object array3[] = new Object[2]; final Object[] array3 = new Object[2];
for (int i = 0; i < array1.length; ++i) { for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2]; array1[i] = new long[2];
array2[i] = new long[2]; array2[i] = new long[2];

8
src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
View File

@ -925,8 +925,8 @@ public void testMultiBooleanArray() {
@Test @Test
public void testRaggedArray() { public void testRaggedArray() {
final long array1[][] = new long[2][]; final long[][] array1 = new long[2][];
final long array2[][] = new long[2][]; final long[][] array2 = new long[2][];
for (int i = 0; i < array1.length; ++i) { for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2]; array1[i] = new long[2];
array2[i] = new long[2]; array2[i] = new long[2];
@ -943,8 +943,8 @@ public void testRaggedArray() {
@Test @Test
public void testMixedArray() { public void testMixedArray() {
final Object array1[] = new Object[2]; final Object[] array1 = new Object[2];
final Object array2[] = new Object[2]; final Object[] array2 = new Object[2];
for (int i = 0; i < array1.length; ++i) { for (int i = 0; i < array1.length; ++i) {
array1[i] = new long[2]; array1[i] = new long[2];
array2[i] = new long[2]; array2[i] = new long[2];

32
src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
View File

@ -58,9 +58,9 @@ public void test1() {
tok.setQuoteChar('"'); tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.trimMatcher()); tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -79,9 +79,9 @@ public void test2() {
tok.setQuoteChar('"'); tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.noneMatcher()); tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -100,9 +100,9 @@ public void test3() {
tok.setQuoteChar('"'); tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.noneMatcher()); tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -121,9 +121,9 @@ public void test4() {
tok.setQuoteChar('"'); tok.setQuoteChar('"');
tok.setIgnoredMatcher(StrMatcher.trimMatcher()); tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(true); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -143,9 +143,9 @@ public void test5() {
tok.setIgnoredMatcher(StrMatcher.trimMatcher()); tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false); tok.setIgnoreEmptyTokens(false);
tok.setEmptyTokenAsNull(true); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -165,9 +165,9 @@ public void test6() {
tok.setIgnoredMatcher(StrMatcher.trimMatcher()); tok.setIgnoredMatcher(StrMatcher.trimMatcher());
tok.setIgnoreEmptyTokens(false); tok.setIgnoreEmptyTokens(false);
// tok.setTreatingEmptyAsNull(true); // 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; int nextCount = 0;
while (tok.hasNext()) { while (tok.hasNext()) {
@ -198,9 +198,9 @@ public void test7() {
tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher()); tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher());
tok.setIgnoredMatcher(StrMatcher.noneMatcher()); tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(false); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {
@ -219,9 +219,9 @@ public void test8() {
tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher()); tok.setQuoteMatcher(StrMatcher.doubleQuoteMatcher());
tok.setIgnoredMatcher(StrMatcher.noneMatcher()); tok.setIgnoredMatcher(StrMatcher.noneMatcher());
tok.setIgnoreEmptyTokens(true); 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)); assertEquals(expected.length, tokens.length, ArrayUtils.toString(tokens));
for (int i = 0; i < expected.length; i++) { for (int i = 0; i < expected.length; i++) {