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 2021/11/14 22:02:42 UTC

[commons-lang] branch master updated: Internal refactoring.

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


The following commit(s) were added to refs/heads/master by this push:
     new e9555ff  Internal refactoring.
e9555ff is described below

commit e9555ffa39a30f2be5a5ad619abc40f6723e20b6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 14 17:02:39 2021 -0500

    Internal refactoring.
---
 src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java  | 4 ++--
 src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
index 612a46a..f2900a2 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
@@ -290,7 +290,7 @@ public class FieldUtils {
      */
     public static Object readStaticField(final Field field, final boolean forceAccess) throws IllegalAccessException {
         Validate.notNull(field, "field");
-        Validate.isTrue(Modifier.isStatic(field.getModifiers()), "The field '%s' is not static", field.getName());
+        Validate.isTrue(MemberUtils.isStatic(field), "The field '%s' is not static", field.getName());
         return readField(field, (Object) null, forceAccess);
     }
 
@@ -544,7 +544,7 @@ public class FieldUtils {
      */
     public static void writeStaticField(final Field field, final Object value, final boolean forceAccess) throws IllegalAccessException {
         Validate.notNull(field, "field");
-        Validate.isTrue(Modifier.isStatic(field.getModifiers()), "The field %s.%s is not static", field.getDeclaringClass().getName(),
+        Validate.isTrue(MemberUtils.isStatic(field), "The field %s.%s is not static", field.getDeclaringClass().getName(),
                 field.getName());
         writeField(field, (Object) null, value, forceAccess);
     }
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
index 177c55f..1f2df0f 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java
@@ -78,6 +78,15 @@ abstract class MemberUtils {
     }
 
     /**
+     * Returns whether a {@link Member} is static.
+     * @param m Member to check
+     * @return {@code true} if {@code m} is static
+     */
+    static boolean isStatic(final Member m) {
+        return m != null && Modifier.isStatic(m.getModifiers());
+    }
+
+    /**
      * Returns whether a {@link Member} is accessible.
      * @param m Member to check
      * @return {@code true} if {@code m} is accessible