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/01/25 03:38:32 UTC
(commons-lang) branch master updated (b3b51d1ed -> 6540edfdc)
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 b3b51d1ed Address minor redundancies after code inspection #1148
new 62e8c5812 Sort members
new 6540edfdc Use final
The 2 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/BitField.java | 2 +-
.../java/org/apache/commons/lang3/CharUtils.java | 8 +-
.../java/org/apache/commons/lang3/ClassUtils.java | 2 +-
.../java/org/apache/commons/lang3/Conversion.java | 58 ++--
.../java/org/apache/commons/lang3/EnumUtils.java | 6 +-
.../java/org/apache/commons/lang3/RandomUtils.java | 6 +-
.../apache/commons/lang3/builder/Reflection.java | 2 +-
.../lang3/concurrent/AtomicInitializer.java | 2 +-
.../lang3/concurrent/AtomicSafeInitializer.java | 2 +-
.../lang3/concurrent/BackgroundInitializer.java | 2 +-
.../concurrent/CallableBackgroundInitializer.java | 2 +-
.../commons/lang3/concurrent/LazyInitializer.java | 2 +-
.../concurrent/MultiBackgroundInitializer.java | 4 +-
.../apache/commons/lang3/mutable/MutableLong.java | 2 +-
.../lang3/text/translate/UnicodeEscaper.java | 8 +-
.../org/apache/commons/lang3/time/GmtTimeZone.java | 4 +-
.../org/apache/commons/lang3/time/StopWatch.java | 2 +-
.../apache/commons/lang3/ArrayUtilsRemoveTest.java | 18 +-
.../org/apache/commons/lang3/ArrayUtilsTest.java | 192 +++++------
.../java/org/apache/commons/lang3/CharSetTest.java | 4 +-
.../org/apache/commons/lang3/CharUtilsTest.java | 4 +-
.../org/apache/commons/lang3/ClassUtilsTest.java | 2 +-
.../org/apache/commons/lang3/EnumUtilsTest.java | 40 +--
.../org/apache/commons/lang3/FunctionsTest.java | 16 +-
.../org/apache/commons/lang3/JavaVersionTest.java | 2 +-
.../org/apache/commons/lang3/LocaleUtilsTest.java | 9 +-
.../org/apache/commons/lang3/ObjectUtilsTest.java | 2 +-
.../commons/lang3/RandomStringUtilsTest.java | 6 +-
.../java/org/apache/commons/lang3/RangeTest.java | 8 +-
.../commons/lang3/StringEscapeUtilsTest.java | 8 +-
.../commons/lang3/StringUtilsContainsTest.java | 8 +-
.../org/apache/commons/lang3/SystemUtilsTest.java | 8 +-
.../org/apache/commons/lang3/ThreadUtilsTest.java | 4 +-
.../org/apache/commons/lang3/ValidateTest.java | 6 +-
.../commons/lang3/builder/ConversionTest.java | 8 +-
.../commons/lang3/builder/DiffResultTest.java | 10 +-
.../commons/lang3/builder/HashCodeBuilderTest.java | 6 +-
...ionToStringBuilderCustomImplementationTest.java | 4 +-
.../ReflectionToStringBuilderIncludeTest.java | 6 +-
.../lang3/builder/StandardToStringStyleTest.java | 16 +-
.../commons/lang3/builder/ToStringBuilderTest.java | 2 +-
...oncurrentInitializerCloseAndExceptionsTest.java | 12 +-
.../AbstractConcurrentInitializerTest.java | 2 +-
.../concurrent/AtomicInitializerSupplierTest.java | 2 +-
.../lang3/concurrent/AtomicInitializerTest.java | 3 +-
.../AtomicSafeInitializerSupplierTest.java | 3 +-
.../concurrent/AtomicSafeInitializerTest.java | 3 +-
.../BackgroundInitializerSupplierTest.java | 26 +-
.../concurrent/LazyInitializerSupplierTest.java | 2 +-
.../MultiBackgroundInitializerSupplierTest.java | 38 +--
.../concurrent/MultiBackgroundInitializerTest.java | 10 +-
.../apache/commons/lang3/math/NumberUtilsTest.java | 2 +-
.../lang3/mutable/PrintAtomicVsMutable.java | 2 +-
.../commons/lang3/reflect/TypeUtilsTest.java | 372 ++++++++++-----------
.../apache/commons/lang3/text/StrBuilderTest.java | 8 +-
.../commons/lang3/time/DateUtilsFragmentTest.java | 76 ++---
.../lang3/time/DurationFormatUtilsTest.java | 4 +-
.../commons/lang3/time/FastDateParserTest.java | 2 +-
.../time/FastDateParser_TimeZoneStrategyTest.java | 7 +-
59 files changed, 535 insertions(+), 542 deletions(-)
(commons-lang) 02/02: 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 6540edfdc0b710f05316bbe6b4f0eb140dca317c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 24 22:38:24 2024 -0500
Use final
- Use method reference
- Remove noisy parens
- Format tweaks
- Remove noisy block nesting
---
.../java/org/apache/commons/lang3/BitField.java | 2 +-
.../java/org/apache/commons/lang3/CharUtils.java | 8 +-
.../java/org/apache/commons/lang3/ClassUtils.java | 2 +-
.../java/org/apache/commons/lang3/Conversion.java | 58 +++----
.../java/org/apache/commons/lang3/EnumUtils.java | 6 +-
.../java/org/apache/commons/lang3/RandomUtils.java | 6 +-
.../apache/commons/lang3/builder/Reflection.java | 2 +-
.../lang3/concurrent/AtomicInitializer.java | 2 +-
.../lang3/concurrent/AtomicSafeInitializer.java | 2 +-
.../lang3/concurrent/BackgroundInitializer.java | 2 +-
.../concurrent/CallableBackgroundInitializer.java | 2 +-
.../commons/lang3/concurrent/LazyInitializer.java | 2 +-
.../concurrent/MultiBackgroundInitializer.java | 4 +-
.../apache/commons/lang3/mutable/MutableLong.java | 2 +-
.../lang3/text/translate/UnicodeEscaper.java | 8 +-
.../org/apache/commons/lang3/time/GmtTimeZone.java | 4 +-
.../org/apache/commons/lang3/time/StopWatch.java | 2 +-
.../apache/commons/lang3/ArrayUtilsRemoveTest.java | 18 +-
.../org/apache/commons/lang3/ArrayUtilsTest.java | 192 ++++++++++-----------
.../java/org/apache/commons/lang3/CharSetTest.java | 4 +-
.../org/apache/commons/lang3/CharUtilsTest.java | 4 +-
.../org/apache/commons/lang3/ClassUtilsTest.java | 2 +-
.../org/apache/commons/lang3/EnumUtilsTest.java | 40 ++---
.../org/apache/commons/lang3/FunctionsTest.java | 16 +-
.../org/apache/commons/lang3/JavaVersionTest.java | 2 +-
.../org/apache/commons/lang3/LocaleUtilsTest.java | 9 +-
.../org/apache/commons/lang3/ObjectUtilsTest.java | 2 +-
.../commons/lang3/RandomStringUtilsTest.java | 6 +-
.../java/org/apache/commons/lang3/RangeTest.java | 8 +-
.../commons/lang3/StringEscapeUtilsTest.java | 8 +-
.../commons/lang3/StringUtilsContainsTest.java | 8 +-
.../org/apache/commons/lang3/SystemUtilsTest.java | 8 +-
.../org/apache/commons/lang3/ThreadUtilsTest.java | 4 +-
.../org/apache/commons/lang3/ValidateTest.java | 6 +-
.../commons/lang3/builder/HashCodeBuilderTest.java | 6 +-
...ionToStringBuilderCustomImplementationTest.java | 4 +-
.../ReflectionToStringBuilderIncludeTest.java | 6 +-
.../lang3/builder/StandardToStringStyleTest.java | 16 +-
.../commons/lang3/builder/ToStringBuilderTest.java | 2 +-
...oncurrentInitializerCloseAndExceptionsTest.java | 12 +-
.../AbstractConcurrentInitializerTest.java | 2 +-
.../concurrent/AtomicInitializerSupplierTest.java | 2 +-
.../lang3/concurrent/AtomicInitializerTest.java | 3 +-
.../AtomicSafeInitializerSupplierTest.java | 3 +-
.../concurrent/AtomicSafeInitializerTest.java | 3 +-
.../BackgroundInitializerSupplierTest.java | 26 +--
.../concurrent/LazyInitializerSupplierTest.java | 2 +-
.../MultiBackgroundInitializerSupplierTest.java | 38 ++--
.../concurrent/MultiBackgroundInitializerTest.java | 10 +-
.../apache/commons/lang3/math/NumberUtilsTest.java | 2 +-
.../lang3/mutable/PrintAtomicVsMutable.java | 2 +-
.../apache/commons/lang3/text/StrBuilderTest.java | 8 +-
.../commons/lang3/time/DateUtilsFragmentTest.java | 76 ++++----
.../lang3/time/DurationFormatUtilsTest.java | 4 +-
.../commons/lang3/time/FastDateParserTest.java | 2 +-
.../time/FastDateParser_TimeZoneStrategyTest.java | 7 +-
56 files changed, 340 insertions(+), 347 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/BitField.java b/src/main/java/org/apache/commons/lang3/BitField.java
index 03f6339a3..1f3fe7651 100644
--- a/src/main/java/org/apache/commons/lang3/BitField.java
+++ b/src/main/java/org/apache/commons/lang3/BitField.java
@@ -316,7 +316,7 @@ public class BitField {
* parameter replacing the old bits
*/
public int setValue(final int holder, final int value) {
- return (holder & ~mask) | ((value << shiftCount) & mask);
+ return holder & ~mask | value << shiftCount & mask;
}
}
diff --git a/src/main/java/org/apache/commons/lang3/CharUtils.java b/src/main/java/org/apache/commons/lang3/CharUtils.java
index b85366453..61c16b793 100644
--- a/src/main/java/org/apache/commons/lang3/CharUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharUtils.java
@@ -483,10 +483,10 @@ public class CharUtils {
*/
public static String unicodeEscaped(final char ch) {
return "\\u" +
- HEX_DIGITS[(ch >> 12) & 15] +
- HEX_DIGITS[(ch >> 8) & 15] +
- HEX_DIGITS[(ch >> 4) & 15] +
- HEX_DIGITS[(ch) & 15];
+ HEX_DIGITS[ch >> 12 & 15] +
+ HEX_DIGITS[ch >> 8 & 15] +
+ HEX_DIGITS[ch >> 4 & 15] +
+ HEX_DIGITS[ch & 15];
}
/**
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 86a02730b..3d86aee84 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -528,7 +528,7 @@ public class ClassUtils {
*/
public static Class<?> getClass(final ClassLoader classLoader, final String className, final boolean initialize) throws ClassNotFoundException {
try {
- Class<?> clazz = namePrimitiveMap.get(className);
+ final Class<?> clazz = namePrimitiveMap.get(className);
return clazz != null ? clazz : Class.forName(toCanonicalName(className), initialize, classLoader);
} catch (final ClassNotFoundException ex) {
// allow path separators (.) as inner class name separators
diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index b2216e03d..1a07292dd 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -175,7 +175,7 @@ public class Conversion {
final int shift = i + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift;
- out = (byte) ((out & ~mask) | bits);
+ out = (byte) (out & ~mask | bits);
}
return out;
}
@@ -332,7 +332,7 @@ public class Conversion {
final int shift = i + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -365,7 +365,7 @@ public class Conversion {
final int shift = i + dstPos;
final long bits = (src[i + srcPos] ? 1L : 0) << shift;
final long mask = 0x1L << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -398,7 +398,7 @@ public class Conversion {
final int shift = i + dstPos;
final int bits = (src[i + srcPos] ? 1 : 0) << shift;
final int mask = 0x1 << shift;
- out = (short) ((out & ~mask) | bits);
+ out = (short) (out & ~mask | bits);
}
return out;
}
@@ -431,7 +431,7 @@ public class Conversion {
final int shift = i * 8 + dstPos;
final int bits = (0xff & src[i + srcPos]) << shift;
final int mask = 0xff << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -464,7 +464,7 @@ public class Conversion {
final int shift = i * 8 + dstPos;
final long bits = (0xffL & src[i + srcPos]) << shift;
final long mask = 0xffL << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -497,7 +497,7 @@ public class Conversion {
final int shift = i * 8 + dstPos;
final int bits = (0xff & src[i + srcPos]) << shift;
final int mask = 0xff << shift;
- out = (short) ((out & ~mask) | bits);
+ out = (short) (out & ~mask | bits);
}
return out;
}
@@ -545,7 +545,7 @@ public class Conversion {
}
for (int i = 0; i < nBools; i++) {
final int shift = i + srcPos;
- dst[dstPos + i] = (0x1 & (src >> shift)) != 0;
+ dst[dstPos + i] = (0x1 & src >> shift) != 0;
}
return dst;
}
@@ -576,7 +576,7 @@ public class Conversion {
int append = sb.length();
for (int i = 0; i < nHexs; i++) {
final int shift = i * 4 + srcPos;
- final int bits = 0xF & (src >> shift);
+ final int bits = 0xF & src >> shift;
if (dstPos + i == append) {
++append;
sb.append(intToHexDigit(bits));
@@ -802,7 +802,7 @@ public class Conversion {
final int shift = i * 4 + dstPos;
final int bits = (0xf & hexDigitToInt(src.charAt(i + srcPos))) << shift;
final int mask = 0xf << shift;
- out = (byte) ((out & ~mask) | bits);
+ out = (byte) (out & ~mask | bits);
}
return out;
}
@@ -832,7 +832,7 @@ public class Conversion {
final int shift = i * 4 + dstPos;
final int bits = (0xf & hexDigitToInt(src.charAt(i + srcPos))) << shift;
final int mask = 0xf << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -863,7 +863,7 @@ public class Conversion {
final int shift = i * 4 + dstPos;
final long bits = (0xfL & hexDigitToInt(src.charAt(i + srcPos))) << shift;
final long mask = 0xfL << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -894,7 +894,7 @@ public class Conversion {
final int shift = i * 4 + dstPos;
final int bits = (0xf & hexDigitToInt(src.charAt(i + srcPos))) << shift;
final int mask = 0xf << shift;
- out = (short) ((out & ~mask) | bits);
+ out = (short) (out & ~mask | bits);
}
return out;
}
@@ -927,7 +927,7 @@ public class Conversion {
final int shift = i * 32 + dstPos;
final long bits = (0xffffffffL & src[i + srcPos]) << shift;
final long mask = 0xffffffffL << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -957,7 +957,7 @@ public class Conversion {
}
for (int i = 0; i < nBools; i++) {
final int shift = i + srcPos;
- dst[dstPos + i] = (0x1 & (src >> shift)) != 0;
+ dst[dstPos + i] = (0x1 & src >> shift) != 0;
}
return dst;
}
@@ -987,7 +987,7 @@ public class Conversion {
}
for (int i = 0; i < nBytes; i++) {
final int shift = i * 8 + srcPos;
- dst[dstPos + i] = (byte) (0xff & (src >> shift));
+ dst[dstPos + i] = (byte) (0xff & src >> shift);
}
return dst;
}
@@ -1018,7 +1018,7 @@ public class Conversion {
int append = sb.length();
for (int i = 0; i < nHexs; i++) {
final int shift = i * 4 + srcPos;
- final int bits = 0xF & (src >> shift);
+ final int bits = 0xF & src >> shift;
if (dstPos + i == append) {
++append;
sb.append(intToHexDigit(bits));
@@ -1135,7 +1135,7 @@ public class Conversion {
}
for (int i = 0; i < nShorts; i++) {
final int shift = i * 16 + srcPos;
- dst[dstPos + i] = (short) (0xffff & (src >> shift));
+ dst[dstPos + i] = (short) (0xffff & src >> shift);
}
return dst;
}
@@ -1165,7 +1165,7 @@ public class Conversion {
}
for (int i = 0; i < nBools; i++) {
final int shift = i + srcPos;
- dst[dstPos + i] = (0x1 & (src >> shift)) != 0;
+ dst[dstPos + i] = (0x1 & src >> shift) != 0;
}
return dst;
}
@@ -1195,7 +1195,7 @@ public class Conversion {
}
for (int i = 0; i < nBytes; i++) {
final int shift = i * 8 + srcPos;
- dst[dstPos + i] = (byte) (0xff & (src >> shift));
+ dst[dstPos + i] = (byte) (0xff & src >> shift);
}
return dst;
}
@@ -1226,7 +1226,7 @@ public class Conversion {
int append = sb.length();
for (int i = 0; i < nHexs; i++) {
final int shift = i * 4 + srcPos;
- final int bits = (int) (0xF & (src >> shift));
+ final int bits = (int) (0xF & src >> shift);
if (dstPos + i == append) {
++append;
sb.append(intToHexDigit(bits));
@@ -1262,7 +1262,7 @@ public class Conversion {
}
for (int i = 0; i < nInts; i++) {
final int shift = i * 32 + srcPos;
- dst[dstPos + i] = (int) (0xffffffff & (src >> shift));
+ dst[dstPos + i] = (int) (0xffffffff & src >> shift);
}
return dst;
}
@@ -1292,7 +1292,7 @@ public class Conversion {
}
for (int i = 0; i < nShorts; i++) {
final int shift = i * 16 + srcPos;
- dst[dstPos + i] = (short) (0xffff & (src >> shift));
+ dst[dstPos + i] = (short) (0xffff & src >> shift);
}
return dst;
}
@@ -1325,7 +1325,7 @@ public class Conversion {
final int shift = i * 16 + dstPos;
final int bits = (0xffff & src[i + srcPos]) << shift;
final int mask = 0xffff << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -1358,7 +1358,7 @@ public class Conversion {
final int shift = i * 16 + dstPos;
final long bits = (0xffffL & src[i + srcPos]) << shift;
final long mask = 0xffffL << shift;
- out = (out & ~mask) | bits;
+ out = out & ~mask | bits;
}
return out;
}
@@ -1386,10 +1386,10 @@ public class Conversion {
if (nBools - 1 + srcPos >= 16) {
throw new IllegalArgumentException("nBools-1+srcPos is greater or equal to than 16");
}
- assert (nBools - 1) < 16 - srcPos;
+ assert nBools - 1 < 16 - srcPos;
for (int i = 0; i < nBools; i++) {
final int shift = i + srcPos;
- dst[dstPos + i] = (0x1 & (src >> shift)) != 0;
+ dst[dstPos + i] = (0x1 & src >> shift) != 0;
}
return dst;
}
@@ -1419,7 +1419,7 @@ public class Conversion {
}
for (int i = 0; i < nBytes; i++) {
final int shift = i * 8 + srcPos;
- dst[dstPos + i] = (byte) (0xff & (src >> shift));
+ dst[dstPos + i] = (byte) (0xff & src >> shift);
}
return dst;
}
@@ -1450,7 +1450,7 @@ public class Conversion {
int append = sb.length();
for (int i = 0; i < nHexs; i++) {
final int shift = i * 4 + srcPos;
- final int bits = 0xF & (src >> shift);
+ final int bits = 0xF & src >> shift;
if (dstPos + i == append) {
++append;
sb.append(intToHexDigit(bits));
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index 1e171bb0c..2ccb2b6be 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -149,7 +149,7 @@ public class EnumUtils {
Collections.addAll(condensed, values);
final long[] result = new long[(enumClass.getEnumConstants().length - 1) / Long.SIZE + 1];
for (final E value : condensed) {
- result[value.ordinal() / Long.SIZE] |= 1L << (value.ordinal() % Long.SIZE);
+ result[value.ordinal() / Long.SIZE] |= 1L << value.ordinal() % Long.SIZE;
}
ArrayUtils.reverse(result);
return result;
@@ -178,7 +178,7 @@ public class EnumUtils {
values.forEach(constant -> condensed.add(Objects.requireNonNull(constant, NULL_ELEMENTS_NOT_PERMITTED)));
final long[] result = new long[(enumClass.getEnumConstants().length - 1) / Long.SIZE + 1];
for (final E value : condensed) {
- result[value.ordinal() / Long.SIZE] |= 1L << (value.ordinal() % Long.SIZE);
+ result[value.ordinal() / Long.SIZE] |= 1L << value.ordinal() % Long.SIZE;
}
ArrayUtils.reverse(result);
return result;
@@ -412,7 +412,7 @@ public class EnumUtils {
ArrayUtils.reverse(lvalues);
for (final E constant : enumClass.getEnumConstants()) {
final int block = constant.ordinal() / Long.SIZE;
- if (block < lvalues.length && (lvalues[block] & 1L << (constant.ordinal() % Long.SIZE)) != 0) {
+ if (block < lvalues.length && (lvalues[block] & 1L << constant.ordinal() % Long.SIZE) != 0) {
results.add(constant);
}
}
diff --git a/src/main/java/org/apache/commons/lang3/RandomUtils.java b/src/main/java/org/apache/commons/lang3/RandomUtils.java
index 044c2c71f..66379c358 100644
--- a/src/main/java/org/apache/commons/lang3/RandomUtils.java
+++ b/src/main/java/org/apache/commons/lang3/RandomUtils.java
@@ -94,7 +94,7 @@ public class RandomUtils {
return startInclusive;
}
- return startInclusive + ((endExclusive - startInclusive) * random().nextDouble());
+ return startInclusive + (endExclusive - startInclusive) * random().nextDouble();
}
/**
@@ -129,7 +129,7 @@ public class RandomUtils {
return startInclusive;
}
- return startInclusive + ((endExclusive - startInclusive) * random().nextFloat());
+ return startInclusive + (endExclusive - startInclusive) * random().nextFloat();
}
/**
@@ -193,7 +193,7 @@ public class RandomUtils {
do {
bits = random().nextLong() >>> 1;
val = bits % n;
- } while (bits - val + (n - 1) < 0);
+ } while (bits - val + n - 1 < 0);
return val;
}
diff --git a/src/main/java/org/apache/commons/lang3/builder/Reflection.java b/src/main/java/org/apache/commons/lang3/builder/Reflection.java
index 84208314c..fe7ade599 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Reflection.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Reflection.java
@@ -36,7 +36,7 @@ final class Reflection {
static Object getUnchecked(final Field field, final Object obj) {
try {
return Objects.requireNonNull(field, "field").get(obj);
- } catch (IllegalAccessException e) {
+ } catch (final IllegalAccessException e) {
throw new IllegalArgumentException(e);
}
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
index c02960f90..fb06a52b9 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java
@@ -151,7 +151,7 @@ public class AtomicInitializer<T> extends AbstractConcurrentInitializer<T, Concu
* {@inheritDoc}
*/
@Override
- protected ConcurrentException getTypedException(Exception e) {
+ protected ConcurrentException getTypedException(final Exception e) {
return new ConcurrentException(e);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
index aa715bcfd..165d5d0da 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java
@@ -139,7 +139,7 @@ public class AtomicSafeInitializer<T> extends AbstractConcurrentInitializer<T, C
* {@inheritDoc}
*/
@Override
- protected ConcurrentException getTypedException(Exception e) {
+ protected ConcurrentException getTypedException(final Exception e) {
return new ConcurrentException(e);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
index 4570be403..32a02b01d 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java
@@ -318,7 +318,7 @@ public class BackgroundInitializer<T> extends AbstractConcurrentInitializer<T, E
* {@inheritDoc}
*/
@Override
- protected Exception getTypedException(Exception e) {
+ protected Exception getTypedException(final Exception e) {
//This Exception object will be used for type comparison in AbstractConcurrentInitializer.initialize but not thrown
return new Exception(e);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
index b06789664..7ab80c053 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java
@@ -111,7 +111,7 @@ public class CallableBackgroundInitializer<T> extends BackgroundInitializer<T> {
* {@inheritDoc}
*/
@Override
- protected Exception getTypedException(Exception e) {
+ protected Exception getTypedException(final Exception e) {
//This Exception object will be used for type comparison in AbstractConcurrentInitializer.initialize but not thrown
return new Exception(e);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
index 8570a104b..c638ceb69 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/LazyInitializer.java
@@ -152,7 +152,7 @@ public class LazyInitializer<T> extends AbstractConcurrentInitializer<T, Concurr
* {@inheritDoc}
*/
@Override
- protected ConcurrentException getTypedException(Exception e) {
+ protected ConcurrentException getTypedException(final Exception e) {
return new ConcurrentException(e);
}
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
index 532afd6e8..b4bf41740 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
@@ -288,10 +288,10 @@ public class MultiBackgroundInitializer
public void close() throws ConcurrentException {
ConcurrentException exception = null;
- for (BackgroundInitializer<?> child : childInitializers.values()) {
+ for (final BackgroundInitializer<?> child : childInitializers.values()) {
try {
child.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
if (exception == null) {
exception = new ConcurrentException();
}
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
index cec05aecd..cb60d4bc7 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
@@ -263,7 +263,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
*/
@Override
public int hashCode() {
- return (int) (value ^ (value >>> 32));
+ return (int) (value ^ value >>> 32);
}
/**
diff --git a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
index 25d76c005..bc0d9072d 100644
--- a/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
+++ b/src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java
@@ -130,10 +130,10 @@ public class UnicodeEscaper extends CodePointTranslator {
out.write(toUtf16Escape(codePoint));
} else {
out.write("\\u");
- out.write(HEX_DIGITS[(codePoint >> 12) & 15]);
- out.write(HEX_DIGITS[(codePoint >> 8) & 15]);
- out.write(HEX_DIGITS[(codePoint >> 4) & 15]);
- out.write(HEX_DIGITS[(codePoint) & 15]);
+ out.write(HEX_DIGITS[codePoint >> 12 & 15]);
+ out.write(HEX_DIGITS[codePoint >> 8 & 15]);
+ out.write(HEX_DIGITS[codePoint >> 4 & 15]);
+ out.write(HEX_DIGITS[codePoint & 15]);
}
return true;
}
diff --git a/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java b/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
index 6900deda4..81e3b9edc 100644
--- a/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
+++ b/src/main/java/org/apache/commons/lang3/time/GmtTimeZone.java
@@ -35,7 +35,7 @@ final class GmtTimeZone extends TimeZone {
static final long serialVersionUID = 1L;
private static StringBuilder twoDigits(final StringBuilder sb, final int n) {
- return sb.append((char) ('0' + (n / 10))).append((char) ('0' + (n % 10)));
+ return sb.append((char) ('0' + n / 10)).append((char) ('0' + n % 10));
}
private final int offset;
@@ -48,7 +48,7 @@ final class GmtTimeZone extends TimeZone {
if (minutes >= MINUTES_PER_HOUR) {
throw new IllegalArgumentException(minutes + " minutes out of range");
}
- final int milliseconds = (minutes + (hours * MINUTES_PER_HOUR)) * MILLISECONDS_PER_MINUTE;
+ final int milliseconds = (minutes + hours * MINUTES_PER_HOUR) * MILLISECONDS_PER_MINUTE;
offset = negate ? -milliseconds : milliseconds;
// @formatter:off
zoneId = twoDigits(twoDigits(new StringBuilder(9)
diff --git a/src/main/java/org/apache/commons/lang3/time/StopWatch.java b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
index d71030e34..c4587c488 100644
--- a/src/main/java/org/apache/commons/lang3/time/StopWatch.java
+++ b/src/main/java/org/apache/commons/lang3/time/StopWatch.java
@@ -434,7 +434,7 @@ public class StopWatch {
* @param nanos nanoseconds to convert.
* @return milliseconds conversion result.
*/
- private long nanosToMillis(long nanos) {
+ private long nanosToMillis(final long nanos) {
return nanos / NANO_2_MILLIS;
}
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
index bfdbcd1d9..9cbe26c4b 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveTest.java
@@ -550,16 +550,16 @@ public class ArrayUtilsRemoveTest extends AbstractLangTest {
double[] array;
array = ArrayUtils.removeElement(null, (double) 1);
assertNull(array);
- array = ArrayUtils.removeElement(ArrayUtils.EMPTY_DOUBLE_ARRAY, (double) 1);
+ array = ArrayUtils.removeElement(ArrayUtils.EMPTY_DOUBLE_ARRAY, 1);
assertArrayEquals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array);
assertEquals(Double.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new double[] {1}, (double) 1);
+ array = ArrayUtils.removeElement(new double[] {1}, 1);
assertArrayEquals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array);
assertEquals(Double.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new double[] {1, 2}, (double) 1);
+ array = ArrayUtils.removeElement(new double[] {1, 2}, 1);
assertArrayEquals(new double[]{2}, array);
assertEquals(Double.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new double[] {1, 2, 1}, (double) 1);
+ array = ArrayUtils.removeElement(new double[] {1, 2, 1}, 1);
assertArrayEquals(new double[]{2, 1}, array);
assertEquals(Double.TYPE, array.getClass().getComponentType());
}
@@ -568,18 +568,18 @@ public class ArrayUtilsRemoveTest extends AbstractLangTest {
@SuppressWarnings("cast")
public void testRemoveElementFloatArray() {
float[] array;
- array = ArrayUtils.removeElement((float[]) null, (float) 1);
+ array = ArrayUtils.removeElement((float[]) null, 1);
assertNull(array);
- array = ArrayUtils.removeElement(ArrayUtils.EMPTY_FLOAT_ARRAY, (float) 1);
+ array = ArrayUtils.removeElement(ArrayUtils.EMPTY_FLOAT_ARRAY, 1);
assertArrayEquals(ArrayUtils.EMPTY_FLOAT_ARRAY, array);
assertEquals(Float.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new float[] {1}, (float) 1);
+ array = ArrayUtils.removeElement(new float[] {1}, 1);
assertArrayEquals(ArrayUtils.EMPTY_FLOAT_ARRAY, array);
assertEquals(Float.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new float[] {1, 2}, (float) 1);
+ array = ArrayUtils.removeElement(new float[] {1, 2}, 1);
assertArrayEquals(new float[]{2}, array);
assertEquals(Float.TYPE, array.getClass().getComponentType());
- array = ArrayUtils.removeElement(new float[] {1, 2, 1}, (float) 1);
+ array = ArrayUtils.removeElement(new float[] {1, 2, 1}, 1);
assertArrayEquals(new float[]{2, 1}, array);
assertEquals(Float.TYPE, array.getClass().getComponentType());
}
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index 008b956b1..330ce9ea4 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
@SuppressWarnings("deprecation") // deliberate use of deprecated code
public class ArrayUtilsTest extends AbstractLangTest {
- private final class TestClass {
+ private static final class TestClass {
// empty
}
@@ -284,13 +284,13 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testContainsDouble() {
double[] array = null;
- assertFalse(ArrayUtils.contains(array, (double) 1));
+ assertFalse(ArrayUtils.contains(array, 1));
array = new double[]{0, 1, 2, 3, 0};
- assertTrue(ArrayUtils.contains(array, (double) 0));
- assertTrue(ArrayUtils.contains(array, (double) 1));
- assertTrue(ArrayUtils.contains(array, (double) 2));
- assertTrue(ArrayUtils.contains(array, (double) 3));
- assertFalse(ArrayUtils.contains(array, (double) 99));
+ assertTrue(ArrayUtils.contains(array, 0));
+ assertTrue(ArrayUtils.contains(array, 1));
+ assertTrue(ArrayUtils.contains(array, 2));
+ assertTrue(ArrayUtils.contains(array, 3));
+ assertFalse(ArrayUtils.contains(array, 99));
}
@Test
@@ -305,7 +305,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testContainsDoubleTolerance() {
double[] array = null;
- assertFalse(ArrayUtils.contains(array, (double) 1, (double) 0));
+ assertFalse(ArrayUtils.contains(array, 1, 0));
array = new double[]{0, 1, 2, 3, 0};
assertFalse(ArrayUtils.contains(array, 4.0, 0.33));
assertFalse(ArrayUtils.contains(array, 2.5, 0.49));
@@ -317,13 +317,13 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testContainsFloat() {
float[] array = null;
- assertFalse(ArrayUtils.contains(array, (float) 1));
+ assertFalse(ArrayUtils.contains(array, 1));
array = new float[]{0, 1, 2, 3, 0};
- assertTrue(ArrayUtils.contains(array, (float) 0));
- assertTrue(ArrayUtils.contains(array, (float) 1));
- assertTrue(ArrayUtils.contains(array, (float) 2));
- assertTrue(ArrayUtils.contains(array, (float) 3));
- assertFalse(ArrayUtils.contains(array, (float) 99));
+ assertTrue(ArrayUtils.contains(array, 0));
+ assertTrue(ArrayUtils.contains(array, 1));
+ assertTrue(ArrayUtils.contains(array, 2));
+ assertTrue(ArrayUtils.contains(array, 3));
+ assertFalse(ArrayUtils.contains(array, 99));
}
@Test
@@ -716,7 +716,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
array = new double[]{0, 1, 2, 3, 0};
testSet.set(0);
testSet.set(4);
- assertEquals(testSet, ArrayUtils.indexesOf(array, (double) 0, 0.3));
+ assertEquals(testSet, ArrayUtils.indexesOf(array, 0, 0.3));
testSet.clear();
testSet.set(3);
assertEquals(testSet, ArrayUtils.indexesOf(array, 4.15, 2.0));
@@ -755,14 +755,14 @@ public class ArrayUtilsTest extends AbstractLangTest {
double[] array = null;
final BitSet emptySet = new BitSet();
final BitSet testSet = new BitSet();
- assertEquals(emptySet, ArrayUtils.indexesOf(array, (double) 0, 0, (double) 0));
+ assertEquals(emptySet, ArrayUtils.indexesOf(array, 0, 0, 0));
array = new double[0];
- assertEquals(emptySet, ArrayUtils.indexesOf(array, (double) 0, 0, (double) 0));
+ assertEquals(emptySet, ArrayUtils.indexesOf(array, 0, 0, 0));
array = new double[]{0, 1, 2, 3, 0};
testSet.set(4);
- assertEquals(testSet, ArrayUtils.indexesOf(array, (double) 0, 1, 0.3));
+ assertEquals(testSet, ArrayUtils.indexesOf(array, 0, 1, 0.3));
testSet.set(0);
- assertEquals(testSet, ArrayUtils.indexesOf(array, (double) 0, 0, 0.3));
+ assertEquals(testSet, ArrayUtils.indexesOf(array, 0, 0, 0.3));
testSet.clear();
testSet.set(2);
assertEquals(testSet, ArrayUtils.indexesOf(array, 2, 0, 0.35));
@@ -1070,16 +1070,16 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testIndexOfDouble() {
double[] array = null;
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0));
array = new double[0];
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(0, ArrayUtils.indexOf(array, (double) 0));
- assertEquals(1, ArrayUtils.indexOf(array, (double) 1));
- assertEquals(2, ArrayUtils.indexOf(array, (double) 2));
- assertEquals(3, ArrayUtils.indexOf(array, (double) 3));
- assertEquals(3, ArrayUtils.indexOf(array, (double) 3, -1));
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 99));
+ assertEquals(0, ArrayUtils.indexOf(array, 0));
+ assertEquals(1, ArrayUtils.indexOf(array, 1));
+ assertEquals(2, ArrayUtils.indexOf(array, 2));
+ assertEquals(3, ArrayUtils.indexOf(array, 3));
+ assertEquals(3, ArrayUtils.indexOf(array, 3, -1));
+ assertEquals(-1, ArrayUtils.indexOf(array, 99));
}
@Test
@@ -1099,7 +1099,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
array = new double[0];
assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, (double) 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(0, ArrayUtils.indexOf(array, (double) 0, 0.3));
+ assertEquals(0, ArrayUtils.indexOf(array, 0, 0.3));
assertEquals(2, ArrayUtils.indexOf(array, 2.2, 0.35));
assertEquals(3, ArrayUtils.indexOf(array, 4.15, 2.0));
assertEquals(1, ArrayUtils.indexOf(array, 1.00001324, 0.0001));
@@ -1109,29 +1109,29 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testIndexOfDoubleWithStartIndex() {
double[] array = null;
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2));
array = new double[0];
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.indexOf(array, (double) 0, 2));
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 1, 2));
- assertEquals(2, ArrayUtils.indexOf(array, (double) 2, 2));
- assertEquals(3, ArrayUtils.indexOf(array, (double) 3, 2));
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 99, 0));
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 6));
+ assertEquals(4, ArrayUtils.indexOf(array, 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 1, 2));
+ assertEquals(2, ArrayUtils.indexOf(array, 2, 2));
+ assertEquals(3, ArrayUtils.indexOf(array, 3, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 99, 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 6));
}
@SuppressWarnings("cast")
@Test
public void testIndexOfDoubleWithStartIndexTolerance() {
double[] array = null;
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2, (double) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2, 0));
array = new double[0];
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 2, (double) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2, 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(-1, ArrayUtils.indexOf(array, (double) 0, 99, 0.3));
- assertEquals(0, ArrayUtils.indexOf(array, (double) 0, 0, 0.3));
- assertEquals(4, ArrayUtils.indexOf(array, (double) 0, 3, 0.3));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 99, 0.3));
+ assertEquals(0, ArrayUtils.indexOf(array, 0, 0, 0.3));
+ assertEquals(4, ArrayUtils.indexOf(array, 0, 3, 0.3));
assertEquals(2, ArrayUtils.indexOf(array, 2.2, 0, 0.35));
assertEquals(3, ArrayUtils.indexOf(array, 4.15, 0, 2.0));
assertEquals(1, ArrayUtils.indexOf(array, 1.00001324, 0, 0.0001));
@@ -1143,15 +1143,15 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testIndexOfFloat() {
float[] array = null;
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0));
array = new float[0];
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0));
array = new float[]{0, 1, 2, 3, 0};
- assertEquals(0, ArrayUtils.indexOf(array, (float) 0));
- assertEquals(1, ArrayUtils.indexOf(array, (float) 1));
- assertEquals(2, ArrayUtils.indexOf(array, (float) 2));
- assertEquals(3, ArrayUtils.indexOf(array, (float) 3));
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 99));
+ assertEquals(0, ArrayUtils.indexOf(array, 0));
+ assertEquals(1, ArrayUtils.indexOf(array, 1));
+ assertEquals(2, ArrayUtils.indexOf(array, 2));
+ assertEquals(3, ArrayUtils.indexOf(array, 3));
+ assertEquals(-1, ArrayUtils.indexOf(array, 99));
}
@Test
@@ -1166,17 +1166,17 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testIndexOfFloatWithStartIndex() {
float[] array = null;
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2));
array = new float[0];
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 2));
array = new float[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.indexOf(array, (float) 0, 2));
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 1, 2));
- assertEquals(2, ArrayUtils.indexOf(array, (float) 2, 2));
- assertEquals(3, ArrayUtils.indexOf(array, (float) 3, 2));
- assertEquals(3, ArrayUtils.indexOf(array, (float) 3, -1));
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 99, 0));
- assertEquals(-1, ArrayUtils.indexOf(array, (float) 0, 6));
+ assertEquals(4, ArrayUtils.indexOf(array, 0, 2));
+ assertEquals(-1, ArrayUtils.indexOf(array, 1, 2));
+ assertEquals(2, ArrayUtils.indexOf(array, 2, 2));
+ assertEquals(3, ArrayUtils.indexOf(array, 3, 2));
+ assertEquals(3, ArrayUtils.indexOf(array, 3, -1));
+ assertEquals(-1, ArrayUtils.indexOf(array, 99, 0));
+ assertEquals(-1, ArrayUtils.indexOf(array, 0, 6));
}
@Test
@@ -1762,15 +1762,15 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testLastIndexOfDouble() {
double[] array = null;
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0));
array = new double[0];
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0));
- assertEquals(1, ArrayUtils.lastIndexOf(array, (double) 1));
- assertEquals(2, ArrayUtils.lastIndexOf(array, (double) 2));
- assertEquals(3, ArrayUtils.lastIndexOf(array, (double) 3));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 99));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0));
+ assertEquals(1, ArrayUtils.lastIndexOf(array, 1));
+ assertEquals(2, ArrayUtils.lastIndexOf(array, 2));
+ assertEquals(3, ArrayUtils.lastIndexOf(array, 3));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 99));
}
@SuppressWarnings("cast")
@@ -1781,7 +1781,7 @@ public class ArrayUtilsTest extends AbstractLangTest {
array = new double[0];
assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, (double) 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 0.3));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0, 0.3));
assertEquals(2, ArrayUtils.lastIndexOf(array, 2.2, 0.35));
assertEquals(3, ArrayUtils.lastIndexOf(array, 4.15, 2.0));
assertEquals(1, ArrayUtils.lastIndexOf(array, 1.00001324, 0.0001));
@@ -1791,31 +1791,31 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testLastIndexOfDoubleWithStartIndex() {
double[] array = null;
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2));
array = new double[0];
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(0, ArrayUtils.lastIndexOf(array, (double) 0, 2));
- assertEquals(1, ArrayUtils.lastIndexOf(array, (double) 1, 2));
- assertEquals(2, ArrayUtils.lastIndexOf(array, (double) 2, 2));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 3, 2));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 3, -1));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 99));
- assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 88));
+ assertEquals(0, ArrayUtils.lastIndexOf(array, 0, 2));
+ assertEquals(1, ArrayUtils.lastIndexOf(array, 1, 2));
+ assertEquals(2, ArrayUtils.lastIndexOf(array, 2, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 3, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 3, -1));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 99));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0, 88));
}
@SuppressWarnings("cast")
@Test
public void testLastIndexOfDoubleWithStartIndexTolerance() {
double[] array = null;
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, 2, (double) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2, 0));
array = new double[0];
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 0, 2, (double) 0));
- array = new double[]{(double) 3};
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (double) 1, 0, (double) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2, 0));
+ array = new double[]{3};
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 1, 0, 0));
array = new double[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.lastIndexOf(array, (double) 0, 99, 0.3));
- assertEquals(0, ArrayUtils.lastIndexOf(array, (double) 0, 3, 0.3));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0, 99, 0.3));
+ assertEquals(0, ArrayUtils.lastIndexOf(array, 0, 3, 0.3));
assertEquals(2, ArrayUtils.lastIndexOf(array, 2.2, 3, 0.35));
assertEquals(3, ArrayUtils.lastIndexOf(array, 4.15, array.length, 2.0));
assertEquals(1, ArrayUtils.lastIndexOf(array, 1.00001324, array.length, 0.0001));
@@ -1826,32 +1826,32 @@ public class ArrayUtilsTest extends AbstractLangTest {
@Test
public void testLastIndexOfFloat() {
float[] array = null;
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0));
array = new float[0];
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 0));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0));
array = new float[]{0, 1, 2, 3, 0};
- assertEquals(4, ArrayUtils.lastIndexOf(array, (float) 0));
- assertEquals(1, ArrayUtils.lastIndexOf(array, (float) 1));
- assertEquals(2, ArrayUtils.lastIndexOf(array, (float) 2));
- assertEquals(3, ArrayUtils.lastIndexOf(array, (float) 3));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 99));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0));
+ assertEquals(1, ArrayUtils.lastIndexOf(array, 1));
+ assertEquals(2, ArrayUtils.lastIndexOf(array, 2));
+ assertEquals(3, ArrayUtils.lastIndexOf(array, 3));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 99));
}
@SuppressWarnings("cast")
@Test
public void testLastIndexOfFloatWithStartIndex() {
float[] array = null;
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 0, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2));
array = new float[0];
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 0, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 0, 2));
array = new float[]{0, 1, 2, 3, 0};
- assertEquals(0, ArrayUtils.lastIndexOf(array, (float) 0, 2));
- assertEquals(1, ArrayUtils.lastIndexOf(array, (float) 1, 2));
- assertEquals(2, ArrayUtils.lastIndexOf(array, (float) 2, 2));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 3, 2));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 3, -1));
- assertEquals(-1, ArrayUtils.lastIndexOf(array, (float) 99));
- assertEquals(4, ArrayUtils.lastIndexOf(array, (float) 0, 88));
+ assertEquals(0, ArrayUtils.lastIndexOf(array, 0, 2));
+ assertEquals(1, ArrayUtils.lastIndexOf(array, 1, 2));
+ assertEquals(2, ArrayUtils.lastIndexOf(array, 2, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 3, 2));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 3, -1));
+ assertEquals(-1, ArrayUtils.lastIndexOf(array, 99));
+ assertEquals(4, ArrayUtils.lastIndexOf(array, 0, 88));
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/CharSetTest.java b/src/test/java/org/apache/commons/lang3/CharSetTest.java
index 10427dba0..47fbda025 100644
--- a/src/test/java/org/apache/commons/lang3/CharSetTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSetTest.java
@@ -401,9 +401,9 @@ public class CharSetTest extends AbstractLangTest {
@Test
public void testGetInstance_Stringarray() {
assertNull(CharSet.getInstance((String[]) null));
- assertEquals("[]", CharSet.getInstance(new String[0]).toString());
+ assertEquals("[]", CharSet.getInstance().toString());
assertEquals("[]", CharSet.getInstance(new String[] {null}).toString());
- assertEquals("[a-e]", CharSet.getInstance(new String[] {"a-e"}).toString());
+ assertEquals("[a-e]", CharSet.getInstance("a-e").toString());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
index aec0351f5..dea0d0042 100644
--- a/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharUtilsTest.java
@@ -80,7 +80,7 @@ public class CharUtilsTest extends AbstractLangTest {
assertFalse(CharUtils.isAsciiAlpha(CHAR_COPY));
for (int i = 0; i < 196; i++) {
- if ((i >= 'A' && i <= 'Z') || (i >= 'a' && i <= 'z')) {
+ if (i >= 'A' && i <= 'Z' || i >= 'a' && i <= 'z') {
assertTrue(CharUtils.isAsciiAlpha((char) i));
} else {
assertFalse(CharUtils.isAsciiAlpha((char) i));
@@ -116,7 +116,7 @@ public class CharUtilsTest extends AbstractLangTest {
assertFalse(CharUtils.isAsciiAlphanumeric(CHAR_COPY));
for (int i = 0; i < 196; i++) {
- if ((i >= 'A' && i <= 'Z') || (i >= 'a' && i <= 'z') || (i >= '0' && i <= '9')) {
+ if (i >= 'A' && i <= 'Z' || i >= 'a' && i <= 'z' || i >= '0' && i <= '9') {
assertTrue(CharUtils.isAsciiAlphanumeric((char) i));
} else {
assertFalse(CharUtils.isAsciiAlphanumeric((char) i));
diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
index c77702b01..e1c5ac93f 100644
--- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java
@@ -86,7 +86,7 @@ public class ClassUtilsTest extends AbstractLangTest {
}
private static final class Inner {
- private final class DeeplyNested {
+ private static final class DeeplyNested {
// empty
}
}
diff --git a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
index c465072e8..071a8aedb 100644
--- a/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/EnumUtilsTest.java
@@ -62,9 +62,9 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.generateBitVector(Traffic.class, EnumSet.of(Traffic.RED, Traffic.AMBER, Traffic.GREEN)));
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertEquals((1L << 31), EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A31)));
- assertEquals((1L << 32), EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A32)));
- assertEquals((1L << 63), EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A63)));
+ assertEquals(1L << 31, EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A31)));
+ assertEquals(1L << 32, EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A32)));
+ assertEquals(1L << 63, EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A63)));
assertEquals(Long.MIN_VALUE, EnumUtils.generateBitVector(Enum64.class, EnumSet.of(Enum64.A63)));
}
@@ -145,9 +145,9 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.generateBitVector(Traffic.class, Traffic.RED, Traffic.AMBER, Traffic.GREEN, Traffic.GREEN));
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertEquals((1L << 31), EnumUtils.generateBitVector(Enum64.class, Enum64.A31));
- assertEquals((1L << 32), EnumUtils.generateBitVector(Enum64.class, Enum64.A32));
- assertEquals((1L << 63), EnumUtils.generateBitVector(Enum64.class, Enum64.A63));
+ assertEquals(1L << 31, EnumUtils.generateBitVector(Enum64.class, Enum64.A31));
+ assertEquals(1L << 32, EnumUtils.generateBitVector(Enum64.class, Enum64.A32));
+ assertEquals(1L << 63, EnumUtils.generateBitVector(Enum64.class, Enum64.A63));
assertEquals(Long.MIN_VALUE, EnumUtils.generateBitVector(Enum64.class, Enum64.A63));
}
@@ -164,15 +164,15 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.AMBER, Traffic.GREEN)), 7L);
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A31)), (1L << 31));
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A32)), (1L << 32));
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), (1L << 63));
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A31)), 1L << 31);
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A32)), 1L << 32);
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), 1L << 63);
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), Long.MIN_VALUE);
// More than 64 values Enum
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.M2)), 1L, 0L);
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.L2, TooMany.M2)), 1L,
- (1L << 63));
+ 1L << 63);
}
@SuppressWarnings("unchecked")
@@ -240,14 +240,14 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER, Traffic.GREEN, Traffic.GREEN), 7L);
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A31), (1L << 31));
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A32), (1L << 32));
- assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), (1L << 63));
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A31), 1L << 31);
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A32), 1L << 32);
+ assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), 1L << 63);
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), Long.MIN_VALUE);
// More than 64 values Enum
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.M2), 1L, 0L);
- assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.L2, TooMany.M2), 1L, (1L << 63));
+ assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.L2, TooMany.M2), 1L, 1L << 63);
}
@@ -473,9 +473,9 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.processBitVector(Traffic.class, 7L));
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertEquals(EnumSet.of(Enum64.A31), EnumUtils.processBitVector(Enum64.class, (1L << 31)));
- assertEquals(EnumSet.of(Enum64.A32), EnumUtils.processBitVector(Enum64.class, (1L << 32)));
- assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVector(Enum64.class, (1L << 63)));
+ assertEquals(EnumSet.of(Enum64.A31), EnumUtils.processBitVector(Enum64.class, 1L << 31));
+ assertEquals(EnumSet.of(Enum64.A32), EnumUtils.processBitVector(Enum64.class, 1L << 32));
+ assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVector(Enum64.class, 1L << 63));
assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVector(Enum64.class, Long.MIN_VALUE));
}
@@ -524,9 +524,9 @@ public class EnumUtilsTest extends AbstractLangTest {
EnumUtils.processBitVectors(Traffic.class, 666L, 7L));
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
- assertEquals(EnumSet.of(Enum64.A31), EnumUtils.processBitVectors(Enum64.class, (1L << 31)));
- assertEquals(EnumSet.of(Enum64.A32), EnumUtils.processBitVectors(Enum64.class, (1L << 32)));
- assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVectors(Enum64.class, (1L << 63)));
+ assertEquals(EnumSet.of(Enum64.A31), EnumUtils.processBitVectors(Enum64.class, 1L << 31));
+ assertEquals(EnumSet.of(Enum64.A32), EnumUtils.processBitVectors(Enum64.class, 1L << 32));
+ assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVectors(Enum64.class, 1L << 63));
assertEquals(EnumSet.of(Enum64.A63), EnumUtils.processBitVectors(Enum64.class, Long.MIN_VALUE));
}
diff --git a/src/test/java/org/apache/commons/lang3/FunctionsTest.java b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
index 9f767afda..138ad4298 100644
--- a/src/test/java/org/apache/commons/lang3/FunctionsTest.java
+++ b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
@@ -227,42 +227,42 @@ public class FunctionsTest extends AbstractLangTest {
public void testDouble(final double i) throws Throwable {
test(throwable);
- acceptedPrimitiveObject1 = (P) ((Double) i);
+ acceptedPrimitiveObject1 = (P) (Double) i;
}
public double testDoubleDouble(final double i, final double j) throws Throwable {
test(throwable);
- acceptedPrimitiveObject1 = (P) ((Double) i);
- acceptedPrimitiveObject2 = (P) ((Double) j);
+ acceptedPrimitiveObject1 = (P) (Double) i;
+ acceptedPrimitiveObject2 = (P) (Double) j;
return 3d;
}
public void testInt(final int i) throws Throwable {
test(throwable);
- acceptedPrimitiveObject1 = (P) ((Integer) i);
+ acceptedPrimitiveObject1 = (P) (Integer) i;
}
public void testLong(final long i) throws Throwable {
test(throwable);
- acceptedPrimitiveObject1 = (P) ((Long) i);
+ acceptedPrimitiveObject1 = (P) (Long) i;
}
public void testObjDouble(final T object, final double i) throws Throwable {
test(throwable);
acceptedObject = object;
- acceptedPrimitiveObject1 = (P) ((Double) i);
+ acceptedPrimitiveObject1 = (P) (Double) i;
}
public void testObjInt(final T object, final int i) throws Throwable {
test(throwable);
acceptedObject = object;
- acceptedPrimitiveObject1 = (P) ((Integer) i);
+ acceptedPrimitiveObject1 = (P) (Integer) i;
}
public void testObjLong(final T object, final long i) throws Throwable {
test(throwable);
acceptedObject = object;
- acceptedPrimitiveObject1 = (P) ((Long) i);
+ acceptedPrimitiveObject1 = (P) (Long) i;
}
}
diff --git a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
index fc08d8d8a..07acb1e9b 100644
--- a/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
+++ b/src/test/java/org/apache/commons/lang3/JavaVersionTest.java
@@ -63,7 +63,7 @@ public class JavaVersionTest extends AbstractLangTest {
assertEquals(JAVA_1_7, get("1.7"), "1.7 failed");
assertEquals(JAVA_1_8, get("1.8"), "1.8 failed");
- int lastSupportedVersion = Integer.parseInt(JavaVersion.values()[JavaVersion.values().length - 2].toString());
+ final int lastSupportedVersion = Integer.parseInt(JavaVersion.values()[JavaVersion.values().length - 2].toString());
for (int i = 9; i <= lastSupportedVersion; i++) {
assertEquals(JavaVersion.class.getField("JAVA_" + i).get(null), get("" + i), i + " failed");
}
diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
index 3ffc4288a..c1f7500c3 100644
--- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
@@ -31,7 +31,6 @@ import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -71,11 +70,9 @@ public class LocaleUtilsTest extends AbstractLangTest {
assertSame(list, list2);
//search through languages
for (final String country : countries) {
- final Iterator<Locale> iterator = list.iterator();
boolean found = false;
// see if it was returned by the set
- while (iterator.hasNext()) {
- final Locale locale = iterator.next();
+ for (Locale locale : list) {
// should have an en empty variant
assertTrue(StringUtils.isEmpty(locale.getVariant()));
assertEquals(language, locale.getLanguage());
@@ -105,11 +102,9 @@ public class LocaleUtilsTest extends AbstractLangTest {
assertSame(list, list2);
//search through languages
for (final String language : languages) {
- final Iterator<Locale> iterator = list.iterator();
boolean found = false;
// see if it was returned by the set
- while (iterator.hasNext()) {
- final Locale locale = iterator.next();
+ for (Locale locale : list) {
// should have an en empty variant
assertTrue(StringUtils.isEmpty(locale.getVariant()));
assertEquals(country, locale.getCountry());
diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
index bc080cacb..e39df47f3 100644
--- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java
@@ -563,7 +563,7 @@ public class ObjectUtilsTest extends AbstractLangTest {
assertThrows(
NullPointerException.class,
- () -> ObjectUtils.identityToString((Appendable) (new StringBuilder()), null));
+ () -> ObjectUtils.identityToString((Appendable) new StringBuilder(), null));
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
index bc6a33287..0fb479fa6 100644
--- a/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/RandomStringUtilsTest.java
@@ -52,7 +52,7 @@ public class RandomStringUtilsTest extends AbstractLangTest {
private double chiSquare(final int[] expected, final int[] observed) {
double sumSq = 0.0d;
for (int i = 0; i < observed.length; i++) {
- double dev = observed[i] - expected[i];
+ final double dev = observed[i] - expected[i];
sumSq += dev * dev / expected[i];
}
return sumSq;
@@ -416,7 +416,7 @@ public class RandomStringUtilsTest extends AbstractLangTest {
r1 = RandomStringUtils.randomAscii(50);
assertEquals(50, r1.length(), "randomAscii(50) length");
for (int i = 0; i < r1.length(); i++) {
- assertThat("char >= 32 && <= 127", ((int) r1.charAt(i)), allOf(greaterThanOrEqualTo(32), lessThanOrEqualTo(127)));
+ assertThat("char >= 32 && <= 127", (int) r1.charAt(i), allOf(greaterThanOrEqualTo(32), lessThanOrEqualTo(127)));
}
r2 = RandomStringUtils.randomAscii(50);
assertFalse(r1.equals(r2), "!r1.equals(r2)");
@@ -513,7 +513,7 @@ public class RandomStringUtilsTest extends AbstractLangTest {
final int[] counts = {0, 0, 0};
final int[] expected = {200, 200, 200};
for (int i = 0; i < 100; i++) {
- String gen = RandomStringUtils.random(6, chars);
+ final String gen = RandomStringUtils.random(6, chars);
for (int j = 0; j < 6; j++) {
switch (gen.charAt(j)) {
case 'a': {
diff --git a/src/test/java/org/apache/commons/lang3/RangeTest.java b/src/test/java/org/apache/commons/lang3/RangeTest.java
index 619688525..3d269b421 100644
--- a/src/test/java/org/apache/commons/lang3/RangeTest.java
+++ b/src/test/java/org/apache/commons/lang3/RangeTest.java
@@ -117,16 +117,16 @@ public class RangeTest extends AbstractLangTest {
final DerivedComparableA derivedComparableA = new DerivedComparableA();
final DerivedComparableB derivedComparableB = new DerivedComparableB();
- Range<AbstractComparable> mixed = Range.between(derivedComparableA, derivedComparableB, null);
+ final Range<AbstractComparable> mixed = Range.between(derivedComparableA, derivedComparableB, null);
assertTrue(mixed.contains(derivedComparableA));
- Range<AbstractComparable> same = Range.between(derivedComparableA, derivedComparableA, null);
+ final Range<AbstractComparable> same = Range.between(derivedComparableA, derivedComparableA, null);
assertTrue(same.contains(derivedComparableA));
- Range<DerivedComparableA> rangeA = Range.between(derivedComparableA, derivedComparableA, null);
+ final Range<DerivedComparableA> rangeA = Range.between(derivedComparableA, derivedComparableA, null);
assertTrue(rangeA.contains(derivedComparableA));
- Range<DerivedComparableB> rangeB = Range.is(derivedComparableB, null);
+ final Range<DerivedComparableB> rangeB = Range.is(derivedComparableB, null);
assertTrue(rangeB.contains(derivedComparableB));
}
diff --git a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
index faa6544cf..8d9ce0d9d 100644
--- a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
@@ -63,7 +63,7 @@ public class StringEscapeUtilsTest extends AbstractLangTest {
private void assertEscapeJava(String message, final String expected, final String original) throws IOException {
final String converted = StringEscapeUtils.escapeJava(original);
- message = "escapeJava(String) failed" + (message == null ? "" : (": " + message));
+ message = "escapeJava(String) failed" + (message == null ? "" : ": " + message);
assertEquals(expected, converted, message);
final StringWriter writer = new StringWriter();
@@ -81,7 +81,7 @@ public class StringEscapeUtilsTest extends AbstractLangTest {
assertEquals(expected, actual,
"unescape(String) failed" +
- (message == null ? "" : (": " + message)) +
+ (message == null ? "" : ": " + message) +
": expected '" + StringEscapeUtils.escapeJava(expected) +
// we escape this so we can see it in the error message
"' actual '" + StringEscapeUtils.escapeJava(actual) + "'");
@@ -488,8 +488,8 @@ public class StringEscapeUtilsTest extends AbstractLangTest {
final Character c1 = Character.valueOf(i);
final Character c2 = Character.valueOf((char) (i+1));
final String expected = c1.toString() + c2;
- final String escapedC1 = "&#x" + Integer.toHexString((c1.charValue())) + ";";
- final String escapedC2 = "&#x" + Integer.toHexString((c2.charValue())) + ";";
+ final String escapedC1 = "&#x" + Integer.toHexString(c1.charValue()) + ";";
+ final String escapedC2 = "&#x" + Integer.toHexString(c2.charValue()) + ";";
assertEquals(expected, StringEscapeUtils.unescapeHtml4(escapedC1 + escapedC2), "hex number unescape index " + (int) i);
}
}
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
index 87c5548df..4d8cc1a3e 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java
@@ -167,10 +167,10 @@ public class StringUtilsContainsTest extends AbstractLangTest {
assertFalse(StringUtils.containsAny("", new String[] { "hello" }));
assertFalse(StringUtils.containsAny("hello, goodbye", (String[]) null));
assertFalse(StringUtils.containsAny("hello, goodbye", new String[0]));
- assertTrue(StringUtils.containsAny("hello, goodbye", new String[]{"hello", "goodbye"}));
- assertTrue(StringUtils.containsAny("hello, goodbye", new String[]{"hello", "Goodbye"}));
- assertFalse(StringUtils.containsAny("hello, goodbye", new String[]{"Hello", "Goodbye"}));
- assertFalse(StringUtils.containsAny("hello, goodbye", new String[]{"Hello", null}));
+ assertTrue(StringUtils.containsAny("hello, goodbye", new String[] { "hello", "goodbye" }));
+ assertTrue(StringUtils.containsAny("hello, goodbye", new String[] { "hello", "Goodbye" }));
+ assertFalse(StringUtils.containsAny("hello, goodbye", new String[] { "Hello", "Goodbye" }));
+ assertFalse(StringUtils.containsAny("hello, goodbye", new String[] { "Hello", null }));
assertFalse(StringUtils.containsAny("hello, null", new String[] { "Hello", null }));
// Javadoc examples:
assertTrue(StringUtils.containsAny("abcd", "ab", null));
diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
index 61140d063..775810078 100644
--- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java
@@ -56,7 +56,7 @@ public class SystemUtilsTest extends AbstractLangTest {
/**
* Returns the value of the SystemUtils.IS_JAVA_X field for the versions >= 9.
*/
- private boolean getIS_JAVA(int version) throws Exception {
+ private boolean getIS_JAVA(final int version) throws Exception {
return SystemUtils.class.getField("IS_JAVA_" + version).getBoolean(null);
}
@@ -66,7 +66,7 @@ public class SystemUtilsTest extends AbstractLangTest {
public int getLastSupportedJavaVersion() {
int lastSupportedVersion = 0;
- for (Field field : SystemUtils.class.getFields()) {
+ for (final Field field : SystemUtils.class.getFields()) {
if (field.getName().matches("IS_JAVA_\\d+")) {
lastSupportedVersion = Math.max(lastSupportedVersion, Integer.parseInt(field.getName().substring(8)));
}
@@ -78,8 +78,8 @@ public class SystemUtilsTest extends AbstractLangTest {
@Test
@SuppressWarnings("deprecation")
public void test_IS_JAVA() throws Exception {
- String javaVersion = SystemUtils.JAVA_VERSION;
- int lastSupportedVersion = getLastSupportedJavaVersion();
+ final String javaVersion = SystemUtils.JAVA_VERSION;
+ final int lastSupportedVersion = getLastSupportedJavaVersion();
if (javaVersion == null) {
assertFalse(SystemUtils.IS_JAVA_1_1);
diff --git a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
index 17943a45f..6469502bf 100644
--- a/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ThreadUtilsTest.java
@@ -155,14 +155,14 @@ public class ThreadUtilsTest extends AbstractLangTest {
@Test
public void testGetAllThreadGroupsDoesNotReturnNull() {
// LANG-1706 getAllThreadGroups and findThreadGroups should not return null items
- Collection<ThreadGroup> threads = ThreadUtils.getAllThreadGroups();
+ final Collection<ThreadGroup> threads = ThreadUtils.getAllThreadGroups();
assertEquals(0, threads.stream().filter(Objects::isNull).count());
}
@Test
public void testGetAllThreadsDoesNotReturnNull() {
// LANG-1706 getAllThreads and findThreads should not return null items
- Collection<Thread> threads = ThreadUtils.getAllThreads();
+ final Collection<Thread> threads = ThreadUtils.getAllThreads();
assertEquals(0, threads.stream().filter(Objects::isNull).count());
}
diff --git a/src/test/java/org/apache/commons/lang3/ValidateTest.java b/src/test/java/org/apache/commons/lang3/ValidateTest.java
index 7b0ac4bdf..28877f99d 100644
--- a/src/test/java/org/apache/commons/lang3/ValidateTest.java
+++ b/src/test/java/org/apache/commons/lang3/ValidateTest.java
@@ -837,7 +837,7 @@ public class ValidateTest extends AbstractLangTest {
@Test
void shouldReturnSameInstance() {
- final String[] expected = new String[] {"a", "b"};
+ final String[] expected = {"a", "b"};
assertSame(expected, Validate.noNullElements(expected));
}
@@ -1032,7 +1032,7 @@ public class ValidateTest extends AbstractLangTest {
@Test
void shouldReturnTheSameInstance() {
- final String[] expected = new String[] {"hi"};
+ final String[] expected = {"hi"};
assertSame(expected, Validate.notEmpty(expected, "MSG"));
}
@@ -1059,7 +1059,7 @@ public class ValidateTest extends AbstractLangTest {
@Test
void shouldReturnTheSameInstance() {
- final String[] expected = new String[] {"hi"};
+ final String[] expected = {"hi"};
assertSame(expected, Validate.notEmpty(expected));
}
diff --git a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
index f13e7cc21..e1361b9c7 100644
--- a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
@@ -128,13 +128,13 @@ public class HashCodeBuilderTest extends AbstractLangTest {
static class TestObjectWithMultipleFields {
@SuppressWarnings("unused")
- private int one;
+ private final int one;
@SuppressWarnings("unused")
- private int two;
+ private final int two;
@SuppressWarnings("unused")
- private int three;
+ private final int three;
TestObjectWithMultipleFields(final int one, final int two, final int three) {
this.one = one;
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderCustomImplementationTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderCustomImplementationTest.java
index dd1acdd58..de345fe05 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderCustomImplementationTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderCustomImplementationTest.java
@@ -33,12 +33,12 @@ public class ReflectionToStringBuilderCustomImplementationTest extends AbstractL
private static final String CUSTOM_PREFIX = "prefix:";
- public CustomReflectionToStringBuilder(Object object, ToStringStyle toStringStyle) {
+ public CustomReflectionToStringBuilder(final Object object, final ToStringStyle toStringStyle) {
super(object, toStringStyle);
}
@Override
- protected Object getValue(Field field) throws IllegalAccessException {
+ protected Object getValue(final Field field) throws IllegalAccessException {
return CUSTOM_PREFIX + super.getValue(field);
}
}
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 f94cea831..f4f2d0a28 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java
@@ -136,7 +136,7 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
@Test
public void test_toStringIncludeNullArrayMultiplesValues() {
- final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), new String[] {null, null, null, null});
+ final String toString = ReflectionToStringBuilder.toStringInclude(new TestFeature(), null, null, null, null);
this.validateAllFieldsPresent(toString);
}
@@ -193,8 +193,8 @@ public class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
@Test
public void test_toStringSetIncludeWithArrayWithMultipleNullFields() {
final ReflectionToStringBuilder builder = new ReflectionToStringBuilder(new TestFeature());
- builder.setExcludeFieldNames(new String[] {FIELDS[1], FIELDS[4]});
- builder.setIncludeFieldNames(new String[] {null, null, null});
+ 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]});
}
diff --git a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
index 8f6d6d169..dbbf0f4fc 100644
--- a/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/StandardToStringStyleTest.java
@@ -123,42 +123,42 @@ public class StandardToStringStyleTest extends AbstractLangTest {
@Test
public void testDefaultIsArrayContentDetail() {
- assertTrue((new StandardToStringStyle()).isArrayContentDetail());
+ assertTrue(new StandardToStringStyle().isArrayContentDetail());
}
@Test
public void testDefaultIsFieldSeparatorAtEnd() {
- assertFalse((new StandardToStringStyle()).isFieldSeparatorAtEnd());
+ assertFalse(new StandardToStringStyle().isFieldSeparatorAtEnd());
}
@Test
public void testDefaultIsFieldSeparatorAtStart() {
- assertFalse((new StandardToStringStyle()).isFieldSeparatorAtStart());
+ assertFalse(new StandardToStringStyle().isFieldSeparatorAtStart());
}
@Test
public void testDefaultValueOfFullDetail() {
- assertTrue((new StandardToStringStyle()).isDefaultFullDetail());
+ assertTrue(new StandardToStringStyle().isDefaultFullDetail());
}
@Test
public void testDefaultValueOfUseClassName() {
- assertTrue((new StandardToStringStyle()).isUseClassName());
+ assertTrue(new StandardToStringStyle().isUseClassName());
}
@Test
public void testDefaultValueOfUseFieldNames() {
- assertTrue((new StandardToStringStyle()).isUseFieldNames());
+ assertTrue(new StandardToStringStyle().isUseFieldNames());
}
@Test
public void testDefaultValueOfUseIdentityHashCode() {
- assertTrue((new StandardToStringStyle()).isUseIdentityHashCode());
+ assertTrue(new StandardToStringStyle().isUseIdentityHashCode());
}
@Test
public void testDefaultValueOfUseShortClassName() {
- assertFalse((new StandardToStringStyle()).isUseShortClassName());
+ assertFalse(new StandardToStringStyle().isUseShortClassName());
}
@Test
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 d84351e99..6eb0bd561 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ToStringBuilderTest.java
@@ -258,7 +258,7 @@ public class ToStringBuilderTest extends AbstractLangTest {
@Test
public void testAppendAsObjectToStringNullPointerException() {
- ToStringBuilder builder = new ToStringBuilder(1);
+ final ToStringBuilder builder = new ToStringBuilder(1);
assertThrows(NullPointerException.class, () -> builder.appendAsObjectToString(null));
builder.toString();
}
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerCloseAndExceptionsTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerCloseAndExceptionsTest.java
index 5f95c435d..46521017b 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerCloseAndExceptionsTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerCloseAndExceptionsTest.java
@@ -61,7 +61,7 @@ public abstract class AbstractConcurrentInitializerCloseAndExceptionsTest extend
// The use of enums rather than accepting an Exception as the input means we can have
// multiple exception types on the method signature.
- protected static CloseableObject methodThatThrowsException(ExceptionToThrow input) throws IOException, SQLException, ConcurrentException {
+ protected static CloseableObject methodThatThrowsException(final ExceptionToThrow input) throws IOException, SQLException, ConcurrentException {
switch (input) {
case IOException:
throw new IOException();
@@ -87,12 +87,12 @@ public abstract class AbstractConcurrentInitializerCloseAndExceptionsTest extend
public void testCloserThrowsCheckedException() throws ConcurrentException {
final ConcurrentInitializer<CloseableObject> initializer = createInitializerThatThrowsException(
CloseableObject::new,
- (CloseableObject) -> methodThatThrowsException(ExceptionToThrow.IOException));
+ CloseableObject -> methodThatThrowsException(ExceptionToThrow.IOException));
try {
initializer.get();
((AbstractConcurrentInitializer) initializer).close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
assertThat(e, instanceOf(ConcurrentException.class));
assertThat(e.getCause(), instanceOf(IOException.class));
}
@@ -107,7 +107,7 @@ public abstract class AbstractConcurrentInitializerCloseAndExceptionsTest extend
public void testCloserThrowsRuntimeException() throws ConcurrentException {
final ConcurrentInitializer<CloseableObject> initializer = createInitializerThatThrowsException(
CloseableObject::new,
- (CloseableObject) -> methodThatThrowsException(ExceptionToThrow.NullPointerException));
+ CloseableObject -> methodThatThrowsException(ExceptionToThrow.NullPointerException));
initializer.get();
assertThrows(NullPointerException.class, () -> {
@@ -148,7 +148,7 @@ public abstract class AbstractConcurrentInitializerCloseAndExceptionsTest extend
try {
initializer.get();
fail();
- } catch (ConcurrentException e) {
+ } catch (final ConcurrentException e) {
assertEquals(concurrentException, e);
}
}
@@ -176,7 +176,7 @@ public abstract class AbstractConcurrentInitializerCloseAndExceptionsTest extend
CloseableObject::new,
CloseableObject::close);
- CloseableObject closeableObject = initializer.get();
+ final CloseableObject closeableObject = initializer.get();
assertFalse(closeableObject.isClosed());
((AbstractConcurrentInitializer) initializer).close();
assertTrue(closeableObject.isClosed());
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
index f712e700f..f2b8517ee 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AbstractConcurrentInitializerTest.java
@@ -128,7 +128,7 @@ public abstract class AbstractConcurrentInitializerTest extends AbstractLangTest
public void testisInitialized() throws Throwable {
final ConcurrentInitializer<Object> initializer = createInitializer();
if (initializer instanceof AbstractConcurrentInitializer) {
- AbstractConcurrentInitializer castedInitializer = (AbstractConcurrentInitializer) initializer;
+ final AbstractConcurrentInitializer castedInitializer = (AbstractConcurrentInitializer) initializer;
assertFalse(castedInitializer.isInitialized(), "was initialized before get()");
assertNotNull(castedInitializer.get(), "No managed object");
assertTrue(castedInitializer.isInitialized(), "was not initialized after get()");
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerSupplierTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerSupplierTest.java
index 41413ff84..fddbf280d 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerSupplierTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerSupplierTest.java
@@ -30,7 +30,7 @@ public class AtomicInitializerSupplierTest extends AbstractConcurrentInitializer
*/
@Override
protected ConcurrentInitializer<Object> createInitializer() {
- return AtomicInitializer.<Object>builder().setInitializer(() -> new Object()).get();
+ return AtomicInitializer.<Object>builder().setInitializer(Object::new).get();
}
@Override
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
index cdf42bd1a..a8e9d54d8 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicInitializerTest.java
@@ -50,9 +50,8 @@ public class AtomicInitializerTest extends AbstractConcurrentInitializerTest {
protected Object initialize() {
if (firstRun.getAndSet(false)) {
return null;
- } else {
- return new Object();
}
+ return new Object();
}
};
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerSupplierTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerSupplierTest.java
index ffaa385a2..26554b5e1 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerSupplierTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerSupplierTest.java
@@ -72,9 +72,8 @@ public class AtomicSafeInitializerSupplierTest extends AbstractConcurrentInitial
protected Object initialize() {
if (firstRun.getAndSet(false)) {
return null;
- } else {
- return new Object();
}
+ return new Object();
}
};
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
index 4cf02f8c8..171809823 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializerTest.java
@@ -74,9 +74,8 @@ public class AtomicSafeInitializerTest extends AbstractConcurrentInitializerTest
protected Object initialize() {
if (firstRun.getAndSet(false)) {
return null;
- } else {
- return new Object();
}
+ return new Object();
}
};
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/BackgroundInitializerSupplierTest.java b/src/test/java/org/apache/commons/lang3/concurrent/BackgroundInitializerSupplierTest.java
index 73302f089..27f9bead5 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/BackgroundInitializerSupplierTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/BackgroundInitializerSupplierTest.java
@@ -40,29 +40,27 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
protected static final class SupplierBackgroundInitializerTestImpl extends AbstractBackgroundInitializerTestImpl {
SupplierBackgroundInitializerTestImpl() {
- super();
- setSupplierAndCloser((CloseableCounter cc) -> cc.close());
+ setSupplierAndCloser((final CloseableCounter cc) -> cc.close());
}
SupplierBackgroundInitializerTestImpl(final ExecutorService exec) {
super(exec);
- setSupplierAndCloser((CloseableCounter cc) -> cc.close());
+ setSupplierAndCloser((final CloseableCounter cc) -> cc.close());
}
- SupplierBackgroundInitializerTestImpl(FailableConsumer<?, ?> consumer) {
- super();
+ SupplierBackgroundInitializerTestImpl(final FailableConsumer<?, ?> consumer) {
setSupplierAndCloser(consumer);
}
- private void setSupplierAndCloser(FailableConsumer<?, ?> consumer) {
+ private void setSupplierAndCloser(final FailableConsumer<?, ?> consumer) {
try {
// Use reflection here because the constructors we need are private
- FailableSupplier<?, ?> supplier = () -> initializeInternal();
- Field initializer = AbstractConcurrentInitializer.class.getDeclaredField("initializer");
+ final FailableSupplier<?, ?> supplier = this::initializeInternal;
+ final Field initializer = AbstractConcurrentInitializer.class.getDeclaredField("initializer");
initializer.setAccessible(true);
initializer.set(this, supplier);
- Field closer = AbstractConcurrentInitializer.class.getDeclaredField("closer");
+ final Field closer = AbstractConcurrentInitializer.class.getDeclaredField("closer");
closer.setAccessible(true);
closer.set(this, consumer);
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
@@ -71,10 +69,12 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
}
}
+ @Override
protected AbstractBackgroundInitializerTestImpl getBackgroundInitializerTestImpl() {
return new SupplierBackgroundInitializerTestImpl();
}
+ @Override
protected SupplierBackgroundInitializerTestImpl getBackgroundInitializerTestImpl(final ExecutorService exec) {
return new SupplierBackgroundInitializerTestImpl(exec);
}
@@ -106,7 +106,7 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
public void testCloseWithCheckedException() throws Exception {
final IOException ioException = new IOException();
- final FailableConsumer<?, ?> IOExceptionConsumer = (CloseableCounter cc) -> {
+ final FailableConsumer<?, ?> IOExceptionConsumer = (final CloseableCounter cc) -> {
throw ioException;
};
@@ -116,7 +116,7 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
try {
init.close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
assertThat(e, instanceOf(ConcurrentException.class));
assertSame(ioException, e.getCause());
}
@@ -131,7 +131,7 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
public void testCloseWithRuntimeException() throws Exception {
final NullPointerException npe = new NullPointerException();
- final FailableConsumer<?, ?> NullPointerExceptionConsumer = (CloseableCounter cc) -> {
+ final FailableConsumer<?, ?> NullPointerExceptionConsumer = (final CloseableCounter cc) -> {
throw npe;
};
@@ -141,7 +141,7 @@ public class BackgroundInitializerSupplierTest extends BackgroundInitializerTest
try {
init.close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
assertSame(npe, e);
}
}
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerSupplierTest.java b/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerSupplierTest.java
index 0ac26a4bf..1c57cb38b 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerSupplierTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/LazyInitializerSupplierTest.java
@@ -31,7 +31,7 @@ public class LazyInitializerSupplierTest extends AbstractConcurrentInitializerCl
*/
@Override
protected ConcurrentInitializer<Object> createInitializer() {
- return LazyInitializer.<Object>builder().setInitializer(() -> new Object()).get();
+ return LazyInitializer.<Object>builder().setInitializer(Object::new).get();
}
@Override
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerSupplierTest.java b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerSupplierTest.java
index 99d129e7d..af1668899 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerSupplierTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerSupplierTest.java
@@ -43,13 +43,13 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
private static final class SupplierChildBackgroundInitializer extends AbstractChildBackgroundInitializer {
SupplierChildBackgroundInitializer() {
- this((CloseableCounter cc) -> cc.close());
+ this((final CloseableCounter cc) -> cc.close());
}
- SupplierChildBackgroundInitializer(FailableConsumer<?, ?> consumer) {
+ SupplierChildBackgroundInitializer(final FailableConsumer<?, ?> consumer) {
try {
// Use reflection here because the constructors we need are private
- final FailableSupplier<?, ?> supplier = () -> initializeInternal();
+ final FailableSupplier<?, ?> supplier = this::initializeInternal;
final Field initializer = AbstractConcurrentInitializer.class.getDeclaredField("initializer");
initializer.setAccessible(true);
initializer.set(this, supplier);
@@ -80,10 +80,10 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
public void setUpException() throws Exception {
npe = new NullPointerException();
ioException = new IOException();
- ioExceptionConsumer = (CloseableCounter cc) -> {
+ ioExceptionConsumer = (final CloseableCounter cc) -> {
throw ioException;
};
- nullPointerExceptionConsumer = (CloseableCounter cc) -> {
+ nullPointerExceptionConsumer = (final CloseableCounter cc) -> {
throw npe;
};
}
@@ -109,9 +109,9 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
initializer.start();
- long startTime = System.currentTimeMillis();
- long waitTime = 3000;
- long endTime = startTime + waitTime;
+ final long startTime = System.currentTimeMillis();
+ final long waitTime = 3000;
+ final long endTime = startTime + waitTime;
//wait for the children to start
while (!childOne.isStarted() || !childTwo.isStarted()) {
if (System.currentTimeMillis() > endTime) {
@@ -131,7 +131,7 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
try {
initializer.close();
- } catch (Exception e) {
+ } catch (final Exception e) {
fail();
}
@@ -151,9 +151,9 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
initializer.addInitializer("child one", childOne);
initializer.start();
- long startTime = System.currentTimeMillis();
- long waitTime = 3000;
- long endTime = startTime + waitTime;
+ final long startTime = System.currentTimeMillis();
+ final long waitTime = 3000;
+ final long endTime = startTime + waitTime;
//wait for the children to start
while (! childOne.isStarted()) {
if (System.currentTimeMillis() > endTime) {
@@ -166,7 +166,7 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
try {
initializer.close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
assertThat(e, instanceOf(ConcurrentException.class));
assertSame(ioException, e.getSuppressed()[0]);
}
@@ -184,9 +184,9 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
initializer.addInitializer("child one", childOne);
initializer.start();
- long startTime = System.currentTimeMillis();
- long waitTime = 3000;
- long endTime = startTime + waitTime;
+ final long startTime = System.currentTimeMillis();
+ final long waitTime = 3000;
+ final long endTime = startTime + waitTime;
//wait for the children to start
while (! childOne.isStarted()) {
if (System.currentTimeMillis() > endTime) {
@@ -199,7 +199,7 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
try {
initializer.close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
assertThat(e, instanceOf(ConcurrentException.class));
assertSame(npe, e.getSuppressed()[0]);
}
@@ -240,12 +240,12 @@ public class MultiBackgroundInitializerSupplierTest extends MultiBackgroundIniti
try {
initializer.close();
fail();
- } catch (Exception e) {
+ } catch (final Exception e) {
// We don't actually know which order the children will be closed in
boolean foundChildOneException = false;
boolean foundChildTwoException = false;
- for (Throwable t : e.getSuppressed()) {
+ for (final Throwable t : e.getSuppressed()) {
if (t.equals(ioException)) {
foundChildOneException = true;
}
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
index 11baa71dc..148813893 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java
@@ -95,7 +95,7 @@ public class MultiBackgroundInitializerTest extends AbstractLangTest {
protected static class CloseableCounter {
// A convenience for testing that a CloseableCounter typed as Object has a specific initializeCalls value
- public static CloseableCounter wrapInteger(int i) {
+ public static CloseableCounter wrapInteger(final int i) {
return new CloseableCounter().setInitializeCalls(i);
}
@@ -130,7 +130,7 @@ public class MultiBackgroundInitializerTest extends AbstractLangTest {
return closed;
}
- public CloseableCounter setInitializeCalls(int i) {
+ public CloseableCounter setInitializeCalls(final int i) {
initializeCalls = i;
return this;
}
@@ -437,9 +437,9 @@ public class MultiBackgroundInitializerTest extends AbstractLangTest {
initializer.addInitializer("child two", childTwo);
initializer.start();
- long startTime = System.currentTimeMillis();
- long waitTime = 3000;
- long endTime = startTime + waitTime;
+ final long startTime = System.currentTimeMillis();
+ final long waitTime = 3000;
+ final long endTime = startTime + waitTime;
//wait for the children to start
while (! childOne.isStarted() || ! childTwo.isStarted()) {
if (System.currentTimeMillis() > endTime) {
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 8677afe36..5b7ab853f 100644
--- a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java
@@ -644,7 +644,7 @@ public class NumberUtilsTest extends AbstractLangTest {
assertEquals(new BigDecimal("1.7976931348623159e+308"), NumberUtils.createNumber("1.7976931348623159e+308"));
// Requested type is parsed as zero but the value is not zero
- final Double nonZero1 = Double.valueOf(((double) Float.MIN_VALUE) / 2);
+ final Double nonZero1 = Double.valueOf((double) Float.MIN_VALUE / 2);
assertEquals(nonZero1, NumberUtils.createNumber(nonZero1.toString()));
assertEquals(nonZero1, NumberUtils.createNumber(nonZero1 + "F"));
// Smallest double is 4.9e-324.
diff --git a/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java b/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java
index 486b88aa5..2bfa91222 100644
--- a/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java
+++ b/src/test/java/org/apache/commons/lang3/mutable/PrintAtomicVsMutable.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.time.DurationUtils;
*/
public class PrintAtomicVsMutable {
- public static void main(String[] args) {
+ public static void main(final String[] args) {
final MutableInt mInt = new MutableInt();
final int max = 100_000_000;
System.out.println("MutableInt " + DurationUtils.of(() -> {
diff --git a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
index d058e7abc..198cefd10 100644
--- a/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/text/StrBuilderTest.java
@@ -665,19 +665,19 @@ public class StrBuilderTest extends AbstractLangTest {
assertTrue(sb1.equals(sb2));
assertTrue(sb1.equals(sb1));
assertTrue(sb2.equals(sb2));
- assertEquals(sb1, (Object) sb2);
+ assertEquals(sb1, sb2);
sb1.append("abc");
assertFalse(sb1.equals(sb2));
- assertNotEquals(sb1, (Object) sb2);
+ assertNotEquals(sb1, sb2);
sb2.append("ABC");
assertFalse(sb1.equals(sb2));
- assertNotEquals(sb1, (Object) sb2);
+ assertNotEquals(sb1, sb2);
sb2.clear().append("abc");
assertTrue(sb1.equals(sb2));
- assertEquals(sb1, (Object) sb2);
+ assertEquals(sb1, sb2);
assertNotEquals(sb1, Integer.valueOf(1));
assertNotEquals("abc", sb1);
diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsFragmentTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsFragmentTest.java
index 2c1d64ca2..35b5645d1 100644
--- a/src/test/java/org/apache/commons/lang3/time/DateUtilsFragmentTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsFragmentTest.java
@@ -127,7 +127,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testHoursOfMonthWithCalendar() {
final long testResult = DateUtils.getFragmentInHours(aCalendar, Calendar.MONTH);
- assertEquals( hours +(((days - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals( hours +(days - 1) * DateUtils.MILLIS_PER_DAY
/ DateUtils.MILLIS_PER_HOUR,
testResult);
}
@@ -135,7 +135,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testHoursOfMonthWithDate() {
final long testResult = DateUtils.getFragmentInHours(aDate, Calendar.MONTH);
- assertEquals(hours + (((days - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals(hours + (days - 1) * DateUtils.MILLIS_PER_DAY
/ DateUtils.MILLIS_PER_HOUR,
testResult);
}
@@ -143,7 +143,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testHoursOfYearWithCalendar() {
final long testResult = DateUtils.getFragmentInHours(aCalendar, Calendar.YEAR);
- assertEquals( hours +(((aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals( hours +(aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY
/ DateUtils.MILLIS_PER_HOUR,
testResult);
}
@@ -153,7 +153,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
final long testResult = DateUtils.getFragmentInHours(aDate, Calendar.YEAR);
final Calendar cal = Calendar.getInstance();
cal.setTime(aDate);
- assertEquals(hours + (((cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals(hours + (cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY
/ DateUtils.MILLIS_PER_HOUR,
testResult);
}
@@ -201,7 +201,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testMillisecondsOfDayWithCalendar() {
long testresult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.DATE);
- final long expectedValue = millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE) + (hours * DateUtils.MILLIS_PER_HOUR);
+ final long expectedValue = millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE + hours * DateUtils.MILLIS_PER_HOUR;
assertEquals(expectedValue, testresult);
testresult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testresult);
@@ -211,7 +211,7 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testMillisecondsOfDayWithDate() {
long testresult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.DATE);
- final long expectedValue = millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE) + (hours * DateUtils.MILLIS_PER_HOUR);
+ final long expectedValue = millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE + hours * DateUtils.MILLIS_PER_HOUR;
assertEquals(expectedValue, testresult);
testresult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testresult);
@@ -222,32 +222,32 @@ public class DateUtilsFragmentTest extends AbstractLangTest {
@Test
public void testMillisecondsOfHourWithCalendar() {
final long testResult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.HOUR_OF_DAY);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE), testResult);
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE, testResult);
}
@Test
public void testMillisecondsOfHourWithDate() {
final long testResult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.HOUR_OF_DAY);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE), testResult);
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE, testResult);
}
@Test
public void testMillisecondsOfMinuteWithCalender() {
final long testResult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.MINUTE);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND), testResult);
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND, testResult);
}
@Test
public void testMillisecondsOfMinuteWithDate() {
final long testResult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.MINUTE);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND), testResult);
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND, testResult);
}
@Test
public void testMillisecondsOfMonthWithCalendar() {
final long testResult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.MONTH);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY),
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY,
testResult);
}
@@ -255,8 +255,8 @@ testResult);
@Test
public void testMillisecondsOfMonthWithDate() {
final long testResult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.MONTH);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY),
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY,
testResult);
}
@@ -276,8 +276,8 @@ testResult);
@Test
public void testMillisecondsOfYearWithCalendar() {
final long testResult = DateUtils.getFragmentInMilliseconds(aCalendar, Calendar.YEAR);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY),
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY,
testResult);
}
@@ -287,8 +287,8 @@ testResult);
final long testResult = DateUtils.getFragmentInMilliseconds(aDate, Calendar.YEAR);
final Calendar cal = Calendar.getInstance();
cal.setTime(aDate);
- assertEquals(millis + (seconds * DateUtils.MILLIS_PER_SECOND) + (minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((cal.get(Calendar.DAY_OF_YEAR) - 1)* DateUtils.MILLIS_PER_DAY),
+ assertEquals(millis + seconds * DateUtils.MILLIS_PER_SECOND + minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (cal.get(Calendar.DAY_OF_YEAR) - 1)* DateUtils.MILLIS_PER_DAY,
testResult);
}
@@ -309,7 +309,7 @@ testResult);
@Test
public void testMinutesOfDayWithCalendar() {
long testResult = DateUtils.getFragmentInMinutes(aCalendar, Calendar.DATE);
- final long expectedValue = minutes + ((hours * DateUtils.MILLIS_PER_HOUR))/ DateUtils.MILLIS_PER_MINUTE;
+ final long expectedValue = minutes + hours * DateUtils.MILLIS_PER_HOUR/ DateUtils.MILLIS_PER_MINUTE;
assertEquals(expectedValue, testResult);
testResult = DateUtils.getFragmentInMinutes(aCalendar, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testResult);
@@ -318,7 +318,7 @@ testResult);
@Test
public void testMinutesOfDayWithDate() {
long testResult = DateUtils.getFragmentInMinutes(aDate, Calendar.DATE);
- final long expectedValue = minutes + ((hours * DateUtils.MILLIS_PER_HOUR))/ DateUtils.MILLIS_PER_MINUTE;
+ final long expectedValue = minutes + hours * DateUtils.MILLIS_PER_HOUR/ DateUtils.MILLIS_PER_MINUTE;
assertEquals(expectedValue, testResult);
testResult = DateUtils.getFragmentInMinutes(aDate, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testResult);
@@ -339,7 +339,7 @@ testResult);
@Test
public void testMinutesOfMonthWithCalendar() {
final long testResult = DateUtils.getFragmentInMinutes(aCalendar, Calendar.MONTH);
- assertEquals( minutes +((hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals( minutes +(hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_MINUTE,
testResult);
}
@@ -348,7 +348,7 @@ testResult);
public void testMinutesOfMonthWithDate() {
final long testResult = DateUtils.getFragmentInMinutes(aDate, Calendar.MONTH);
assertEquals(minutes
- + ((hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY))
+ + (hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_MINUTE,
testResult);
}
@@ -356,7 +356,7 @@ testResult);
@Test
public void testMinutesOfYearWithCalendar() {
final long testResult = DateUtils.getFragmentInMinutes(aCalendar, Calendar.YEAR);
- assertEquals( minutes +((hours * DateUtils.MILLIS_PER_HOUR) + ((aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ assertEquals( minutes +(hours * DateUtils.MILLIS_PER_HOUR + (aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_MINUTE,
testResult);
}
@@ -367,7 +367,7 @@ testResult);
final Calendar cal = Calendar.getInstance();
cal.setTime(aDate);
assertEquals(minutes
- + ((hours * DateUtils.MILLIS_PER_HOUR) + ((cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ + (hours * DateUtils.MILLIS_PER_HOUR + (cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_MINUTE,
testResult);
}
@@ -422,7 +422,7 @@ testResult);
@Test
public void testSecondsOfDayWithCalendar() {
long testresult = DateUtils.getFragmentInSeconds(aCalendar, Calendar.DATE);
- final long expectedValue = seconds + ((minutes * DateUtils.MILLIS_PER_MINUTE) + (hours * DateUtils.MILLIS_PER_HOUR))/ DateUtils.MILLIS_PER_SECOND;
+ final long expectedValue = seconds + (minutes * DateUtils.MILLIS_PER_MINUTE + hours * DateUtils.MILLIS_PER_HOUR)/ DateUtils.MILLIS_PER_SECOND;
assertEquals(expectedValue, testresult);
testresult = DateUtils.getFragmentInSeconds(aCalendar, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testresult);
@@ -431,7 +431,7 @@ testResult);
@Test
public void testSecondsOfDayWithDate() {
long testresult = DateUtils.getFragmentInSeconds(aDate, Calendar.DATE);
- final long expectedValue = seconds + ((minutes * DateUtils.MILLIS_PER_MINUTE) + (hours * DateUtils.MILLIS_PER_HOUR))/ DateUtils.MILLIS_PER_SECOND;
+ final long expectedValue = seconds + (minutes * DateUtils.MILLIS_PER_MINUTE + hours * DateUtils.MILLIS_PER_HOUR)/ DateUtils.MILLIS_PER_SECOND;
assertEquals(expectedValue, testresult);
testresult = DateUtils.getFragmentInSeconds(aDate, Calendar.DAY_OF_YEAR);
assertEquals(expectedValue, testresult);
@@ -442,8 +442,8 @@ testResult);
final long testResult = DateUtils.getFragmentInSeconds(aCalendar, Calendar.HOUR_OF_DAY);
assertEquals(
seconds
- + (minutes
- * DateUtils.MILLIS_PER_MINUTE / DateUtils.MILLIS_PER_SECOND),
+ + minutes
+ * DateUtils.MILLIS_PER_MINUTE / DateUtils.MILLIS_PER_SECOND,
testResult);
}
@@ -452,8 +452,8 @@ testResult);
final long testResult = DateUtils.getFragmentInSeconds(aDate, Calendar.HOUR_OF_DAY);
assertEquals(
seconds
- + (minutes
- * DateUtils.MILLIS_PER_MINUTE / DateUtils.MILLIS_PER_SECOND),
+ + minutes
+ * DateUtils.MILLIS_PER_MINUTE / DateUtils.MILLIS_PER_SECOND,
testResult);
}
@@ -475,8 +475,8 @@ testResult);
final long testResult = DateUtils.getFragmentInSeconds(aCalendar, Calendar.MONTH);
assertEquals(
seconds
- + ((minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY))
+ + (minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_SECOND,
testResult);
}
@@ -486,8 +486,8 @@ testResult);
final long testResult = DateUtils.getFragmentInSeconds(aDate, Calendar.MONTH);
assertEquals(
seconds
- + ((minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((days - 1) * DateUtils.MILLIS_PER_DAY))
+ + (minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (days - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_SECOND,
testResult);
}
@@ -497,8 +497,8 @@ testResult);
final long testResult = DateUtils.getFragmentInSeconds(aCalendar, Calendar.YEAR);
assertEquals(
seconds
- + ((minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ + (minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (aCalendar.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_SECOND,
testResult);
}
@@ -510,8 +510,8 @@ testResult);
cal.setTime(aDate);
assertEquals(
seconds
- + ((minutes * DateUtils.MILLIS_PER_MINUTE)
- + (hours * DateUtils.MILLIS_PER_HOUR) + ((cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY))
+ + (minutes * DateUtils.MILLIS_PER_MINUTE
+ + hours * DateUtils.MILLIS_PER_HOUR + (cal.get(Calendar.DAY_OF_YEAR) - 1) * DateUtils.MILLIS_PER_DAY)
/ DateUtils.MILLIS_PER_SECOND,
testResult);
}
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 3f51aa1e1..5c0878cf6 100644
--- a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
@@ -83,7 +83,7 @@ public class DurationFormatUtilsTest extends AbstractLangTest {
}
private DurationFormatUtils.Token createTokenWithCount(final Object value, final int count) {
- DurationFormatUtils.Token token = new DurationFormatUtils.Token(value, false, -1);
+ final DurationFormatUtils.Token token = new DurationFormatUtils.Token(value, false, -1);
for (int i = 1; i < count; i++) {
token.increment();
}
@@ -92,7 +92,7 @@ public class DurationFormatUtilsTest extends AbstractLangTest {
@Test
public void testAlternatingLiteralOptionals() {
- String format = "['d'dH'h'][m'm']['s's]['ms'S]";
+ final String format = "['d'dH'h'][m'm']['s's]['ms'S]";
assertEquals("d1",
DurationFormatUtils.formatDuration(Duration.ofDays(1).toMillis(), format));
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
index 6b3159493..742a3f787 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
@@ -627,7 +627,7 @@ public class FastDateParserTest extends AbstractLangTest {
}
}
// SDF and FDF should produce equivalent results
- assertEquals((f == null), (s == null), "Should both or neither throw Exceptions");
+ assertEquals(f == null, s == null, "Should both or neither throw Exceptions");
assertEquals(dsdf, dfdp, "Parsed dates should be equal");
}
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
index b75aeb748..553029074 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
@@ -116,7 +116,7 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
// An exception will be thrown and the test will fail if parsing isn't successful
try {
parser.parse(tzDisplay);
- } catch (ParseException e) {
+ } catch (final ParseException e) {
// Hack Start
// See failures on GitHub Actions builds for Java 17.
final String localeStr = locale.toString();
@@ -131,7 +131,8 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
localeStr, tzDisplay);
assumeTrue(false, localeStr);
continue;
- } else if (SystemUtils.IS_JAVA_11
+ }
+ if (SystemUtils.IS_JAVA_11
&& (localeStr.contains("_") || "Coordinated Universal Time".equals(tzDisplay))) {
Java11Failures.add(locale);
// Mark as an assumption failure instead of a hard fail
@@ -167,7 +168,7 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
final String displayName = timeZone.getDisplayName(locale);
try {
parser.parse(displayName);
- } catch (ParseException e) {
+ } catch (final ParseException e) {
// Missing "Zulu" or something else in broken JDK's GH builds?
fail(String.format("%s: with locale = %s, id = '%s', timeZone = %s, displayName = '%s', parser = '%s'", e, locale, id, timeZone, displayName,
parser.toStringAll()), e);
(commons-lang) 01/02: Sort members
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 62e8c58129813811fea5da0d180c88559490778d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Jan 24 22:13:51 2024 -0500
Sort members
---
.../commons/lang3/builder/ConversionTest.java | 8 +-
.../commons/lang3/builder/DiffResultTest.java | 10 +-
.../commons/lang3/reflect/TypeUtilsTest.java | 372 ++++++++++-----------
3 files changed, 195 insertions(+), 195 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/builder/ConversionTest.java b/src/test/java/org/apache/commons/lang3/builder/ConversionTest.java
index 7143e2c72..36b4a8543 100644
--- a/src/test/java/org/apache/commons/lang3/builder/ConversionTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ConversionTest.java
@@ -31,13 +31,13 @@ class ConversionTest {
}
@Test
- void testHexToByte_nullString() {
- assertThrows(NullPointerException.class, () -> Conversion.hexToByte(null, 0, (byte) 0, 0, 2));
+ void testHexToByte_IllegalArgument() {
+ assertThrows(IllegalArgumentException.class, () -> Conversion.hexToByte("A0", 0, (byte) 0, 4, 2));
}
@Test
- void testHexToByte_IllegalArgument() {
- assertThrows(IllegalArgumentException.class, () -> Conversion.hexToByte("A0", 0, (byte) 0, 4, 2));
+ void testHexToByte_nullString() {
+ assertThrows(NullPointerException.class, () -> Conversion.hexToByte(null, 0, (byte) 0, 0, 2));
}
}
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
index 2f3f19cc6..e76251184 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffResultTest.java
@@ -132,32 +132,32 @@ public class DiffResultTest extends AbstractLangTest {
}
@Test
- public void testToStringOutput() {
+ public void testToStringFormat() {
// @formatter:off
final DiffResult<EmptyClass> result = DiffBuilder.<EmptyClass>builder()
.setLeft(new EmptyClass())
.setRight(new EmptyClass())
.setStyle(ToStringStyle.SHORT_PREFIX_STYLE)
+ .setToStringFormat("%s <> %s")
.build()
.append("test", false, true)
.build();
// @formatter:on
- assertEquals("DiffResultTest.EmptyClass[test=false] differs from DiffResultTest.EmptyClass[test=true]", result.toString());
+ assertEquals("DiffResultTest.EmptyClass[test=false] <> DiffResultTest.EmptyClass[test=true]", result.toString());
}
@Test
- public void testToStringFormat() {
+ public void testToStringOutput() {
// @formatter:off
final DiffResult<EmptyClass> result = DiffBuilder.<EmptyClass>builder()
.setLeft(new EmptyClass())
.setRight(new EmptyClass())
.setStyle(ToStringStyle.SHORT_PREFIX_STYLE)
- .setToStringFormat("%s <> %s")
.build()
.append("test", false, true)
.build();
// @formatter:on
- assertEquals("DiffResultTest.EmptyClass[test=false] <> DiffResultTest.EmptyClass[test=true]", result.toString());
+ assertEquals("DiffResultTest.EmptyClass[test=false] differs from DiffResultTest.EmptyClass[test=true]", result.toString());
}
@Test
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index b01ee870f..ce5051413 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -163,6 +163,10 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
}
}
+ /** This non-static inner class is parameterized. */
+ private class MyInnerClass<T> {
+ }
+
public class Other<T> implements This<String, T> {
}
@@ -229,6 +233,11 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
public Iterable<? extends Map<Integer, ? extends Collection<?>>> iterable;
+ /** The inner class is used as a return type from a method. */
+ private <U> MyInnerClass<U> aMethod() {
+ return null;
+ }
+
@Test
public void test_LANG_1114() throws NoSuchFieldException {
final Type nonWildcardType = getClass().getDeclaredField("wildcardComparable").getGenericType();
@@ -283,22 +292,6 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
assertEquals("java.util.function.Function<? super T, ? extends U>", typeName);
}
- @Test
- public void test_LANG_820() {
- final Type[] typeArray = {String.class, String.class};
- final Type[] expectedArray = {String.class};
- assertArrayEquals(expectedArray, TypeUtils.normalizeUpperBounds(typeArray));
- }
-
- /** This non-static inner class is parameterized. */
- private class MyInnerClass<T> {
- }
-
- /** The inner class is used as a return type from a method. */
- private <U> MyInnerClass<U> aMethod() {
- return null;
- }
-
@Test
public void test_LANG_1702() throws NoSuchMethodException, SecurityException {
final Type type = TypeUtilsTest.class.getDeclaredMethod("aMethod").getGenericReturnType();
@@ -310,6 +303,13 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
final Type unrolledType = TypeUtils.unrollVariables(typeArguments, type);
}
+ @Test
+ public void test_LANG_820() {
+ final Type[] typeArray = {String.class, String.class};
+ final Type[] expectedArray = {String.class};
+ assertArrayEquals(expectedArray, TypeUtils.normalizeUpperBounds(typeArray));
+ }
+
@Test
public void testContainsTypeVariables() throws NoSuchMethodException {
assertFalse(TypeUtils.containsTypeVariables(Test1.class.getMethod("m0").getGenericReturnType()));
@@ -582,82 +582,130 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
}
@Test
- public void testIsAssignableGenericComparableTypes() throws NoSuchFieldException {
- final Type intComparableType = getClass().getField("intComparable").getGenericType();
- assertTrue(TypeUtils.isAssignable(int.class, intComparableType));
+ public void testIsAssignableDirectClassHierarchy() throws NoSuchFieldException {
+ final Type bClassType = AClass.class.getField("bClass").getGenericType(); // B is superclass
+ final Type cClassType = AClass.class.getField("cClass").getGenericType(); // C subclass of B
+ final Type dClassType = AClass.class.getField("dClass").getGenericType(); // D subclass of C
+ final Type eClassType = AClass.class.getField("eClass").getGenericType(); // E subclass of D
+ final Type fClassType = AClass.class.getField("fClass").getGenericType(); // F subclass of E
- final Type longComparableType = getClass().getField("longComparable").getGenericType();
- assertFalse(TypeUtils.isAssignable(int.class, longComparableType));
- assertFalse(TypeUtils.isAssignable(Integer.class, longComparableType));
+ assertTrue(TypeUtils.isAssignable(cClassType, bClassType));
+ assertTrue(TypeUtils.isAssignable(dClassType, bClassType));
+ assertTrue(TypeUtils.isAssignable(eClassType, bClassType));
+ assertTrue(TypeUtils.isAssignable(fClassType, bClassType));
- final Type intComparableArrayType = getClass().getField("intWildcardComparable").getGenericType();
- assertTrue(TypeUtils.isAssignable(Integer[].class, intComparableArrayType));
+ assertTrue(TypeUtils.isAssignable(dClassType, cClassType));
+ assertTrue(TypeUtils.isAssignable(eClassType, cClassType));
+ assertTrue(TypeUtils.isAssignable(fClassType, cClassType));
+
+ assertTrue(TypeUtils.isAssignable(eClassType, dClassType));
+ assertTrue(TypeUtils.isAssignable(fClassType, dClassType));
+
+ assertTrue(TypeUtils.isAssignable(fClassType, eClassType));
}
@Test
- public void testIsAssignableGenericListTypes() throws NoSuchFieldException {
- final Type rawListType = GenericTypeHolder.class.getDeclaredField("rawList").getGenericType();
- final Type objectListType = GenericTypeHolder.class.getDeclaredField("objectList").getGenericType();
- final Type unboundListType = GenericTypeHolder.class.getDeclaredField("unboundList").getGenericType();
- final Type superObjectListType = GenericTypeHolder.class.getDeclaredField("superObjectList").getGenericType();
- final Type stringListType = GenericTypeHolder.class.getDeclaredField("stringList").getGenericType();
- final Type subStringListType = GenericTypeHolder.class.getDeclaredField("subStringList").getGenericType();
- final Type superStringListType = GenericTypeHolder.class.getDeclaredField("superStringList").getGenericType();
+ public void testIsAssignableGenericArrayTypeToObject() {
+ final Class<Constructor> rawClass = Constructor.class;
+ final Class<Insets> typeArgClass = Insets.class;
+ // Builds a ParameterizedType for Constructor<Insets>
+ final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
+ assertEquals(rawClass, paramType.getRawType());
+ assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
- assertTrue(TypeUtils.isAssignable(rawListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, objectListType));
- assertTrue(TypeUtils.isAssignable(objectListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, unboundListType));
- assertTrue(TypeUtils.isAssignable(unboundListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, superObjectListType));
- assertTrue(TypeUtils.isAssignable(superObjectListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, stringListType));
- assertTrue(TypeUtils.isAssignable(stringListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, subStringListType));
- assertTrue(TypeUtils.isAssignable(subStringListType, rawListType));
- assertTrue(TypeUtils.isAssignable(rawListType, superStringListType));
- assertTrue(TypeUtils.isAssignable(superStringListType, rawListType));
+ assertTrue(Object.class.isAssignableFrom(paramType.getClass()));
+ assertFalse(paramType.getClass().isAssignableFrom(Object.class));
- assertTrue(TypeUtils.isAssignable(objectListType, objectListType));
- assertTrue(TypeUtils.isAssignable(objectListType, unboundListType));
- assertFalse(TypeUtils.isAssignable(unboundListType, objectListType));
- assertTrue(TypeUtils.isAssignable(objectListType, superObjectListType));
- assertFalse(TypeUtils.isAssignable(superObjectListType, objectListType));
- assertFalse(TypeUtils.isAssignable(objectListType, stringListType));
- assertFalse(TypeUtils.isAssignable(stringListType, objectListType));
- assertFalse(TypeUtils.isAssignable(objectListType, subStringListType));
- assertFalse(TypeUtils.isAssignable(subStringListType, objectListType));
- assertTrue(TypeUtils.isAssignable(objectListType, superStringListType));
- assertFalse(TypeUtils.isAssignable(superStringListType, objectListType));
+ final Type testType = Object.class;
+ assertTrue(TypeUtils.isAssignable(paramType, testType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
+ assertFalse(TypeUtils.isAssignable(testType, paramType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
+ }
- assertTrue(TypeUtils.isAssignable(unboundListType, unboundListType));
- assertFalse(TypeUtils.isAssignable(unboundListType, superObjectListType));
- assertTrue(TypeUtils.isAssignable(superObjectListType, unboundListType));
- assertFalse(TypeUtils.isAssignable(unboundListType, stringListType));
- assertTrue(TypeUtils.isAssignable(stringListType, unboundListType));
- assertFalse(TypeUtils.isAssignable(unboundListType, subStringListType));
- assertTrue(TypeUtils.isAssignable(subStringListType, unboundListType));
- assertFalse(TypeUtils.isAssignable(unboundListType, superStringListType));
- assertTrue(TypeUtils.isAssignable(superStringListType, unboundListType));
+ @Test
+ public void testIsAssignableGenericArrayTypeToParameterizedType() {
+ final Class<Constructor> rawClass = Constructor.class;
+ final Class<Insets> typeArgClass = Insets.class;
+ // Builds a ParameterizedType for Constructor<Insets>
+ final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
+ assertEquals(rawClass, paramType.getRawType());
+ assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
- assertTrue(TypeUtils.isAssignable(superObjectListType, superObjectListType));
- assertFalse(TypeUtils.isAssignable(superObjectListType, stringListType));
- assertFalse(TypeUtils.isAssignable(stringListType, superObjectListType));
- assertFalse(TypeUtils.isAssignable(superObjectListType, subStringListType));
- assertFalse(TypeUtils.isAssignable(subStringListType, superObjectListType));
- assertTrue(TypeUtils.isAssignable(superObjectListType, superStringListType));
- assertFalse(TypeUtils.isAssignable(superStringListType, superObjectListType));
+ assertFalse(GenericArrayType.class.isAssignableFrom(paramType.getClass()));
+ assertFalse(paramType.getClass().isAssignableFrom(GenericArrayType.class));
- assertTrue(TypeUtils.isAssignable(stringListType, stringListType));
- assertTrue(TypeUtils.isAssignable(stringListType, subStringListType));
- assertFalse(TypeUtils.isAssignable(subStringListType, stringListType));
- assertTrue(TypeUtils.isAssignable(stringListType, superStringListType));
- assertFalse(TypeUtils.isAssignable(superStringListType, stringListType));
+ final GenericArrayType testType = TypeUtils.genericArrayType(paramType);
+ assertFalse(TypeUtils.isAssignable(paramType, testType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
+ assertFalse(TypeUtils.isAssignable(testType, paramType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
+ }
- assertTrue(TypeUtils.isAssignable(subStringListType, subStringListType));
- assertFalse(TypeUtils.isAssignable(subStringListType, superStringListType));
- assertFalse(TypeUtils.isAssignable(superStringListType, subStringListType));
- assertTrue(TypeUtils.isAssignable(superStringListType, superStringListType));
+ @Test
+ @Disabled("TODO")
+ public void testIsAssignableGenericArrayTypeToWildcardType() {
+ final Class<Constructor> rawClass = Constructor.class;
+ final Class<Insets> typeArgClass = Insets.class;
+ // Builds a ParameterizedType for Constructor<Insets>
+ final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
+ assertEquals(rawClass, paramType.getRawType());
+ assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
+
+ assertFalse(WildcardType.class.isAssignableFrom(paramType.getClass()));
+ assertFalse(paramType.getClass().isAssignableFrom(WildcardType.class));
+
+ final WildcardType testType = TypeUtils.WILDCARD_ALL;
+ // TODO This test returns true unlike the test above.
+ // Is this a bug in this test or in the main code?
+ assertFalse(TypeUtils.isAssignable(paramType, testType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
+ assertFalse(TypeUtils.isAssignable(testType, paramType),
+ () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
+ }
+
+ @Test
+ public void testIsAssignableGenericClassHierarchy() throws NoSuchFieldException {
+ /*
+ * <<This>>
+ * / / \ \
+ * <<And>> That Other Tester
+ * \ / |
+ * The Thing
+ */
+ final Type disType = getClass().getField("dis").getGenericType(); // This is superinterface
+ final Type datType = getClass().getField("dat").getGenericType(); // That implements This
+ final Type dat2Type = getClass().getField("dat2").getGenericType();
+ final Type dat3Type = getClass().getField("dat3").getGenericType();
+ final Type daType = getClass().getField("da").getGenericType(); // The extends That and implements And
+ final Type uhderType = getClass().getField("uhder").getGenericType(); // Other implements This
+ final Type dingType = getClass().getField("ding").getGenericType(); // Thing extends Other
+ final Type testerType = getClass().getField("tester").getGenericType(); // Tester implements This
+ final Type tester2Type = getClass().getField("tester2").getGenericType();
+
+ assertTrue(TypeUtils.isAssignable(datType, disType));
+ assertFalse(TypeUtils.isAssignable(daType, disType));
+ assertTrue(TypeUtils.isAssignable(uhderType, disType));
+ assertFalse(TypeUtils.isAssignable(dingType, disType));
+ assertTrue(TypeUtils.isAssignable(testerType, disType));
+ assertFalse(TypeUtils.isAssignable(tester2Type, disType));
+
+ assertFalse(TypeUtils.isAssignable(dat2Type, datType));
+ assertFalse(TypeUtils.isAssignable(datType, dat2Type));
+ assertFalse(TypeUtils.isAssignable(dat3Type, datType));
+ }
+
+ @Test
+ public void testIsAssignableGenericComparableTypes() throws NoSuchFieldException {
+ final Type intComparableType = getClass().getField("intComparable").getGenericType();
+ assertTrue(TypeUtils.isAssignable(int.class, intComparableType));
+
+ final Type longComparableType = getClass().getField("longComparable").getGenericType();
+ assertFalse(TypeUtils.isAssignable(int.class, longComparableType));
+ assertFalse(TypeUtils.isAssignable(Integer.class, longComparableType));
+
+ final Type intComparableArrayType = getClass().getField("intWildcardComparable").getGenericType();
+ assertTrue(TypeUtils.isAssignable(Integer[].class, intComparableArrayType));
}
@Test
@@ -727,117 +775,69 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
}
@Test
- public void testIsAssignableDirectClassHierarchy() throws NoSuchFieldException {
- final Type bClassType = AClass.class.getField("bClass").getGenericType(); // B is superclass
- final Type cClassType = AClass.class.getField("cClass").getGenericType(); // C subclass of B
- final Type dClassType = AClass.class.getField("dClass").getGenericType(); // D subclass of C
- final Type eClassType = AClass.class.getField("eClass").getGenericType(); // E subclass of D
- final Type fClassType = AClass.class.getField("fClass").getGenericType(); // F subclass of E
-
- assertTrue(TypeUtils.isAssignable(cClassType, bClassType));
- assertTrue(TypeUtils.isAssignable(dClassType, bClassType));
- assertTrue(TypeUtils.isAssignable(eClassType, bClassType));
- assertTrue(TypeUtils.isAssignable(fClassType, bClassType));
-
- assertTrue(TypeUtils.isAssignable(dClassType, cClassType));
- assertTrue(TypeUtils.isAssignable(eClassType, cClassType));
- assertTrue(TypeUtils.isAssignable(fClassType, cClassType));
-
- assertTrue(TypeUtils.isAssignable(eClassType, dClassType));
- assertTrue(TypeUtils.isAssignable(fClassType, dClassType));
-
- assertTrue(TypeUtils.isAssignable(fClassType, eClassType));
- }
-
- @Test
- public void testIsAssignableGenericClassHierarchy() throws NoSuchFieldException {
- /*
- * <<This>>
- * / / \ \
- * <<And>> That Other Tester
- * \ / |
- * The Thing
- */
- final Type disType = getClass().getField("dis").getGenericType(); // This is superinterface
- final Type datType = getClass().getField("dat").getGenericType(); // That implements This
- final Type dat2Type = getClass().getField("dat2").getGenericType();
- final Type dat3Type = getClass().getField("dat3").getGenericType();
- final Type daType = getClass().getField("da").getGenericType(); // The extends That and implements And
- final Type uhderType = getClass().getField("uhder").getGenericType(); // Other implements This
- final Type dingType = getClass().getField("ding").getGenericType(); // Thing extends Other
- final Type testerType = getClass().getField("tester").getGenericType(); // Tester implements This
- final Type tester2Type = getClass().getField("tester2").getGenericType();
-
- assertTrue(TypeUtils.isAssignable(datType, disType));
- assertFalse(TypeUtils.isAssignable(daType, disType));
- assertTrue(TypeUtils.isAssignable(uhderType, disType));
- assertFalse(TypeUtils.isAssignable(dingType, disType));
- assertTrue(TypeUtils.isAssignable(testerType, disType));
- assertFalse(TypeUtils.isAssignable(tester2Type, disType));
-
- assertFalse(TypeUtils.isAssignable(dat2Type, datType));
- assertFalse(TypeUtils.isAssignable(datType, dat2Type));
- assertFalse(TypeUtils.isAssignable(dat3Type, datType));
- }
-
- @Test
- public void testIsAssignableGenericArrayTypeToObject() {
- final Class<Constructor> rawClass = Constructor.class;
- final Class<Insets> typeArgClass = Insets.class;
- // Builds a ParameterizedType for Constructor<Insets>
- final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
- assertEquals(rawClass, paramType.getRawType());
- assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
-
- assertTrue(Object.class.isAssignableFrom(paramType.getClass()));
- assertFalse(paramType.getClass().isAssignableFrom(Object.class));
-
- final Type testType = Object.class;
- assertTrue(TypeUtils.isAssignable(paramType, testType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
- assertFalse(TypeUtils.isAssignable(testType, paramType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
- }
+ public void testIsAssignableGenericListTypes() throws NoSuchFieldException {
+ final Type rawListType = GenericTypeHolder.class.getDeclaredField("rawList").getGenericType();
+ final Type objectListType = GenericTypeHolder.class.getDeclaredField("objectList").getGenericType();
+ final Type unboundListType = GenericTypeHolder.class.getDeclaredField("unboundList").getGenericType();
+ final Type superObjectListType = GenericTypeHolder.class.getDeclaredField("superObjectList").getGenericType();
+ final Type stringListType = GenericTypeHolder.class.getDeclaredField("stringList").getGenericType();
+ final Type subStringListType = GenericTypeHolder.class.getDeclaredField("subStringList").getGenericType();
+ final Type superStringListType = GenericTypeHolder.class.getDeclaredField("superStringList").getGenericType();
- @Test
- public void testIsAssignableGenericArrayTypeToParameterizedType() {
- final Class<Constructor> rawClass = Constructor.class;
- final Class<Insets> typeArgClass = Insets.class;
- // Builds a ParameterizedType for Constructor<Insets>
- final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
- assertEquals(rawClass, paramType.getRawType());
- assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
+ assertTrue(TypeUtils.isAssignable(rawListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, objectListType));
+ assertTrue(TypeUtils.isAssignable(objectListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, unboundListType));
+ assertTrue(TypeUtils.isAssignable(unboundListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, superObjectListType));
+ assertTrue(TypeUtils.isAssignable(superObjectListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, stringListType));
+ assertTrue(TypeUtils.isAssignable(stringListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, subStringListType));
+ assertTrue(TypeUtils.isAssignable(subStringListType, rawListType));
+ assertTrue(TypeUtils.isAssignable(rawListType, superStringListType));
+ assertTrue(TypeUtils.isAssignable(superStringListType, rawListType));
- assertFalse(GenericArrayType.class.isAssignableFrom(paramType.getClass()));
- assertFalse(paramType.getClass().isAssignableFrom(GenericArrayType.class));
+ assertTrue(TypeUtils.isAssignable(objectListType, objectListType));
+ assertTrue(TypeUtils.isAssignable(objectListType, unboundListType));
+ assertFalse(TypeUtils.isAssignable(unboundListType, objectListType));
+ assertTrue(TypeUtils.isAssignable(objectListType, superObjectListType));
+ assertFalse(TypeUtils.isAssignable(superObjectListType, objectListType));
+ assertFalse(TypeUtils.isAssignable(objectListType, stringListType));
+ assertFalse(TypeUtils.isAssignable(stringListType, objectListType));
+ assertFalse(TypeUtils.isAssignable(objectListType, subStringListType));
+ assertFalse(TypeUtils.isAssignable(subStringListType, objectListType));
+ assertTrue(TypeUtils.isAssignable(objectListType, superStringListType));
+ assertFalse(TypeUtils.isAssignable(superStringListType, objectListType));
- final GenericArrayType testType = TypeUtils.genericArrayType(paramType);
- assertFalse(TypeUtils.isAssignable(paramType, testType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
- assertFalse(TypeUtils.isAssignable(testType, paramType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
- }
+ assertTrue(TypeUtils.isAssignable(unboundListType, unboundListType));
+ assertFalse(TypeUtils.isAssignable(unboundListType, superObjectListType));
+ assertTrue(TypeUtils.isAssignable(superObjectListType, unboundListType));
+ assertFalse(TypeUtils.isAssignable(unboundListType, stringListType));
+ assertTrue(TypeUtils.isAssignable(stringListType, unboundListType));
+ assertFalse(TypeUtils.isAssignable(unboundListType, subStringListType));
+ assertTrue(TypeUtils.isAssignable(subStringListType, unboundListType));
+ assertFalse(TypeUtils.isAssignable(unboundListType, superStringListType));
+ assertTrue(TypeUtils.isAssignable(superStringListType, unboundListType));
- @Test
- @Disabled("TODO")
- public void testIsAssignableGenericArrayTypeToWildcardType() {
- final Class<Constructor> rawClass = Constructor.class;
- final Class<Insets> typeArgClass = Insets.class;
- // Builds a ParameterizedType for Constructor<Insets>
- final ParameterizedType paramType = TypeUtils.parameterize(rawClass, typeArgClass);
- assertEquals(rawClass, paramType.getRawType());
- assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
+ assertTrue(TypeUtils.isAssignable(superObjectListType, superObjectListType));
+ assertFalse(TypeUtils.isAssignable(superObjectListType, stringListType));
+ assertFalse(TypeUtils.isAssignable(stringListType, superObjectListType));
+ assertFalse(TypeUtils.isAssignable(superObjectListType, subStringListType));
+ assertFalse(TypeUtils.isAssignable(subStringListType, superObjectListType));
+ assertTrue(TypeUtils.isAssignable(superObjectListType, superStringListType));
+ assertFalse(TypeUtils.isAssignable(superStringListType, superObjectListType));
- assertFalse(WildcardType.class.isAssignableFrom(paramType.getClass()));
- assertFalse(paramType.getClass().isAssignableFrom(WildcardType.class));
+ assertTrue(TypeUtils.isAssignable(stringListType, stringListType));
+ assertTrue(TypeUtils.isAssignable(stringListType, subStringListType));
+ assertFalse(TypeUtils.isAssignable(subStringListType, stringListType));
+ assertTrue(TypeUtils.isAssignable(stringListType, superStringListType));
+ assertFalse(TypeUtils.isAssignable(superStringListType, stringListType));
- final WildcardType testType = TypeUtils.WILDCARD_ALL;
- // TODO This test returns true unlike the test above.
- // Is this a bug in this test or in the main code?
- assertFalse(TypeUtils.isAssignable(paramType, testType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", paramType, testType));
- assertFalse(TypeUtils.isAssignable(testType, paramType),
- () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
+ assertTrue(TypeUtils.isAssignable(subStringListType, subStringListType));
+ assertFalse(TypeUtils.isAssignable(subStringListType, superStringListType));
+ assertFalse(TypeUtils.isAssignable(superStringListType, subStringListType));
+ assertTrue(TypeUtils.isAssignable(superStringListType, superStringListType));
}
@SuppressWarnings("boxing") // boxing is deliberate here