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 066b9d3047a7429b0e1888f1931f72327641809b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Jul 31 08:51:12 2024 -0400
Sort members
---
.../apache/commons/lang3/reflect/TypeUtils.java | 72 +++++++++++-----------
.../commons/lang3/time/DurationFormatUtils.java | 12 ++--
.../commons/lang3/builder/DiffBuilderTest.java | 20 +++---
.../lang3/time/DurationFormatUtilsTest.java | 12 ++--
4 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
index 041459bf1..09d9391ca 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
@@ -49,38 +49,6 @@ import org.apache.commons.lang3.builder.Builder;
*/
public class TypeUtils {
- /**
- * Ampersand sign joiner.
- */
- // @formatter:off
- private static final AppendableJoiner<Type> AMP_JOINER =
AppendableJoiner.<Type>builder()
- .setDelimiter(" & ")
- .setElementAppender((a, e) -> a.append(TypeUtils.toString(e)))
- .get();
- // @formatter:on
-
- /**
- * Method classToString joiner.
- */
- // @formatter:off
- private static final AppendableJoiner<TypeVariable<Class<?>>> CTJ_JOINER =
AppendableJoiner.<TypeVariable<Class<?>>>builder()
- .setDelimiter(", ")
- .setElementAppender((a, e) -> a.append(TypeUtils.anyToString(e)))
- .get();
- // @formatter:on
-
- /**
- * Greater than and lesser than sign joiner.
- */
- // @formatter:off
- private static final AppendableJoiner<Object> GT_JOINER =
AppendableJoiner.builder()
- .setPrefix("<")
- .setSuffix(">")
- .setDelimiter(", ")
- .setElementAppender((a, e) -> a.append(TypeUtils.anyToString(e)))
- .get();
- // @formatter:on
-
/**
* GenericArrayType implementation class.
*/
@@ -317,6 +285,38 @@ public class TypeUtils {
}
}
+ /**
+ * Ampersand sign joiner.
+ */
+ // @formatter:off
+ private static final AppendableJoiner<Type> AMP_JOINER =
AppendableJoiner.<Type>builder()
+ .setDelimiter(" & ")
+ .setElementAppender((a, e) -> a.append(TypeUtils.toString(e)))
+ .get();
+ // @formatter:on
+
+ /**
+ * Method classToString joiner.
+ */
+ // @formatter:off
+ private static final AppendableJoiner<TypeVariable<Class<?>>> CTJ_JOINER =
AppendableJoiner.<TypeVariable<Class<?>>>builder()
+ .setDelimiter(", ")
+ .setElementAppender((a, e) -> a.append(TypeUtils.anyToString(e)))
+ .get();
+ // @formatter:on
+
+ /**
+ * Greater than and lesser than sign joiner.
+ */
+ // @formatter:off
+ private static final AppendableJoiner<Object> GT_JOINER =
AppendableJoiner.builder()
+ .setPrefix("<")
+ .setSuffix(">")
+ .setDelimiter(", ")
+ .setElementAppender((a, e) -> a.append(TypeUtils.anyToString(e)))
+ .get();
+ // @formatter:on
+
/**
* A wildcard instance matching {@code ?}.
*
@@ -324,6 +324,10 @@ public class TypeUtils {
*/
public static final WildcardType WILDCARD_ALL =
wildcardType().withUpperBounds(Object.class).build();
+ private static <T> String anyToString(final T object) {
+ return object instanceof Type ? toString((Type) object) :
object.toString();
+ }
+
private static void appendRecursiveTypes(final StringBuilder builder,
final int[] recursiveTypeIndexes, final Type[] argumentTypes) {
for (int i = 0; i < recursiveTypeIndexes.length; i++) {
// toString() or SO
@@ -1632,10 +1636,6 @@ public class TypeUtils {
return
buf.append(':').append(typeVariableToString(typeVariable)).toString();
}
- private static <T> String anyToString(final T object) {
- return object instanceof Type ? toString((Type) object) :
object.toString();
- }
-
/**
* Formats a given type as a Java-esque String.
*
diff --git
a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index 01271bff1..4ce849039 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -79,12 +79,6 @@ import org.apache.commons.lang3.Validate;
*/
public class DurationFormatUtils {
- private static final int MINUTES_PER_HOUR = 60;
-
- private static final int SECONDS_PER_MINUTES = 60;
-
- private static final int HOURS_PER_DAY = 24;
-
/**
* Element that is parsed from the format pattern.
*/
@@ -198,6 +192,12 @@ public class DurationFormatUtils {
}
}
+ private static final int MINUTES_PER_HOUR = 60;
+
+ private static final int SECONDS_PER_MINUTES = 60;
+
+ private static final int HOURS_PER_DAY = 24;
+
/**
* Pattern used with {@link FastDateFormat} and {@link SimpleDateFormat}
* for the ISO 8601 period format used in durations.
diff --git
a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
index a4804ab7c..227b58945 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
@@ -371,29 +371,29 @@ public class DiffBuilderTest extends AbstractLangTest {
}
@Test
- public void testNestedDiffableYesNestedOnly() {
+ public void testNestedDiffableYesNestedNot() {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
- class2.nestedDiffableField.booleanField = false;
+ class2.intField = 9;
final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
- assertEquals(Object.class, diff.getType());
- assertEquals(Boolean.TRUE, diff.getLeft());
- assertEquals(Boolean.FALSE, diff.getRight());
+ assertEquals(Integer.class, diff.getType());
+ assertEquals(1, diff.getLeft());
+ assertEquals(9, diff.getRight());
}
@Test
- public void testNestedDiffableYesNestedNot() {
+ public void testNestedDiffableYesNestedOnly() {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
- class2.intField = 9;
+ class2.nestedDiffableField.booleanField = false;
final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
- assertEquals(Integer.class, diff.getType());
- assertEquals(1, diff.getLeft());
- assertEquals(9, diff.getRight());
+ assertEquals(Object.class, diff.getType());
+ assertEquals(Boolean.TRUE, diff.getLeft());
+ assertEquals(Boolean.FALSE, diff.getRight());
}
@Test
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 7df279573..1fc92ca33 100644
--- a/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/DurationFormatUtilsTest.java
@@ -521,12 +521,6 @@ public class DurationFormatUtilsTest extends
AbstractLangTest {
assertThrows(IllegalArgumentException.class, () ->
DurationFormatUtils.formatPeriodISO(5000, 2000));
}
- // https://issues.apache.org/jira/browse/LANG-281
- @Test
- public void testJiraLang281() {
- assertEqualDuration("09", new int[] { 2005, 11, 31, 0, 0, 0 }, new
int[] { 2006, 9, 6, 0, 0, 0 }, "MM");
- }
-
/**
* Takes 8 seconds to run.
*/
@@ -540,6 +534,12 @@ public class DurationFormatUtilsTest extends
AbstractLangTest {
}
}
+ // https://issues.apache.org/jira/browse/LANG-281
+ @Test
+ public void testJiraLang281() {
+ assertEqualDuration("09", new int[] { 2005, 11, 31, 0, 0, 0 }, new
int[] { 2006, 9, 6, 0, 0, 0 }, "MM");
+ }
+
@Test
public void testLANG815() {
final Calendar calendar = Calendar.getInstance();
