WW-5544 Marks ReflectionContextFactory as deprecated and uses ActionContext instead (#1254)

Author: lukaszlenart

core/src/main/java/com/opensymphony/xwork2/ognl/OgnlReflectionContextFactory.java

@@ -23,6 +23,10 @@
 
 import java.util.Map;
 
+/**
+ * @deprecated since 6.8.0, to be removed, see {@link ReflectionContextFactory}
+ */
+@Deprecated
 public class OgnlReflectionContextFactory implements ReflectionContextFactory {
 
     public Map createDefaultContext(Object root) {

core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionContextFactory.java

@@ -20,6 +20,10 @@
 
 import java.util.Map;
 
+/**
+ * @deprecated since 6.8.0, avoid using this interface and any of its implementation, it's going to be removed soon
+ */
+@Deprecated
 public interface ReflectionContextFactory {
     /**
      * Creates and returns a new standard naming context for evaluating an OGNL

plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java

@@ -19,12 +19,12 @@
 package org.apache.struts2.config_browser;
 
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
 import com.opensymphony.xwork2.util.reflection.ReflectionException;
 import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
 import com.opensymphony.xwork2.validator.Validator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionContext;
 import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.beans.BeanInfo;
@@ -49,19 +49,13 @@ public class ShowValidatorAction extends ListValidatorsAction {
     private Set<PropertyInfo> properties = Collections.emptySet();
     private int selected = 0;
 
-    ReflectionProvider reflectionProvider;
-    ReflectionContextFactory reflectionContextFactory;
+    private ReflectionProvider reflectionProvider;
 
     @Inject
     public void setReflectionProvider(ReflectionProvider prov) {
         this.reflectionProvider = prov;
     }
 
-    @Inject
-    public void setReflectionContextFactory(ReflectionContextFactory fac) {
-        this.reflectionContextFactory = fac;
-    }
-
     public int getSelected() {
         return selected;
     }
@@ -85,7 +79,6 @@ public String execute() throws Exception {
         Validator validator = getSelectedValidator();
         properties = new TreeSet<>();
         try {
-            Map<String, Object> context = reflectionContextFactory.createDefaultContext(validator);
             BeanInfo beanInfoFrom;
             try {
                 beanInfoFrom = Introspector.getBeanInfo(validator.getClass(), Object.class);
@@ -97,6 +90,7 @@ public String execute() throws Exception {
 
             PropertyDescriptor[] pds = beanInfoFrom.getPropertyDescriptors();
 
+            Map<String, Object> context = ActionContext.getContext().getContextMap();
             for (PropertyDescriptor pd : pds) {
                 String name = pd.getName();
                 Object value = null;
@@ -113,9 +107,9 @@ public String execute() throws Exception {
             }
         } catch (Exception e) {
             if (LOG.isWarnEnabled()) {
-        	LOG.warn("Unable to retrieve properties.", e);
+                LOG.warn("Unable to retrieve properties.", e);
             }
-            addActionError("Unable to retrieve properties: " + e.toString());
+            addActionError("Unable to retrieve properties: " + e);
         }
 
         if (hasErrors()) {