From f85149791d2bff9953e91051b74f8f69ff450fae Mon Sep 17 00:00:00 2001
From: Stefaan Dutry <stefaan.dutry@gmail.com>
Date: Mon, 28 May 2018 13:15:09 +0200
Subject: [PATCH] rename springconstants to have a uniform naming pattern

Also removed constant from cdi-plugin config, as it is suspected to not be used.

issue:
- WW-4796
---
 plugins/cdi/src/main/resources/struts-plugin.xml            | 2 --
 .../spring/ClassReloadingXMLWebApplicationContext.java      | 2 +-
 .../java/org/apache/struts2/spring/SpringConstants.java     | 6 +++---
 .../apache/struts2/spring/StrutsSpringObjectFactory.java    | 6 +++---
 .../spring/config/entities/SpringConstantConfig.java        | 6 +++---
 plugins/spring/src/main/resources/struts-plugin.xml         | 6 +++---
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml
index bbbd5a9ab..9c79a3326 100644
--- a/plugins/cdi/src/main/resources/struts-plugin.xml
+++ b/plugins/cdi/src/main/resources/struts-plugin.xml
@@ -30,6 +30,4 @@
     <!--  Make the CDI object factory the automatic default -->
     <constant name="struts.objectFactory" value="cdi" />
 
-    <constant name="struts.class.reloading.reloadConfig" value="false" />
-
 </struts>
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
index 03fe9def3..4235a67d7 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/ClassReloadingXMLWebApplicationContext.java
@@ -52,7 +52,7 @@ import java.util.regex.Pattern;
  * </p>
  * <ul>
  * <li>Set "struts.devMode" to "true" </li>
- * <li>Set "struts.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths)</li>
+ * <li>Set "struts.objectFactory.spring.class.reloading.watchList" to a comma separated list of directories, or jar files (absolute paths)</li>
  * <li>Add this to web.xml:
  *  <pre>
  *  &lt;context-param&gt;
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
index f174e2ff6..d57757790 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java
@@ -19,7 +19,7 @@
 package org.apache.struts2.spring;
 
 public class SpringConstants {
-    public static final String SPRING_CLASS_RELOADING_WATCH_LIST = "struts.class.reloading.watchList";
-    public static final String SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.class.reloading.acceptClasses";
-    public static final String SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.class.reloading.reloadConfig";
+    public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST = "struts.objectFactory.spring.class.reloading.watchList";
+    public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES = "struts.objectFactory.spring.class.reloading.acceptClasses";
+    public static final String STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG = "struts.objectFactory.spring.class.reloading.reloadConfig";
 }
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
index 157518c27..f11ea6aad 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java
@@ -94,9 +94,9 @@ public class StrutsSpringObjectFactory extends SpringObjectFactory {
             return;
         }
         
-        String watchList = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_WATCH_LIST);
-        String acceptClasses = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_ACCEPT_CLASSES);
-        String reloadConfig = container.getInstance(String.class, SpringConstants.SPRING_CLASS_RELOADING_RELOAD_CONFIG);
+        String watchList = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST);
+        String acceptClasses = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES);
+        String reloadConfig = container.getInstance(String.class, SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG);
 
         if ("true".equals(devMode)
                 && StringUtils.isNotBlank(watchList)
diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java b/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
index d948490ba..b9abca16a 100644
--- a/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
+++ b/plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
@@ -37,9 +37,9 @@ public class SpringConstantConfig extends ConstantConfig {
     public Map<String, String> getAllAsStringsMap() {
         Map<String, String> map = super.getAllAsStringsMap();
 
-        map.put(SpringConstants.SPRING_CLASS_RELOADING_WATCH_LIST, StringUtils.join(classReloadingWatchList, ','));
-        map.put(SpringConstants.SPRING_CLASS_RELOADING_ACCEPT_CLASSES, StringUtils.join(classReloadingAcceptClasses, ','));
-        map.put(SpringConstants.SPRING_CLASS_RELOADING_RELOAD_CONFIG, Objects.toString(classReloadingReloadConfig, null));
+        map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_WATCH_LIST, StringUtils.join(classReloadingWatchList, ','));
+        map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_ACCEPT_CLASSES, StringUtils.join(classReloadingAcceptClasses, ','));
+        map.put(SpringConstants.STRUTS_OBJECTFACTORY_SPRING_CLASS_RELOADING_RELOAD_CONFIG, Objects.toString(classReloadingReloadConfig, null));
 
         return map;
     }
diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml
index 9ded322b5..51fb37c2e 100644
--- a/plugins/spring/src/main/resources/struts-plugin.xml
+++ b/plugins/spring/src/main/resources/struts-plugin.xml
@@ -29,9 +29,9 @@
     <!--  Make the Spring object factory the automatic default -->
     <constant name="struts.objectFactory" value="spring" />
 
-    <constant name="struts.class.reloading.watchList" value="" />
-    <constant name="struts.class.reloading.acceptClasses" value="" />
-    <constant name="struts.class.reloading.reloadConfig" value="false" />
+    <constant name="struts.objectFactory.spring.class.reloading.watchList" value="" />
+    <constant name="struts.objectFactory.spring.class.reloading.acceptClasses" value="" />
+    <constant name="struts.objectFactory.spring.class.reloading.reloadConfig" value="false" />
 
     <constant name="struts.disallowProxyMemberAccess" value="true" />
     <constant name="struts.json.result.excludeProxyProperties" value="true" />