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 2024/09/12 14:21:37 UTC
(commons-lang) branch master updated (ec4f545b6 -> fae5ca31a)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
from ec4f545b6 Refactor into constants
new a216a36dc Use final
new ebfd8e556 Use final
new beb3b8fbc Use final
new e3552a530 Remove redundant call to super()
new a2706e7c9 Remove redundant syntax
new 24e80503b Remove redundant syntax
new 2f8cc86f3 Use final
new 4654e093b Remove redundant syntax
new 6c14b377e Use final
new 200f02bec Remove redundant syntax
new 2e0e2a165 Use final
new 3739a4cd3 Merge if clauses
new ce90d81ac Remove redundant syntax
new b7698a627 Remove redundant syntax
new 7cad9c3ef Remove redundant syntax
new a9f02bc64 Remove redundant syntax
new a2fe02fc0 Remove redundant syntax
new 55a9cb915 Remove redundant syntax
new 295e91a27 Remove redundant syntax
new 082b2d8b8 Remove redundant syntax
new 91fde94b4 Remove redundant syntax
new ae1d3c5c4 Remove redundant syntax
new fae5ca31a Remove redundant syntax
The 23 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/commons/lang3/ArrayUtils.java | 2 +-
.../org/apache/commons/lang3/CachedRandomBits.java | 4 +-
.../commons/lang3/builder/EqualsBuilder.java | 4 +-
.../lang3/builder/ReflectionToStringBuilder.java | 42 +++++-----
.../commons/lang3/builder/ToStringBuilder.java | 10 +--
.../commons/lang3/builder/ToStringStyle.java | 56 +++++++-------
.../commons/lang3/exception/ExceptionUtils.java | 2 +-
.../org/apache/commons/lang3/math/Fraction.java | 6 +-
.../apache/commons/lang3/reflect/MethodUtils.java | 6 +-
.../org/apache/commons/lang3/text/StrBuilder.java | 12 +--
.../org/apache/commons/lang3/ArrayUtilsTest.java | 20 ++---
.../apache/commons/lang3/CachedRandomBitsTest.java | 11 ++-
.../org/apache/commons/lang3/CharEncodingTest.java | 12 +--
.../org/apache/commons/lang3/CharUtilsPerfRun.java | 10 +--
.../org/apache/commons/lang3/LocaleUtilsTest.java | 4 +-
.../ReflectionToStringBuilderConcurrencyTest.java | 6 +-
.../ReflectionToStringBuilderExcludeTest.java | 26 +++----
.../ReflectionToStringBuilderIncludeTest.java | 38 ++++-----
.../commons/lang3/builder/ToStringBuilderTest.java | 90 +++++++++++-----------
.../builder/ToStringStyleConcurrencyTest.java | 6 +-
.../apache/commons/lang3/math/NumberUtilsTest.java | 60 +++++++--------
.../commons/lang3/text/StrTokenizerTest.java | 28 +++----
.../lang3/time/DurationFormatUtilsTest.java | 2 +-
23 files changed, 227 insertions(+), 230 deletions(-)
(commons-lang) 02/23: Use final
Posted by gg...@apache.org.
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
commit ebfd8e556626d3a688d652a5b4576c582da3272b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:12:34 2024 -0400
Use final
---
.../org/apache/commons/lang3/ArrayUtilsTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index a91383bbd..383a8be33 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -75,7 +75,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testArraycopyFunction() {
- String[] arr = { "a", "b" };
+ final String[] arr = { "a", "b" };
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(null, 0, 0, 1, i -> new String[3]));
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, i -> null));
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Function<Integer, String[]>) null));
@@ -83,7 +83,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testArraycopySupplier() {
- String[] arr = { "a", "b" };
+ final String[] arr = { "a", "b" };
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(null, 0, 0, 1, () -> new String[3]));
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, Suppliers.nul()));
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Supplier<String[]>) null));
@@ -1397,42 +1397,42 @@ public class ArrayUtilsTest extends AbstractLangTest {
final long[][] larray1 = {{2, 5}, {4, 5}};
final long[][] larray2 = {{2, 5}, {4, 6}};
final long[] larray3 = {2, 5};
- this.assertIsEquals(larray1, larray2, larray3);
+ assertIsEquals(larray1, larray2, larray3);
final int[][] iarray1 = {{2, 5}, {4, 5}};
final int[][] iarray2 = {{2, 5}, {4, 6}};
final int[] iarray3 = {2, 5};
- this.assertIsEquals(iarray1, iarray2, iarray3);
+ assertIsEquals(iarray1, iarray2, iarray3);
final short[][] sarray1 = {{2, 5}, {4, 5}};
final short[][] sarray2 = {{2, 5}, {4, 6}};
final short[] sarray3 = {2, 5};
- this.assertIsEquals(sarray1, sarray2, sarray3);
+ assertIsEquals(sarray1, sarray2, sarray3);
final float[][] farray1 = {{2, 5}, {4, 5}};
final float[][] farray2 = {{2, 5}, {4, 6}};
final float[] farray3 = {2, 5};
- this.assertIsEquals(farray1, farray2, farray3);
+ assertIsEquals(farray1, farray2, farray3);
final double[][] darray1 = {{2, 5}, {4, 5}};
final double[][] darray2 = {{2, 5}, {4, 6}};
final double[] darray3 = {2, 5};
- this.assertIsEquals(darray1, darray2, darray3);
+ assertIsEquals(darray1, darray2, darray3);
final byte[][] byteArray1 = {{2, 5}, {4, 5}};
final byte[][] byteArray2 = {{2, 5}, {4, 6}};
final byte[] byteArray3 = {2, 5};
- this.assertIsEquals(byteArray1, byteArray2, byteArray3);
+ assertIsEquals(byteArray1, byteArray2, byteArray3);
final char[][] charArray1 = {{2, 5}, {4, 5}};
final char[][] charArray2 = {{2, 5}, {4, 6}};
final char[] charArray3 = {2, 5};
- this.assertIsEquals(charArray1, charArray2, charArray3);
+ assertIsEquals(charArray1, charArray2, charArray3);
final boolean[][] barray1 = {{true, false}, {true, true}};
final boolean[][] barray2 = {{true, false}, {true, false}};
final boolean[] barray3 = {false, true};
- this.assertIsEquals(barray1, barray2, barray3);
+ assertIsEquals(barray1, barray2, barray3);
final Object[] array3 = {new String(new char[]{'A', 'B'})};
final Object[] array4 = {"AB"};
(commons-lang) 05/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit a2706e7c96012f16796d793ab50d53be7700fb20
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:14:26 2024 -0400
Remove redundant syntax
---
src/test/java/org/apache/commons/lang3/CharEncodingTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
index c2e379800..609aa0ce1 100644
--- a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java
@@ -47,12 +47,12 @@ public class CharEncodingTest extends AbstractLangTest {
@Test
public void testMustBeSupportedJava1_3_1_and_above() {
- this.assertSupportedEncoding(CharEncoding.ISO_8859_1);
- this.assertSupportedEncoding(CharEncoding.US_ASCII);
- this.assertSupportedEncoding(CharEncoding.UTF_16);
- this.assertSupportedEncoding(CharEncoding.UTF_16BE);
- this.assertSupportedEncoding(CharEncoding.UTF_16LE);
- this.assertSupportedEncoding(CharEncoding.UTF_8);
+ assertSupportedEncoding(CharEncoding.ISO_8859_1);
+ assertSupportedEncoding(CharEncoding.US_ASCII);
+ assertSupportedEncoding(CharEncoding.UTF_16);
+ assertSupportedEncoding(CharEncoding.UTF_16BE);
+ assertSupportedEncoding(CharEncoding.UTF_16LE);
+ assertSupportedEncoding(CharEncoding.UTF_8);
}
@Test
(commons-lang) 08/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 4654e093bf6b1c81f810677c0375266afa7e707d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:14:58 2024 -0400
Remove redundant syntax
---
src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
index 93ac5e99a..ddd7ce002 100644
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
@@ -412,11 +412,11 @@ public class EqualsBuilder implements Builder<Boolean> {
return this;
}
if (lhs == null || rhs == null) {
- this.setEquals(false);
+ setEquals(false);
return this;
}
if (lhs.length != rhs.length) {
- this.setEquals(false);
+ setEquals(false);
return this;
}
for (int i = 0; i < lhs.length && isEquals; ++i) {
(commons-lang) 14/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit b7698a627faec21a4009d8d67e6b47a3d79a9cd8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:16 2024 -0400
Remove redundant syntax
---
.../lang3/builder/ReflectionToStringBuilder.java | 42 +++++++++++-----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index fa95b4e7e..b0c382025 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -551,9 +551,9 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
final T object, final ToStringStyle style, final StringBuffer buffer,
final Class<? super T> reflectUpToClass, final boolean outputTransients, final boolean outputStatics) {
super(object, style, buffer);
- this.setUpToClass(reflectUpToClass);
- this.setAppendTransients(outputTransients);
- this.setAppendStatics(outputStatics);
+ setUpToClass(reflectUpToClass);
+ setAppendTransients(outputTransients);
+ setAppendStatics(outputStatics);
}
/**
@@ -582,10 +582,10 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
final Class<? super T> reflectUpToClass, final boolean outputTransients, final boolean outputStatics,
final boolean excludeNullValues) {
super(object, style, buffer);
- this.setUpToClass(reflectUpToClass);
- this.setAppendTransients(outputTransients);
- this.setAppendStatics(outputStatics);
- this.setExcludeNullValues(excludeNullValues);
+ setUpToClass(reflectUpToClass);
+ setAppendTransients(outputTransients);
+ setAppendStatics(outputStatics);
+ setExcludeNullValues(excludeNullValues);
}
/**
@@ -605,11 +605,11 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
// Reject field from inner class.
return false;
}
- if (Modifier.isTransient(field.getModifiers()) && !this.isAppendTransients()) {
+ if (Modifier.isTransient(field.getModifiers()) && !isAppendTransients()) {
// Reject transient fields.
return false;
}
- if (Modifier.isStatic(field.getModifiers()) && !this.isAppendStatics()) {
+ if (Modifier.isStatic(field.getModifiers()) && !isAppendStatics()) {
// Reject static fields.
return false;
}
@@ -641,7 +641,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
*/
protected void appendFieldsIn(final Class<?> clazz) {
if (clazz.isArray()) {
- this.reflectionAppendArray(this.getObject());
+ reflectionAppendArray(getObject());
return;
}
// The elements in the returned array are not sorted and are not in any particular order.
@@ -649,11 +649,11 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
AccessibleObject.setAccessible(fields, true);
for (final Field field : fields) {
final String fieldName = field.getName();
- if (this.accept(field)) {
+ if (accept(field)) {
try {
// Warning: Field.get(Object) creates wrappers objects
// for primitive types.
- final Object fieldValue = this.getValue(field);
+ final Object fieldValue = getValue(field);
if (!excludeNullValues || fieldValue != null) {
this.append(fieldName, fieldValue, !field.isAnnotationPresent(ToStringSummary.class));
}
@@ -709,7 +709,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
* @see java.lang.reflect.Field#get(Object)
*/
protected Object getValue(final Field field) throws IllegalAccessException {
- return field.get(this.getObject());
+ return field.get(getObject());
}
/**
@@ -749,7 +749,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
* @return {@code this} instance.
*/
public ReflectionToStringBuilder reflectionAppendArray(final Object array) {
- this.getStyle().reflectionAppendArrayDetail(this.getStringBuffer(), null, array);
+ getStyle().reflectionAppendArrayDetail(getStringBuffer(), null, array);
return this;
}
@@ -843,17 +843,17 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
*/
@Override
public String toString() {
- if (this.getObject() == null) {
- return this.getStyle().getNullText();
+ if (getObject() == null) {
+ return getStyle().getNullText();
}
validate();
- Class<?> clazz = this.getObject().getClass();
- this.appendFieldsIn(clazz);
- while (clazz.getSuperclass() != null && clazz != this.getUpToClass()) {
+ Class<?> clazz = getObject().getClass();
+ appendFieldsIn(clazz);
+ while (clazz.getSuperclass() != null && clazz != getUpToClass()) {
clazz = clazz.getSuperclass();
- this.appendFieldsIn(clazz);
+ appendFieldsIn(clazz);
}
return super.toString();
}
@@ -863,7 +863,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
*/
private void validate() {
if (ArrayUtils.containsAny(this.excludeFieldNames, (Object[]) this.includeFieldNames)) {
- ToStringStyle.unregister(this.getObject());
+ ToStringStyle.unregister(getObject());
throw new IllegalStateException("includeFieldNames and excludeFieldNames must not intersect");
}
}
(commons-lang) 22/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit ae1d3c5c4c2b21ff0c859b33c9f53172c76526f6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:20:52 2024 -0400
Remove redundant syntax
---
.../commons/lang3/builder/ToStringStyle.java | 56 +++++++++++-----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
index c3796dad2..df7fff831 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java
@@ -127,25 +127,25 @@ public abstract class ToStringStyle implements Serializable {
* </p>
*/
JsonToStringStyle() {
- this.setUseClassName(false);
- this.setUseIdentityHashCode(false);
+ setUseClassName(false);
+ setUseIdentityHashCode(false);
- this.setContentStart("{");
- this.setContentEnd("}");
+ setContentStart("{");
+ setContentEnd("}");
- this.setArrayStart("[");
- this.setArrayEnd("]");
+ setArrayStart("[");
+ setArrayEnd("]");
- this.setFieldSeparator(",");
- this.setFieldNameValueSeparator(":");
+ setFieldSeparator(",");
+ setFieldNameValueSeparator(":");
- this.setNullText("null");
+ setNullText("null");
- this.setSummaryObjectStartText("\"<");
- this.setSummaryObjectEndText(">\"");
+ setSummaryObjectStartText("\"<");
+ setSummaryObjectEndText(">\"");
- this.setSizeStartText("\"<size=");
- this.setSizeEndText(">\"");
+ setSizeStartText("\"<size=");
+ setSizeEndText(">\"");
}
@Override
@@ -445,10 +445,10 @@ public abstract class ToStringStyle implements Serializable {
* <p>Use the static constant rather than instantiating.</p>
*/
MultiLineToStringStyle() {
- this.setContentStart("[");
- this.setFieldSeparator(System.lineSeparator() + " ");
- this.setFieldSeparatorAtStart(true);
- this.setContentEnd(System.lineSeparator() + "]");
+ setContentStart("[");
+ setFieldSeparator(System.lineSeparator() + " ");
+ setFieldSeparatorAtStart(true);
+ setContentEnd(System.lineSeparator() + "]");
}
/**
@@ -479,8 +479,8 @@ public abstract class ToStringStyle implements Serializable {
* <p>Use the static constant rather than instantiating.</p>
*/
NoClassNameToStringStyle() {
- this.setUseClassName(false);
- this.setUseIdentityHashCode(false);
+ setUseClassName(false);
+ setUseIdentityHashCode(false);
}
/**
@@ -511,7 +511,7 @@ public abstract class ToStringStyle implements Serializable {
* <p>Use the static constant rather than instantiating.</p>
*/
NoFieldNameToStringStyle() {
- this.setUseFieldNames(false);
+ setUseFieldNames(false);
}
/**
@@ -542,8 +542,8 @@ public abstract class ToStringStyle implements Serializable {
* <p>Use the static constant rather than instantiating.</p>
*/
ShortPrefixToStringStyle() {
- this.setUseShortClassName(true);
- this.setUseIdentityHashCode(false);
+ setUseShortClassName(true);
+ setUseIdentityHashCode(false);
}
/**
@@ -573,11 +573,11 @@ public abstract class ToStringStyle implements Serializable {
* <p>Use the static constant rather than instantiating.</p>
*/
SimpleToStringStyle() {
- this.setUseClassName(false);
- this.setUseIdentityHashCode(false);
- this.setUseFieldNames(false);
- this.setContentStart(StringUtils.EMPTY);
- this.setContentEnd(StringUtils.EMPTY);
+ setUseClassName(false);
+ setUseIdentityHashCode(false);
+ setUseFieldNames(false);
+ setContentStart(StringUtils.EMPTY);
+ setContentEnd(StringUtils.EMPTY);
}
/**
@@ -1667,7 +1667,7 @@ public abstract class ToStringStyle implements Serializable {
* @param object the {@link Object} whose id to output
*/
protected void appendIdentityHashCode(final StringBuffer buffer, final Object object) {
- if (this.isUseIdentityHashCode() && object != null) {
+ if (isUseIdentityHashCode() && object != null) {
register(object);
buffer.append('@');
buffer.append(ObjectUtils.identityHashCodeHex(object));
(commons-lang) 19/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 295e91a27a54b8dc0f699c540306be16d6f1a0f1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:18:50 2024 -0400
Remove redundant syntax
---
.../commons/lang3/text/StrTokenizerTest.java | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
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 1d0bd32d0..a8b46c20e 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrTokenizerTest.java
@@ -651,30 +651,30 @@ public class StrTokenizerTest extends AbstractLangTest {
}
private void testCSV(final String data) {
- this.testXSVAbc(StrTokenizer.getCSVInstance(data));
- this.testXSVAbc(StrTokenizer.getCSVInstance(data.toCharArray()));
+ testXSVAbc(StrTokenizer.getCSVInstance(data));
+ testXSVAbc(StrTokenizer.getCSVInstance(data.toCharArray()));
}
@Test
public void testCSVEmpty() {
- this.testEmpty(StrTokenizer.getCSVInstance());
- this.testEmpty(StrTokenizer.getCSVInstance(""));
+ testEmpty(StrTokenizer.getCSVInstance());
+ testEmpty(StrTokenizer.getCSVInstance(""));
}
@Test
public void testCSVSimple() {
- this.testCSV(CSV_SIMPLE_FIXTURE);
+ testCSV(CSV_SIMPLE_FIXTURE);
}
@Test
public void testCSVSimpleNeedsTrim() {
- this.testCSV(" " + CSV_SIMPLE_FIXTURE);
- this.testCSV(" \n\t " + CSV_SIMPLE_FIXTURE);
- this.testCSV(" \n " + CSV_SIMPLE_FIXTURE + "\n\n\r");
+ testCSV(" " + CSV_SIMPLE_FIXTURE);
+ testCSV(" \n\t " + CSV_SIMPLE_FIXTURE);
+ testCSV(" \n " + CSV_SIMPLE_FIXTURE + "\n\n\r");
}
void testEmpty(final StrTokenizer tokenizer) {
- this.checkClone(tokenizer);
+ checkClone(tokenizer);
assertFalse(tokenizer.hasNext());
assertFalse(tokenizer.hasPrevious());
assertNull(tokenizer.nextToken());
@@ -810,18 +810,18 @@ public class StrTokenizerTest extends AbstractLangTest {
@Test
public void testTSV() {
- this.testXSVAbc(StrTokenizer.getTSVInstance(TSV_SIMPLE_FIXTURE));
- this.testXSVAbc(StrTokenizer.getTSVInstance(TSV_SIMPLE_FIXTURE.toCharArray()));
+ testXSVAbc(StrTokenizer.getTSVInstance(TSV_SIMPLE_FIXTURE));
+ testXSVAbc(StrTokenizer.getTSVInstance(TSV_SIMPLE_FIXTURE.toCharArray()));
}
@Test
public void testTSVEmpty() {
- this.testEmpty(StrTokenizer.getTSVInstance());
- this.testEmpty(StrTokenizer.getTSVInstance(""));
+ testEmpty(StrTokenizer.getTSVInstance());
+ testEmpty(StrTokenizer.getTSVInstance(""));
}
void testXSVAbc(final StrTokenizer tokenizer) {
- this.checkClone(tokenizer);
+ checkClone(tokenizer);
assertEquals(-1, tokenizer.previousIndex());
assertEquals(0, tokenizer.nextIndex());
assertNull(tokenizer.previousToken());
(commons-lang) 18/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 55a9cb915a5f0e733b00ffd93942a6079c85ba53
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:52 2024 -0400
Remove redundant syntax
---
src/main/java/org/apache/commons/lang3/text/StrBuilder.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 c2dd67ba1..d700b4b36 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -122,7 +122,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
if (!ready()) {
return -1;
}
- return StrBuilder.this.charAt(pos++);
+ return charAt(pos++);
}
/** {@inheritDoc} */
@@ -135,11 +135,11 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
if (len == 0) {
return 0;
}
- if (pos >= StrBuilder.this.size()) {
+ if (pos >= size()) {
return -1;
}
if (pos + len > size()) {
- len = StrBuilder.this.size() - pos;
+ len = size() - pos;
}
StrBuilder.this.getChars(pos, pos + len, b, off);
pos += len;
@@ -149,7 +149,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
/** {@inheritDoc} */
@Override
public boolean ready() {
- return pos < StrBuilder.this.size();
+ return pos < size();
}
/** {@inheritDoc} */
@@ -161,8 +161,8 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
/** {@inheritDoc} */
@Override
public long skip(long n) {
- if (pos + n > StrBuilder.this.size()) {
- n = StrBuilder.this.size() - pos;
+ if (pos + n > size()) {
+ n = size() - pos;
}
if (n < 0) {
return 0;
(commons-lang) 23/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit fae5ca31a0b633cb7136bcb08424d51950ef42a9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:21:28 2024 -0400
Remove redundant syntax
---
.../apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
index 86fb32db3..69ed20b13 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringStyleConcurrencyTest.java
@@ -68,7 +68,7 @@ public class ToStringStyleConcurrencyTest extends AbstractLangTest {
@Test
public void testArrayList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new ArrayList<>()));
+ testConcurrency(new CollectionHolder<>(new ArrayList<>()));
}
private void testConcurrency(final CollectionHolder<List<Integer>> holder) throws InterruptedException {
@@ -99,11 +99,11 @@ public class ToStringStyleConcurrencyTest extends AbstractLangTest {
@Test
public void testCopyOnWriteArrayList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new CopyOnWriteArrayList<>()));
+ testConcurrency(new CollectionHolder<>(new CopyOnWriteArrayList<>()));
}
@Test
public void testLinkedList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new LinkedList<>()));
+ testConcurrency(new CollectionHolder<>(new LinkedList<>()));
}
}
(commons-lang) 20/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 082b2d8b8caa7a1671311adda99008836ffea8f5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:20:09 2024 -0400
Remove redundant syntax
---
.../java/org/apache/commons/lang3/builder/ToStringBuilder.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
index d387082d0..5bb415b2e 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringBuilder.java
@@ -911,7 +911,7 @@ public class ToStringBuilder implements Builder<String> {
* @since 2.0
*/
public ToStringBuilder appendAsObjectToString(final Object srcObject) {
- ObjectUtils.identityToString(this.getStringBuffer(), srcObject);
+ ObjectUtils.identityToString(getStringBuffer(), srcObject);
return this;
}
@@ -1024,11 +1024,11 @@ public class ToStringBuilder implements Builder<String> {
*/
@Override
public String toString() {
- if (this.getObject() == null) {
- this.getStringBuffer().append(this.getStyle().getNullText());
+ if (getObject() == null) {
+ getStringBuffer().append(getStyle().getNullText());
} else {
- style.appendEnd(this.getStringBuffer(), this.getObject());
+ style.appendEnd(getStringBuffer(), getObject());
}
- return this.getStringBuffer().toString();
+ return getStringBuffer().toString();
}
}
(commons-lang) 07/23: Use final
Posted by gg...@apache.org.
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
commit 2f8cc86f3afdbb4a9befdc1c5eab08838ba43bfd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:14:47 2024 -0400
Use final
---
.../java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
index 1fc92ca33..dd78b49dd 100644
--- a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
@@ -526,7 +526,7 @@ public class DurationFormatUtilsTest extends AbstractLangTest {
*/
@Test
public void testFourYears() {
- Calendar c = Calendar.getInstance();
+ final Calendar c = Calendar.getInstance();
c.set(2004, 0, 1, 0, 0, 0);
for (int i = 0; i < FOUR_YEARS; i++) {
bruteForce(c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DAY_OF_MONTH), "d", Calendar.DAY_OF_MONTH);
(commons-lang) 10/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 200f02bec10440f8170a4cf275643f8a4c809d8c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:15:17 2024 -0400
Remove redundant syntax
---
src/main/java/org/apache/commons/lang3/math/Fraction.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java
index 3d67ca754..c921f8dd6 100644
--- a/src/main/java/org/apache/commons/lang3/math/Fraction.java
+++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java
@@ -809,11 +809,11 @@ public final class Fraction extends Number implements Comparable<Fraction> {
}
if (power < 0) {
if (power == Integer.MIN_VALUE) { // MIN_VALUE can't be negated.
- return this.invert().pow(2).pow(-(power / 2));
+ return invert().pow(2).pow(-(power / 2));
}
- return this.invert().pow(-power);
+ return invert().pow(-power);
}
- final Fraction f = this.multiplyBy(this);
+ final Fraction f = multiplyBy(this);
if (power % 2 == 0) { // if even...
return f.pow(power / 2);
}
(commons-lang) 12/23: Merge if clauses
Posted by gg...@apache.org.
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
commit 3739a4cd37fc5a73aa2eb64cfb2455d98bd713bf
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:16:48 2024 -0400
Merge if clauses
---
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 5ffd3fbca..5ee6fb680 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -233,12 +233,10 @@ public class MethodUtils {
while (interfaceIndex < allInterfaces.size() ||
superClassIndex < allSuperclasses.size()) {
final Class<?> acls;
- if (interfaceIndex >= allInterfaces.size()) {
+ if (interfaceIndex >= allInterfaces.size() || superClassIndex < allSuperclasses.size() && superClassIndex < interfaceIndex) {
acls = allSuperclasses.get(superClassIndex++);
- } else if (superClassIndex >= allSuperclasses.size() || !(superClassIndex < interfaceIndex)) {
- acls = allInterfaces.get(interfaceIndex++);
} else {
- acls = allSuperclasses.get(superClassIndex++);
+ acls = allInterfaces.get(interfaceIndex++);
}
allSuperClassesAndInterfaces.add(acls);
}
(commons-lang) 01/23: Use final
Posted by gg...@apache.org.
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
commit a216a36dc1146ff17aa05705f47afcb5176ae0b2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:12:26 2024 -0400
Use final
---
src/main/java/org/apache/commons/lang3/ArrayUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index b299707c3..b2ca091e7 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -4214,7 +4214,7 @@ public class ArrayUtils {
return INDEX_NOT_FOUND;
}
- private static int max0(int other) {
+ private static int max0(final int other) {
return Math.max(0, other);
}
(commons-lang) 21/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 91fde94b4904c6498fcf23f951af6271474d64b3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:20:33 2024 -0400
Remove redundant syntax
---
.../commons/lang3/builder/ToStringBuilderTest.java | 90 +++++++++++-----------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
index e28b3c13b..008b62f42 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
@@ -654,13 +654,13 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testInheritedReflectionStatics() {
final InheritedReflectionStaticFieldsFixture instance1 = new InheritedReflectionStaticFieldsFixture();
- assertEquals(this.toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2]",
+ assertEquals(toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2]",
ReflectionToStringBuilder.toString(instance1, null, false, true, InheritedReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
ReflectionToStringBuilder.toString(instance1, null, false, true, SimpleReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, SimpleReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt2=67890,staticString2=staticString2,staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, SimpleReflectionStaticFieldsFixture.class));
}
@@ -789,9 +789,9 @@ public class ToStringBuilderTest extends AbstractLangTest {
final Object[] objects = new Object[1];
final SimpleReflectionTestFixture simple = new SimpleReflectionTestFixture(objects);
objects[0] = simple;
- assertEquals(this.toBaseString(objects) + "[{" + this.toBaseString(simple) + "[o=" + this.toBaseString(objects) + "]" + "}]",
+ assertEquals(toBaseString(objects) + "[{" + toBaseString(simple) + "[o=" + toBaseString(objects) + "]" + "}]",
ToStringBuilder.reflectionToString(objects));
- assertEquals(this.toBaseString(simple) + "[o={" + this.toBaseString(simple) + "}]", ToStringBuilder.reflectionToString(simple));
+ assertEquals(toBaseString(simple) + "[o={" + toBaseString(simple) + "}]", ToStringBuilder.reflectionToString(simple));
}
@Test
@@ -801,7 +801,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
objects[0][1] = objects;
objects[1][0] = objects;
objects[1][1] = objects;
- final String basicToString = this.toBaseString(objects);
+ final String basicToString = toBaseString(objects);
assertEquals(basicToString + "[{{" + basicToString + "," + basicToString + "},{" + basicToString + "," + basicToString + "}}]",
ToStringBuilder.reflectionToString(objects));
}
@@ -813,7 +813,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
public void testReflectionArrayCycle() {
final Object[] objects = new Object[1];
objects[0] = objects;
- assertEquals(this.toBaseString(objects) + "[{" + this.toBaseString(objects) + "}]", ToStringBuilder.reflectionToString(objects));
+ assertEquals(toBaseString(objects) + "[{" + toBaseString(objects) + "}]", ToStringBuilder.reflectionToString(objects));
}
/**
@@ -825,8 +825,8 @@ public class ToStringBuilderTest extends AbstractLangTest {
final Object[] objectsLevel2 = new Object[1];
objects[0] = objectsLevel2;
objectsLevel2[0] = objects;
- assertEquals(this.toBaseString(objects) + "[{{" + this.toBaseString(objects) + "}}]", ToStringBuilder.reflectionToString(objects));
- assertEquals(this.toBaseString(objectsLevel2) + "[{{" + this.toBaseString(objectsLevel2) + "}}]", ToStringBuilder.reflectionToString(objectsLevel2));
+ assertEquals(toBaseString(objects) + "[{{" + toBaseString(objects) + "}}]", ToStringBuilder.reflectionToString(objects));
+ assertEquals(toBaseString(objectsLevel2) + "[{{" + toBaseString(objectsLevel2) + "}}]", ToStringBuilder.reflectionToString(objectsLevel2));
}
/**
@@ -836,15 +836,15 @@ public class ToStringBuilderTest extends AbstractLangTest {
public void testReflectionBoolean() {
Boolean b;
b = Boolean.TRUE;
- assertEquals(this.toBaseString(b) + "[value=true]", ToStringBuilder.reflectionToString(b));
+ assertEquals(toBaseString(b) + "[value=true]", ToStringBuilder.reflectionToString(b));
b = Boolean.FALSE;
- assertEquals(this.toBaseString(b) + "[value=false]", ToStringBuilder.reflectionToString(b));
+ assertEquals(toBaseString(b) + "[value=false]", ToStringBuilder.reflectionToString(b));
}
@Test
public void testReflectionBooleanArray() {
boolean[] array = { true, false, false };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{true,false,false}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -853,7 +853,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionBooleanArrayArray() {
boolean[][] array = { { true, false }, null, { false } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{true,false},<null>,{false}}]", ToStringBuilder.reflectionToString(array));
assertEquals(baseString + "[{{true,false},<null>,{false}}]", ToStringBuilder.reflectionToString(array));
array = null;
@@ -863,7 +863,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionByteArray() {
byte[] array = { 1, 2, -3, 4 };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1,2,-3,4}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -872,7 +872,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionByteArrayArray() {
byte[][] array = { { 1, 2 }, null, { 5 } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1,2},<null>,{5}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -884,13 +884,13 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionCharacter() {
final Character c = 'A';
- assertEquals(this.toBaseString(c) + "[value=A]", ToStringBuilder.reflectionToString(c));
+ assertEquals(toBaseString(c) + "[value=A]", ToStringBuilder.reflectionToString(c));
}
@Test
public void testReflectionCharArray() {
char[] array = { 'A', '2', '_', 'D' };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{A,2,_,D}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -899,7 +899,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionCharArrayArray() {
char[][] array = { { 'A', 'B' }, null, { 'p' } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{A,B},<null>,{p}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -908,7 +908,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionDoubleArray() {
double[] array = { 1.0, 2.9876, -3.00001, 4.3 };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1.0,2.9876,-3.00001,4.3}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -917,7 +917,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionDoubleArrayArray() {
double[][] array = { { 1.0, 2.29686 }, null, { Double.NaN } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1.0,2.29686},<null>,{NaN}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -926,7 +926,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionFloatArray() {
float[] array = { 1.0f, 2.9876f, -3.00001f, 4.3f };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1.0,2.9876,-3.00001,4.3}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -935,7 +935,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionFloatArrayArray() {
float[][] array = { { 1.0f, 2.29686f }, null, { Float.NaN } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1.0,2.29686},<null>,{NaN}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -944,7 +944,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionHierarchy() {
final ReflectionTestFixtureA baseA = new ReflectionTestFixtureA();
- String baseString = this.toBaseString(baseA);
+ String baseString = toBaseString(baseA);
assertEquals(baseString + "[a=a]", ToStringBuilder.reflectionToString(baseA));
assertEquals(baseString + "[a=a]", ToStringBuilder.reflectionToString(baseA, null));
assertEquals(baseString + "[a=a]", ToStringBuilder.reflectionToString(baseA, null, false));
@@ -954,7 +954,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
assertEquals(baseString + "[a=a]", ToStringBuilder.reflectionToString(baseA, null, false, ReflectionTestFixtureA.class));
final ReflectionTestFixtureB baseB = new ReflectionTestFixtureB();
- baseString = this.toBaseString(baseB);
+ baseString = toBaseString(baseB);
assertEquals(baseString + "[b=b,a=a]", ToStringBuilder.reflectionToString(baseB));
assertEquals(baseString + "[b=b,a=a]", ToStringBuilder.reflectionToString(baseB));
assertEquals(baseString + "[b=b,a=a]", ToStringBuilder.reflectionToString(baseB, null));
@@ -971,7 +971,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
public void testReflectionHierarchyArrayList() {
// LANG-1337 without this, the generated string can differ depending on the JVM version/vendor
final List<Object> list = new ArrayList<>(ARRAYLIST_INITIAL_CAPACITY);
- final String baseString = this.toBaseString(list);
+ final String baseString = toBaseString(list);
final String expectedWithTransients = baseString
+ "[elementData={<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>,<null>},size=0,modCount=0]";
final String toStringWithTransients = ToStringBuilder.reflectionToString(list, null, true);
@@ -988,7 +988,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionIntArray() {
int[] array = { 1, 2, -3, 4 };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1,2,-3,4}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -997,7 +997,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionIntArrayArray() {
int[][] array = { { 1, 2 }, null, { 5 } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1,2},<null>,{5}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1014,7 +1014,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionLongArray() {
long[] array = { 1, 2, -3, 4 };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1,2,-3,4}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1023,7 +1023,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionLongArrayArray() {
long[][] array = { { 1, 2 }, null, { 5 } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1,2},<null>,{5}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1037,7 +1037,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionObjectArray() {
Object[] array = { null, base, new int[] { 3, 6 } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{<null>,5,{3,6}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1052,13 +1052,13 @@ public class ToStringBuilderTest extends AbstractLangTest {
final ReflectionTestCycleB b = new ReflectionTestCycleB();
a.b = b;
b.a = a;
- assertEquals(this.toBaseString(a) + "[b=" + this.toBaseString(b) + "[a=" + this.toBaseString(a) + "]]", a.toString());
+ assertEquals(toBaseString(a) + "[b=" + toBaseString(b) + "[a=" + toBaseString(a) + "]]", a.toString());
}
@Test
public void testReflectionShort2DArray() {
short[][] array = { { 1, 2 }, null, { 5 } };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{{1,2},<null>,{5}}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1067,7 +1067,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionShortArray() {
short[] array = { 1, 2, -3, 4 };
- final String baseString = this.toBaseString(array);
+ final String baseString = toBaseString(array);
assertEquals(baseString + "[{1,2,-3,4}]", ToStringBuilder.reflectionToString(array));
array = null;
assertReflectionArray("<null>", array);
@@ -1079,14 +1079,14 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testReflectionStatics() {
final ReflectionStaticFieldsFixture instance1 = new ReflectionStaticFieldsFixture();
- assertEquals(this.toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
ReflectionToStringBuilder.toString(instance1, null, false, true, ReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1)
+ assertEquals(toBaseString(instance1)
+ "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString,staticTransientInt=54321,staticTransientString=staticTransientString,transientInt=98765,transientString=transientString]",
ReflectionToStringBuilder.toString(instance1, null, true, true, ReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, ReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[instanceInt=67890,instanceString=instanceString,staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, ReflectionStaticFieldsFixture.class));
}
@@ -1097,7 +1097,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testSelfInstanceTwoVarsReflectionObjectCycle() {
final SelfInstanceTwoVarsReflectionTestFixture test = new SelfInstanceTwoVarsReflectionTestFixture();
- assertEquals(this.toBaseString(test) + "[otherType=" + test.getOtherType().toString() + ",typeIsSelf=" + this.toBaseString(test) + "]",
+ assertEquals(toBaseString(test) + "[otherType=" + test.getOtherType().toString() + ",typeIsSelf=" + toBaseString(test) + "]",
test.toString());
}
@@ -1107,7 +1107,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testSelfInstanceVarReflectionObjectCycle() {
final SelfInstanceVarReflectionTestFixture test = new SelfInstanceVarReflectionTestFixture();
- assertEquals(this.toBaseString(test) + "[typeIsSelf=" + this.toBaseString(test) + "]", test.toString());
+ assertEquals(toBaseString(test) + "[typeIsSelf=" + toBaseString(test) + "]", test.toString());
}
@Test
@@ -1149,19 +1149,19 @@ public class ToStringBuilderTest extends AbstractLangTest {
public void testSimpleReflectionObjectCycle() {
final SimpleReflectionTestFixture simple = new SimpleReflectionTestFixture();
simple.o = simple;
- assertEquals(this.toBaseString(simple) + "[o=" + this.toBaseString(simple) + "]", simple.toString());
+ assertEquals(toBaseString(simple) + "[o=" + toBaseString(simple) + "]", simple.toString());
}
@Test
public void testSimpleReflectionStatics() {
final SimpleReflectionStaticFieldsFixture instance1 = new SimpleReflectionStaticFieldsFixture();
- assertEquals(this.toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
ReflectionToStringBuilder.toString(instance1, null, false, true, SimpleReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
ReflectionToStringBuilder.toString(instance1, null, true, true, SimpleReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, SimpleReflectionStaticFieldsFixture.class));
- assertEquals(this.toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
+ assertEquals(toBaseString(instance1) + "[staticInt=12345,staticString=staticString]",
this.toStringWithStatics(instance1, null, SimpleReflectionStaticFieldsFixture.class));
}
(commons-lang) 16/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit a9f02bc64e0535ec05ca851dcd3989f186988d24
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:32 2024 -0400
Remove redundant syntax
---
.../ReflectionToStringBuilderExcludeTest.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
index 7ca29394e..76b9b8057 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java
@@ -51,25 +51,25 @@ public class ReflectionToStringBuilderExcludeTest extends AbstractLangTest {
@Test
public void test_toStringExclude() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), SECRET_FIELD);
- this.validateSecretFieldAbsent(toString);
+ validateSecretFieldAbsent(toString);
}
@Test
public void test_toStringExcludeArray() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), SECRET_FIELD);
- this.validateSecretFieldAbsent(toString);
+ validateSecretFieldAbsent(toString);
}
@Test
public void test_toStringExcludeArrayWithNull() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), new String[]{null});
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
public void test_toStringExcludeArrayWithNulls() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), null, null);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
@@ -77,7 +77,7 @@ public class ReflectionToStringBuilderExcludeTest extends AbstractLangTest {
final List<String> excludeList = new ArrayList<>();
excludeList.add(SECRET_FIELD);
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), excludeList);
- this.validateSecretFieldAbsent(toString);
+ validateSecretFieldAbsent(toString);
}
@Test
@@ -85,7 +85,7 @@ public class ReflectionToStringBuilderExcludeTest extends AbstractLangTest {
final List<String> excludeList = new ArrayList<>();
excludeList.add(null);
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), excludeList);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
@@ -94,31 +94,31 @@ public class ReflectionToStringBuilderExcludeTest extends AbstractLangTest {
excludeList.add(null);
excludeList.add(null);
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), excludeList);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
public void test_toStringExcludeEmptyArray() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), ArrayUtils.EMPTY_STRING_ARRAY);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
public void test_toStringExcludeEmptyCollection() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), new ArrayList<>());
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
public void test_toStringExcludeNullArray() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), (String[]) null);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
@Test
public void test_toStringExcludeNullCollection() {
final String toString = ReflectionToStringBuilder.toStringExclude(new TestFixture(), (Collection<String>) null);
- this.validateSecretFieldPresent(toString);
+ validateSecretFieldPresent(toString);
}
private void validateNonSecretField(final String toString) {
@@ -128,11 +128,11 @@ public class ReflectionToStringBuilderExcludeTest extends AbstractLangTest {
private void validateSecretFieldAbsent(final String toString) {
assertEquals(ArrayUtils.INDEX_NOT_FOUND, toString.indexOf(SECRET_VALUE));
- this.validateNonSecretField(toString);
+ validateNonSecretField(toString);
}
private void validateSecretFieldPresent(final String toString) {
assertTrue(toString.indexOf(SECRET_VALUE) > 0);
- this.validateNonSecretField(toString);
+ validateNonSecretField(toString);
}
}
(commons-lang) 11/23: Use final
Posted by gg...@apache.org.
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
commit 2e0e2a1659198863f9a2d0388e784e68b9285b97
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:15:26 2024 -0400
Use final
---
src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
index dc9e3969d..57ee3258a 100644
--- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
@@ -72,7 +72,7 @@ public class LocaleUtilsTest extends AbstractLangTest {
for (final String country : countries) {
boolean found = false;
// see if it was returned by the set
- for (Locale locale : list) {
+ for (final Locale locale : list) {
// should have an en empty variant
assertTrue(StringUtils.isEmpty(locale.getVariant()));
assertEquals(language, locale.getLanguage());
@@ -104,7 +104,7 @@ public class LocaleUtilsTest extends AbstractLangTest {
for (final String language : languages) {
boolean found = false;
// see if it was returned by the set
- for (Locale locale : list) {
+ for (final Locale locale : list) {
// should have an en empty variant
assertTrue(StringUtils.isEmpty(locale.getVariant()));
assertEquals(country, locale.getCountry());
(commons-lang) 06/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 24e80503b38e5605465035816e852630fddf8e3b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:14:36 2024 -0400
Remove redundant syntax
---
src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java b/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
index 4fc33e376..b14353940 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java
@@ -99,22 +99,22 @@ public class CharUtilsPerfRun {
}
private void run() {
- this.printSysInfo();
+ printSysInfo();
long startMillis;
startMillis = System.currentTimeMillis();
- this.printlnTotal("Do nothing", startMillis);
+ printlnTotal("Do nothing", startMillis);
run_CharUtils_isAsciiNumeric(WARM_UP);
startMillis = System.currentTimeMillis();
run_CharUtils_isAsciiNumeric(COUNT);
- this.printlnTotal("run_CharUtils_isAsciiNumeric", startMillis);
+ printlnTotal("run_CharUtils_isAsciiNumeric", startMillis);
run_inlined_CharUtils_isAsciiNumeric(WARM_UP);
startMillis = System.currentTimeMillis();
run_inlined_CharUtils_isAsciiNumeric(COUNT);
- this.printlnTotal("run_inlined_CharUtils_isAsciiNumeric", startMillis);
+ printlnTotal("run_inlined_CharUtils_isAsciiNumeric", startMillis);
run_CharSet(WARM_UP);
startMillis = System.currentTimeMillis();
run_CharSet(COUNT);
- this.printlnTotal("run_CharSet", startMillis);
+ printlnTotal("run_CharSet", startMillis);
}
private int run_CharSet(final int loopCount) {
(commons-lang) 17/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit a2fe02fc0c6265f898c9938fa40bfbde3a72c9ca
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:40 2024 -0400
Remove redundant syntax
---
.../ReflectionToStringBuilderIncludeTest.java | 38 +++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java
index f4f2d0a28..fd14d7351 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java
@@ -64,31 +64,31 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
public void test_toStringDefaultBehavior() {
final ReflectionToStringBuilder builder = new ReflectionToStringBuilder(new TestFeature());
final String toString = builder.toString();
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringInclude() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), SINGLE_FIELD_TO_SHOW);
- this.validateIncludeFieldsPresent(toString, new String[]{ SINGLE_FIELD_TO_SHOW }, new String[]{ SINGLE_FIELD_VALUE_TO_SHOW });
+ validateIncludeFieldsPresent(toString, new String[]{ SINGLE_FIELD_TO_SHOW }, new String[]{ SINGLE_FIELD_VALUE_TO_SHOW });
}
@Test
public void test_toStringIncludeArray() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), FIELDS_TO_SHOW);
- this.validateIncludeFieldsPresent(toString, FIELDS_TO_SHOW, FIELDS_VALUES_TO_SHOW);
+ validateIncludeFieldsPresent(toString, FIELDS_TO_SHOW, FIELDS_VALUES_TO_SHOW);
}
@Test
public void test_toStringIncludeArrayWithNull() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), new String[]{null});
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeArrayWithNulls() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), null, null);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
@@ -96,7 +96,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
final List<String> includeList = new ArrayList<>();
includeList.add(SINGLE_FIELD_TO_SHOW);
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), includeList);
- this.validateIncludeFieldsPresent(toString, new String[]{ SINGLE_FIELD_TO_SHOW }, new String[]{ SINGLE_FIELD_VALUE_TO_SHOW });
+ validateIncludeFieldsPresent(toString, new String[]{ SINGLE_FIELD_TO_SHOW }, new String[]{ SINGLE_FIELD_VALUE_TO_SHOW });
}
@Test
@@ -104,7 +104,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
final List<String> includeList = new ArrayList<>();
includeList.add(null);
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), includeList);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
@@ -113,43 +113,43 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
includeList.add(null);
includeList.add(null);
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), includeList);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeEmptyArray() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), ArrayUtils.EMPTY_STRING_ARRAY);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeEmptyCollection() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), new ArrayList<>());
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeNullArray() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), (String[]) null);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeNullArrayMultiplesValues() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), null, null, null, null);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeNullCollection() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), (Collection<String>) null);
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
public void test_toStringIncludeWithoutInformingFields() {
final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature());
- this.validateAllFieldsPresent(toString);
+ validateAllFieldsPresent(toString);
}
@Test
@@ -168,7 +168,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
builder.setExcludeFieldNames(FIELDS[1], FIELDS[4]);
builder.setIncludeFieldNames(FIELDS_TO_SHOW);
final String toString = builder.toString();
- this.validateIncludeFieldsPresent(toString, FIELDS_TO_SHOW, FIELDS_VALUES_TO_SHOW);
+ validateIncludeFieldsPresent(toString, FIELDS_TO_SHOW, FIELDS_VALUES_TO_SHOW);
}
@Test
@@ -187,7 +187,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
builder.setExcludeFieldNames(FIELDS[1], "random1");
builder.setIncludeFieldNames("random2", FIELDS[2]);
final String toString = builder.toString();
- this.validateIncludeFieldsPresent(toString, new String[]{FIELDS[2]}, new String[]{VALUES[2]});
+ validateIncludeFieldsPresent(toString, new String[]{FIELDS[2]}, new String[]{VALUES[2]});
}
@Test
@@ -196,7 +196,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
builder.setExcludeFieldNames(FIELDS[1], FIELDS[4]);
builder.setIncludeFieldNames(null, null, null);
final String toString = builder.toString();
- this.validateIncludeFieldsPresent(toString, new String[]{FIELDS[0], FIELDS[2], FIELDS[3]}, new String[]{VALUES[0], VALUES[2], VALUES[3]});
+ validateIncludeFieldsPresent(toString, new String[]{FIELDS[0], FIELDS[2], FIELDS[3]}, new String[]{VALUES[0], VALUES[2], VALUES[3]});
}
@Test
@@ -205,7 +205,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
builder.setExcludeFieldNames(FIELDS[1], FIELDS[4]);
builder.setIncludeFieldNames(null, null, null);
final String toString = builder.toString();
- this.validateIncludeFieldsPresent(toString, new String[]{FIELDS[0], FIELDS[2], FIELDS[3]}, new String[]{VALUES[0], VALUES[2], VALUES[3]});
+ validateIncludeFieldsPresent(toString, new String[]{FIELDS[0], FIELDS[2], FIELDS[3]}, new String[]{VALUES[0], VALUES[2], VALUES[3]});
}
private void validateAllFieldsPresent(final String toString) {
@@ -221,7 +221,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
assertTrue(toString.indexOf(includeValue) > 0);
}
- this.validateNonIncludeFieldsAbsent(toString, fieldsToShow, valuesToShow);
+ validateNonIncludeFieldsAbsent(toString, fieldsToShow, valuesToShow);
}
private void validateNonIncludeFieldsAbsent(final String toString, final String[] IncludeFields, final String[] IncludeFieldsValues) {
(commons-lang) 04/23: Remove redundant call to super()
Posted by gg...@apache.org.
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
commit e3552a530ddf54ee7f9d2ddf2137b5b8f171a925
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:14:00 2024 -0400
Remove redundant call to super()
Use final
Remove redundant syntax
---
.../java/org/apache/commons/lang3/CachedRandomBitsTest.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/CachedRandomBitsTest.java b/src/test/java/org/apache/commons/lang3/CachedRandomBitsTest.java
index 6f8c8c951..6e548e73b 100644
--- a/src/test/java/org/apache/commons/lang3/CachedRandomBitsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CachedRandomBitsTest.java
@@ -38,13 +38,12 @@ public class CachedRandomBitsTest {
private int index;
MockRandom(final byte[] outputs) {
- super();
this.outputs = outputs.clone();
this.index = 0;
}
@Override
- public void nextBytes(byte[] bytes) {
+ public void nextBytes(final byte[] bytes) {
Objects.requireNonNull(bytes, "bytes");
if (index + bytes.length > outputs.length) {
throw new IllegalStateException("Not enough outputs given in MockRandom");
@@ -56,8 +55,8 @@ public class CachedRandomBitsTest {
@ParameterizedTest
@ValueSource(ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 32})
- public void testNext(int cacheSize) {
- MockRandom random = new MockRandom(new byte[]{
+ public void testNext(final int cacheSize) {
+ final MockRandom random = new MockRandom(new byte[]{
0x11, 0x12, 0x13, 0x25,
(byte) 0xab, (byte) 0xcd, (byte) 0xef, (byte) 0xff,
0x55, 0x44, 0x12, 0x34,
@@ -68,7 +67,7 @@ public class CachedRandomBitsTest {
0x00, 0x00, 0x00, 0x00,
});
- CachedRandomBits arb = new CachedRandomBits(cacheSize, random);
+ final CachedRandomBits arb = new CachedRandomBits(cacheSize, random);
assertThrows(IllegalArgumentException.class, () -> arb.nextBits(0));
assertThrows(IllegalArgumentException.class, () -> arb.nextBits(33));
@@ -86,7 +85,7 @@ public class CachedRandomBitsTest {
assertEquals(0x4, arb.nextBits(6));
- assertEquals(0x40000000 | (0x12345600 >> 2) | 0x38, arb.nextBits(32));
+ assertEquals(0x40000000 | 0x12345600 >> 2 | 0x38, arb.nextBits(32));
assertEquals(1, arb.nextBits(1));
assertEquals(0, arb.nextBits(1));
(commons-lang) 03/23: Use final
Posted by gg...@apache.org.
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
commit beb3b8fbc55ec469f60a28398ddc60becad08a48
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:13:16 2024 -0400
Use final
Remove redundant syntax and whitespace
---
src/main/java/org/apache/commons/lang3/CachedRandomBits.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/CachedRandomBits.java b/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
index 78d0b458c..09bbafb56 100644
--- a/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
+++ b/src/main/java/org/apache/commons/lang3/CachedRandomBits.java
@@ -90,9 +90,9 @@ final class CachedRandomBits {
}
// generatedBitsInIteration is the number of bits that we will generate
// in this iteration of the while loop
- int generatedBitsInIteration = Math.min(8 - (bitIndex & 0x7), bits - generatedBits);
+ final int generatedBitsInIteration = Math.min(8 - (bitIndex & 0x7), bits - generatedBits);
result = result << generatedBitsInIteration;
- result |= (cache[bitIndex >> 3] >> (bitIndex & 0x7)) & ((1 << generatedBitsInIteration) - 1);
+ result |= cache[bitIndex >> 3] >> (bitIndex & 0x7) & (1 << generatedBitsInIteration) - 1;
generatedBits += generatedBitsInIteration;
bitIndex += generatedBitsInIteration;
}
(commons-lang) 13/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit ce90d81ac26ed1dbb12f8fbf303889d40a1f83f0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:02 2024 -0400
Remove redundant syntax
---
.../apache/commons/lang3/math/NumberUtilsTest.java | 60 +++++++++++-----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
index b07be6662..cf1bdf327 100644
--- a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
@@ -443,21 +443,21 @@ public class NumberUtilsTest extends AbstractLangTest {
assertEquals(new BigDecimal("1234.5"), NumberUtils.createBigDecimal("1234.5"),
"createBigDecimal(String) failed");
assertNull(NumberUtils.createBigDecimal(null), "createBigDecimal(null) failed");
- this.testCreateBigDecimalFailure("");
- this.testCreateBigDecimalFailure(" ");
- this.testCreateBigDecimalFailure("\b\t\n\f\r");
+ testCreateBigDecimalFailure("");
+ testCreateBigDecimalFailure(" ");
+ testCreateBigDecimalFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateBigDecimalFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateBigDecimalFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
// sign alone not valid
- this.testCreateBigDecimalFailure("-");
+ testCreateBigDecimalFailure("-");
// comment in NumberUtils suggests some implementations may incorrectly allow this
- this.testCreateBigDecimalFailure("--");
- this.testCreateBigDecimalFailure("--0");
+ testCreateBigDecimalFailure("--");
+ testCreateBigDecimalFailure("--0");
// sign alone not valid
- this.testCreateBigDecimalFailure("+");
+ testCreateBigDecimalFailure("+");
// in case this was also allowed by some JVMs
- this.testCreateBigDecimalFailure("++");
- this.testCreateBigDecimalFailure("++0");
+ testCreateBigDecimalFailure("++");
+ testCreateBigDecimalFailure("++0");
}
protected void testCreateBigDecimalFailure(final String str) {
@@ -469,11 +469,11 @@ public class NumberUtilsTest extends AbstractLangTest {
public void testCreateBigInteger() {
assertEquals(new BigInteger("12345"), NumberUtils.createBigInteger("12345"), "createBigInteger(String) failed");
assertNull(NumberUtils.createBigInteger(null), "createBigInteger(null) failed");
- this.testCreateBigIntegerFailure("");
- this.testCreateBigIntegerFailure(" ");
- this.testCreateBigIntegerFailure("\b\t\n\f\r");
+ testCreateBigIntegerFailure("");
+ testCreateBigIntegerFailure(" ");
+ testCreateBigIntegerFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateBigIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateBigIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
assertEquals(new BigInteger("255"), NumberUtils.createBigInteger("0xff"), "createBigInteger(String) failed");
assertEquals(new BigInteger("255"), NumberUtils.createBigInteger("0Xff"), "createBigInteger(String) failed");
assertEquals(new BigInteger("255"), NumberUtils.createBigInteger("#ff"), "createBigInteger(String) failed");
@@ -502,11 +502,11 @@ public class NumberUtilsTest extends AbstractLangTest {
public void testCreateDouble() {
assertEquals(Double.valueOf("1234.5"), NumberUtils.createDouble("1234.5"), "createDouble(String) failed");
assertNull(NumberUtils.createDouble(null), "createDouble(null) failed");
- this.testCreateDoubleFailure("");
- this.testCreateDoubleFailure(" ");
- this.testCreateDoubleFailure("\b\t\n\f\r");
+ testCreateDoubleFailure("");
+ testCreateDoubleFailure(" ");
+ testCreateDoubleFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateDoubleFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateDoubleFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateDoubleFailure(final String str) {
@@ -518,11 +518,11 @@ public class NumberUtilsTest extends AbstractLangTest {
public void testCreateFloat() {
assertEquals(Float.valueOf("1234.5"), NumberUtils.createFloat("1234.5"), "createFloat(String) failed");
assertNull(NumberUtils.createFloat(null), "createFloat(null) failed");
- this.testCreateFloatFailure("");
- this.testCreateFloatFailure(" ");
- this.testCreateFloatFailure("\b\t\n\f\r");
+ testCreateFloatFailure("");
+ testCreateFloatFailure(" ");
+ testCreateFloatFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateFloatFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateFloatFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateFloatFailure(final String str) {
@@ -534,11 +534,11 @@ public class NumberUtilsTest extends AbstractLangTest {
public void testCreateInteger() {
assertEquals(Integer.valueOf("12345"), NumberUtils.createInteger("12345"), "createInteger(String) failed");
assertNull(NumberUtils.createInteger(null), "createInteger(null) failed");
- this.testCreateIntegerFailure("");
- this.testCreateIntegerFailure(" ");
- this.testCreateIntegerFailure("\b\t\n\f\r");
+ testCreateIntegerFailure("");
+ testCreateIntegerFailure(" ");
+ testCreateIntegerFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
// LANG-1645
assertEquals(Integer.decode("+0xF"), NumberUtils.createInteger("+0xF"));
}
@@ -552,11 +552,11 @@ public class NumberUtilsTest extends AbstractLangTest {
public void testCreateLong() {
assertEquals(Long.valueOf("12345"), NumberUtils.createLong("12345"), "createLong(String) failed");
assertNull(NumberUtils.createLong(null), "createLong(null) failed");
- this.testCreateLongFailure("");
- this.testCreateLongFailure(" ");
- this.testCreateLongFailure("\b\t\n\f\r");
+ testCreateLongFailure("");
+ testCreateLongFailure(" ");
+ testCreateLongFailure("\b\t\n\f\r");
// Funky whitespaces
- this.testCreateLongFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
+ testCreateLongFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
// LANG-1645
assertEquals(Long.decode("+0xFFFFFFFF"), NumberUtils.createLong("+0xFFFFFFFF"));
}
(commons-lang) 15/23: Remove redundant syntax
Posted by gg...@apache.org.
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
commit 7cad9c3ef8b2f6a71eae9434cf55e93aecf60d6a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:17:23 2024 -0400
Remove redundant syntax
---
.../lang3/builder/ReflectionToStringBuilderConcurrencyTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
index cb41d3e58..cccbd0a1a 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderConcurrencyTest.java
@@ -65,7 +65,7 @@ public class ReflectionToStringBuilderConcurrencyTest extends AbstractLangTest {
@Test
@Disabled
public void testArrayList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new ArrayList<>()));
+ testConcurrency(new CollectionHolder<>(new ArrayList<>()));
}
private void testConcurrency(final CollectionHolder<List<Integer>> holder) throws InterruptedException {
@@ -106,12 +106,12 @@ public class ReflectionToStringBuilderConcurrencyTest extends AbstractLangTest {
@Test
@Disabled
public void testCopyOnWriteArrayList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new CopyOnWriteArrayList<>()));
+ testConcurrency(new CollectionHolder<>(new CopyOnWriteArrayList<>()));
}
@Test
@Disabled
public void testLinkedList() throws InterruptedException {
- this.testConcurrency(new CollectionHolder<>(new LinkedList<>()));
+ testConcurrency(new CollectionHolder<>(new LinkedList<>()));
}
}
(commons-lang) 09/23: Use final
Posted by gg...@apache.org.
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
commit 6c14b377e5d291480c8c6b7bbddce4938b6fa63c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 10:15:08 2024 -0400
Use final
---
src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a458fcd1a..3a912fa18 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -248,7 +248,7 @@ public class ExceptionUtils {
// TODO: Remove in Lang 4
private static Throwable getCauseUsingMethodName(final Throwable throwable, final String methodName) {
if (methodName != null) {
- Method method = MethodUtils.getMethodObject(throwable.getClass(), methodName);
+ final Method method = MethodUtils.getMethodObject(throwable.getClass(), methodName);
if (method != null && Throwable.class.isAssignableFrom(method.getReturnType())) {
try {
return (Throwable) method.invoke(throwable);