refactoring of make accessible mechanism

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/io/AbstractMappedClassFieldObserver.java

@@ -27,7 +27,6 @@
 import com.igormaznitsa.jbbp.utils.DslBinCustom;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import com.igormaznitsa.jbbp.utils.ReflectUtils;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -117,7 +116,9 @@ protected void processObject(final Object obj, Field field, final Object customF
         final Bin clazzAnno = clazzToProcess.getAnnotation(Bin.class);
 
         for (Field f : clazzToProcess.getDeclaredFields()) {
-          f = ReflectUtils.makeAccessible(f);
+          if (!ReflectUtils.isPotentiallyAccessibleField(f)) {
+            f = ReflectUtils.makeAccessible(f);
+          }
 
           final int modifiers = f.getModifiers();
           if (Modifier.isTransient(modifiers) || Modifier.isStatic(modifiers) || f.getName().indexOf('$') >= 0) {
@@ -146,7 +147,9 @@ protected void processObject(final Object obj, Field field, final Object customF
       }
     }
 
-    field = ReflectUtils.makeAccessible(field);
+    if (field != null && !ReflectUtils.isPotentiallyAccessibleField(field)) {
+      field = ReflectUtils.makeAccessible(field);
+    }
 
     final Bin clazzAnno = obj.getClass().getAnnotation(Bin.class);
     final DslBinCustom clazzCustomAnno = obj.getClass().getAnnotation(DslBinCustom.class);
@@ -472,7 +475,7 @@ protected void processObjectField(final Object obj, final Field field, final Bin
               this.onArrayStart(obj, field, annotation, len);
               for (int i = 0; i < len; i++) {
                 final Object value = Array.get(array, i);
-                String nullableStrValue = value == null ? null : String.valueOf (value);
+                String nullableStrValue = value == null ? null : String.valueOf(value);
                 if (nullableStrValue != null && reverseBits) {
                   nullableStrValue = JBBPFieldString.reverseBits(nullableStrValue);
                 }

jbbp/src/main/java/com/igormaznitsa/jbbp/mapper/JBBPMapper.java

@@ -38,7 +38,6 @@
 import com.igormaznitsa.jbbp.utils.Function;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import com.igormaznitsa.jbbp.utils.ReflectUtils;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -314,7 +313,9 @@ public static <T> T map(final JBBPFieldStruct rootStructure, final T instance, f
           continue;
         }
 
-        mappingField = ReflectUtils.makeAccessible(mappingField);
+        if (!ReflectUtils.isPotentiallyAccessibleField(mappingField)) {
+          mappingField = ReflectUtils.makeAccessible(mappingField);
+        }
 
         final Bin fieldAnno = mappingField.getAnnotation(Bin.class);
         final Bin mappedAnno;

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPTextWriterExtraAdapter.java

@@ -18,7 +18,6 @@
 
 import com.igormaznitsa.jbbp.exceptions.JBBPException;
 import com.igormaznitsa.jbbp.mapper.Bin;
-
 import java.io.IOException;
 import java.lang.reflect.Field;
 
@@ -97,7 +96,11 @@ public void onReachedMaxValueNumberForLine(final JBBPTextWriter context) throws
   public Object extractFieldValue(final Object instance, final Field field) {
     JBBPUtils.assertNotNull(field, "Field must not be null");
     try {
-      return ReflectUtils.makeAccessible(field).get(instance);
+      if (ReflectUtils.isPotentiallyAccessibleField(field)) {
+        return field.get(instance);
+      } else {
+        return ReflectUtils.makeAccessible(field).get(instance);
+      }
     } catch (Exception ex) {
       throw new JBBPException("Can't extract value from field for exception", ex);
     }

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/ReflectUtils.java

@@ -1,6 +1,8 @@
 package com.igormaznitsa.jbbp.utils;
 
 import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Queue;
@@ -21,6 +23,19 @@ public final class ReflectUtils {
   private ReflectUtils() {
   }
 
+  public static boolean isPotentiallyAccessibleClass(final Class<?> klazz) {
+    if (klazz.isLocalClass() && !isPotentiallyAccessibleClass(klazz.getEnclosingClass())) {
+      return false;
+    }
+    return Modifier.isPublic(klazz.getModifiers());
+  }
+
+  public static boolean isPotentiallyAccessibleField(final Field field) {
+    return isPotentiallyAccessibleClass(field.getDeclaringClass())
+        && Modifier.isPublic(field.getModifiers())
+        && !Modifier.isFinal(field.getModifiers());
+  }
+
   /**
    * Make accessible an accessible object, AccessController.doPrivileged will be
    * called.

jbbp/src/test/java/com/igormaznitsa/jbbp/TestUtils.java

@@ -16,13 +16,10 @@
 
 package com.igormaznitsa.jbbp;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Locale;
-import java.util.zip.CRC32;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+
+import java.util.Locale;
 import org.apache.commons.codec.digest.PureJavaCrc32;
 
 /**
@@ -36,27 +33,6 @@ public enum TestUtils {
    */
   public static final float FLOAT_DELTA = Float.MIN_VALUE;
 
-
-  /**
-   * Inject new value into final field
-   *
-   * @param klazz     a class which field must be injected, must not be null
-   * @param instance  the instance of the class, it can be null for static fields
-   * @param fieldName the field name, must not be null
-   * @param value     the value to be injected
-   * @throws Exception it will be thrown for any error
-   */
-  public static void injectDeclaredFinalFieldValue(final Class<?> klazz, final Object instance, final String fieldName, final Object value) throws Exception {
-    final Field field = klazz.getDeclaredField(fieldName);
-    field.setAccessible(true);
-
-    final Field modifiersField = Field.class.getDeclaredField("modifiers");
-    modifiersField.setAccessible(true);
-    modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
-    field.set(instance, value);
-  }
-
   /**
    * Read field value, also allows to provide dot-separated chain of fields
    *