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 2020/12/22 21:07:08 UTC
[commons-lang] branch master updated (5aab41b -> 31ede55)
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 5aab41b Update for new class.
new 44b0bb5 Use ArraySorter.
new 31ede55 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:
src/main/java/org/apache/commons/lang3/ArrayUtils.java | 3 +--
.../java/org/apache/commons/lang3/builder/HashCodeBuilder.java | 5 ++---
.../apache/commons/lang3/builder/ReflectionToStringBuilder.java | 7 +++----
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java | 2 +-
src/main/java/org/apache/commons/lang3/text/StrMatcher.java | 4 ++--
5 files changed, 9 insertions(+), 12 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 31ede5565bf19df016b945849d19d18304bfc6e4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Dec 22 16:07:02 2020 -0500
Use final.
---
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 68c2541..7b1a476 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -755,7 +755,7 @@ public class MethodUtils {
.filter(method -> method.getName().equals(methodName))
.forEach(methods::add);
- for (Method method : methods) {
+ for (final Method method : methods) {
if (Arrays.deepEquals(method.getParameterTypes(), parameterTypes)) {
return method;
}
[commons-lang] 01/02: Use ArraySorter.
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 44b0bb5273db99db4a191b8b24f5676bd7a9c523
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Dec 22 16:06:55 2020 -0500
Use ArraySorter.
---
src/main/java/org/apache/commons/lang3/ArrayUtils.java | 3 +--
.../java/org/apache/commons/lang3/builder/HashCodeBuilder.java | 5 ++---
.../apache/commons/lang3/builder/ReflectionToStringBuilder.java | 7 +++----
src/main/java/org/apache/commons/lang3/text/StrMatcher.java | 4 ++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index 46bf1f2..889d80b 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -5231,8 +5231,7 @@ public static int indexOf(final int[] array, final int valueToFind, int startInd
static Object removeAll(final Object array, final int... indices) {
final int length = getLength(array);
int diff = 0; // number of distinct indexes, i.e. number of entries that will be removed
- final int[] clonedIndices = clone(indices);
- Arrays.sort(clonedIndices);
+ final int[] clonedIndices = ArraySorter.sort(clone(indices));
// identify length of result array
if (isNotEmpty(clonedIndices)) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index 0a95a74..75eb3e3 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -20,12 +20,12 @@ package org.apache.commons.lang3.builder;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.lang3.ArraySorter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Validate;
@@ -191,8 +191,7 @@ public class HashCodeBuilder implements Builder<Integer> {
try {
register(object);
// The elements in the returned array are not sorted and are not in any particular order.
- final Field[] fields = clazz.getDeclaredFields();
- Arrays.sort(fields, Comparator.comparing(Field::getName));
+ final Field[] fields = ArraySorter.sort(clazz.getDeclaredFields(), Comparator.comparing(Field::getName));
AccessibleObject.setAccessible(fields, true);
for (final Field field : fields) {
if (!ArrayUtils.contains(excludeFields, field.getName())
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index 66eb15c..63ad959 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -26,6 +26,7 @@ import java.util.Collection;
import java.util.Comparator;
import java.util.List;
+import org.apache.commons.lang3.ArraySorter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.Validate;
@@ -640,8 +641,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
return;
}
// The elements in the returned array are not sorted and are not in any particular order.
- final Field[] fields = clazz.getDeclaredFields();
- Arrays.sort(fields, Comparator.comparing(Field::getName));
+ final Field[] fields = ArraySorter.sort(clazz.getDeclaredFields(), Comparator.comparing(Field::getName));
AccessibleObject.setAccessible(fields, true);
for (final Field field : fields) {
final String fieldName = field.getName();
@@ -801,8 +801,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
this.excludeFieldNames = null;
} else {
//clone and remove nulls
- this.excludeFieldNames = toNoNullStringArray(excludeFieldNamesParam);
- Arrays.sort(this.excludeFieldNames);
+ this.excludeFieldNames = ArraySorter.sort(toNoNullStringArray(excludeFieldNamesParam));
}
return this;
}
diff --git a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
index 9c657a1..1d0df23 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrMatcher.java
@@ -18,6 +18,7 @@ package org.apache.commons.lang3.text;
import java.util.Arrays;
+import org.apache.commons.lang3.ArraySorter;
import org.apache.commons.lang3.StringUtils;
/**
@@ -284,8 +285,7 @@ public abstract class StrMatcher {
* @param chars the characters to match, must not be null
*/
CharSetMatcher(final char[] chars) {
- this.chars = chars.clone();
- Arrays.sort(this.chars);
+ this.chars = ArraySorter.sort(chars.clone());
}
/**