Uses default MemberAccess instance and makes @deprecated API valid again

Closes #114
orphan-oss · Dec 5, 2020 · 3d43c99 · 3d43c99
1 parent 0364c92
commit 3d43c99
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/src/main/java/ognl/Ognl.java b/src/main/java/ognl/Ognl.java
@@ -245,13 +245,17 @@ public boolean isAccessible(Map context, Object target, Member member, String pr
      *
      * @return a new OgnlContext with the keys <CODE>root</CODE> and <CODE>context</CODE> set
      *         appropriately
-     *
-     * @deprecated it will be removed soon
      */
-    @Deprecated
     public static Map createDefaultContext(Object root, ClassResolver classResolver)
     {
-        return addDefaultContext(root, null, classResolver, null, new OgnlContext(classResolver, null, null));
+        MemberAccess memberAccess = new AbstractMemberAccess() {
+            @Override
+            public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
+                int modifiers = member.getModifiers();
+                return Modifier.isPublic(modifiers);
+            }
+        };
+        return addDefaultContext(root, memberAccess, classResolver, null, new OgnlContext(classResolver, null, null));
     }
 
     /**
@@ -266,13 +270,17 @@ public static Map createDefaultContext(Object root, ClassResolver classResolver)
      *
      * @return a new Map with the keys <CODE>root</CODE> and <CODE>context</CODE> set
      *         appropriately
-     *
-     * @deprecated it will be removed soon
      */
-    @Deprecated
     public static Map createDefaultContext(Object root, ClassResolver classResolver, TypeConverter converter)
     {
-        return addDefaultContext(root, null, classResolver, converter, new OgnlContext(classResolver, converter, null));
+        MemberAccess memberAccess = new AbstractMemberAccess() {
+            @Override
+            public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
+                int modifiers = member.getModifiers();
+                return Modifier.isPublic(modifiers);
+            }
+        };
+        return addDefaultContext(root, memberAccess, classResolver, converter, new OgnlContext(classResolver, converter, null));
     }
 
     /**
@@ -322,9 +330,7 @@ public static Map createDefaultContext(Object root, MemberAccess memberAccess)
      *            the context to which OGNL context will be added.
      * @return Context Map with the keys <CODE>root</CODE> and <CODE>context</CODE> set
      *         appropriately
-     * @deprecated will be removed soon
      */
-    @Deprecated
     public static Map addDefaultContext(Object root, Map context)
     {
         MemberAccess memberAccess = new AbstractMemberAccess() {
@@ -353,7 +359,14 @@ public boolean isAccessible(Map context, Object target, Member member, String pr
      */
     public static Map addDefaultContext(Object root, ClassResolver classResolver, Map context)
     {
-        return addDefaultContext(root, null, classResolver, null, context);
+        MemberAccess memberAccess = new AbstractMemberAccess() {
+            @Override
+            public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
+                int modifiers = member.getModifiers();
+                return Modifier.isPublic(modifiers);
+            }
+        };
+        return addDefaultContext(root, memberAccess, classResolver, null, context);
     }
 
     /**