Explicitly test if objects are accessible through reflection.

Alexandre Dutra · olim7t · commit 4df2ead70d72 · 2016-07-22T09:47:08.000-07:00
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/PropertyMapper.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/PropertyMapper.java
@@ -58,9 +58,17 @@ class PropertyMapper {
         getter = ReflectionUtils.findGetter(property);
         setter = ReflectionUtils.findSetter(property);
         annotations = ReflectionUtils.scanPropertyAnnotations(field, property);
+        if (field != null)
+            ReflectionUtils.tryMakeAccessible(field);
+        if (getter != null)
+            ReflectionUtils.tryMakeAccessible(getter);
+        if (setter != null)
+            ReflectionUtils.tryMakeAccessible(setter);
         if (!isTransient()) {
-            checkState(field != null || getter != null, "Property '%s' is not readable", propertyName);
-            checkState(field != null || setter != null, "Property '%s' is not writable", propertyName);
+            checkState((field != null && field.isAccessible()) || (getter != null && getter.isAccessible()),
+                    "Property '%s' is not readable", propertyName);
+            checkState((field != null && field.isAccessible()) || (setter != null && setter.isAccessible()),
+                    "Property '%s' is not writable", propertyName);
         }
         columnName = inferColumnName();
         position = inferPosition();
@@ -71,7 +79,7 @@ class PropertyMapper {
     Object getValue(Object entity) {
         try {
             // try getter first, if available, otherwise direct field access
-            if (getter != null)
+            if (getter != null && getter.isAccessible())
                 return getter.invoke(entity);
             else
                 return field.get(entity);
@@ -83,7 +91,7 @@ Object getValue(Object entity) {
     void setValue(Object entity, Object value) {
         try {
             // try setter first, if available, otherwise direct field access
-            if (setter != null)
+            if (setter != null && setter.isAccessible())
                 setter.invoke(entity, value);
             else
                 field.set(entity, value);
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/ReflectionUtils.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/ReflectionUtils.java
@@ -22,10 +22,7 @@
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.lang.reflect.*;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -80,7 +77,6 @@ private static <T> Map<String, Field> scanFields(Class<T> baseClass) {
             for (Field field : clazz.getDeclaredFields()) {
                 if (field.getName().equals("class") || field.isSynthetic() || (field.getModifiers() & Modifier.STATIC) == Modifier.STATIC)
                     continue;
-                field.setAccessible(true);
                 // never override a more specific field masking another one declared in a superclass
                 if (!fields.containsKey(field.getName()))
                     fields.put(field.getName(), field);
@@ -161,7 +157,6 @@ static Method findGetter(PropertyDescriptor property) {
         Method getter = property.getReadMethod();
         if (getter == null)
             return null;
-        getter.setAccessible(true);
         return getter;
     }
 
@@ -171,8 +166,17 @@ static Method findSetter(PropertyDescriptor property) {
         Method setter = property.getWriteMethod();
         if (setter == null)
             return null;
-        setter.setAccessible(true);
         return setter;
     }
 
+    static void tryMakeAccessible(AccessibleObject object) {
+        if (!object.isAccessible()) {
+            try {
+                object.setAccessible(true);
+            } catch (SecurityException e) {
+                // ok
+            }
+        }
+    }
+
 }
