WW-5352 Move ParameterNameAware and ParameterValueAware

Author: kusalk

core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java

@@ -19,10 +19,10 @@
 package com.opensymphony.xwork2.interceptor;
 
 /**
- * @deprecated since 6.4.0, use {@link org.apache.struts2.interceptor.parameter.ParameterNameAware}.
+ * @deprecated since 6.4.0, use {@link org.apache.struts2.action.ParameterNameAware}.
  */
 @Deprecated
-public interface ParameterNameAware extends org.apache.struts2.interceptor.parameter.ParameterNameAware {
+public interface ParameterNameAware extends org.apache.struts2.action.ParameterNameAware {
 
     /**
      * Tests if the the action will accept the parameter with the given name.

core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterValueAware.java

@@ -19,10 +19,10 @@
 package com.opensymphony.xwork2.interceptor;
 
 /**
- * @deprecated since 6.4.0, use {@link org.apache.struts2.interceptor.parameter.ParameterValueAware}.
+ * @deprecated since 6.4.0, use {@link org.apache.struts2.action.ParameterValueAware}.
  */
 @Deprecated
-public interface ParameterValueAware extends org.apache.struts2.interceptor.parameter.ParameterValueAware {
+public interface ParameterValueAware extends org.apache.struts2.action.ParameterValueAware {
 
     /**
      * Tests if the the action will accept the parameter with the given value.

…ceptor/parameter/ParameterNameAware.java …e/struts2/action/ParameterNameAware.javacore/src/main/java/org/apache/struts2/interceptor/parameter/ParameterNameAware.java renamed to core/src/main/java/org/apache/struts2/action/ParameterNameAware.java core/src/main/java/org/apache/struts2/interceptor/parameter/ParameterNameAware.java renamed to core/src/main/java/org/apache/struts2/action/ParameterNameAware.java

@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.interceptor.parameter;
+package org.apache.struts2.action;
+
+import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
 
 /**
  * This interface is implemented by actions that want to declare acceptable parameters. Works in conjunction with {@link

…eptor/parameter/ParameterValueAware.java …/struts2/action/ParameterValueAware.javacore/src/main/java/org/apache/struts2/interceptor/parameter/ParameterValueAware.java renamed to core/src/main/java/org/apache/struts2/action/ParameterValueAware.java core/src/main/java/org/apache/struts2/interceptor/parameter/ParameterValueAware.java renamed to core/src/main/java/org/apache/struts2/action/ParameterValueAware.java

@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.interceptor.parameter;
+package org.apache.struts2.action;
+
+import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
 
 /**
  * This interface is implemented by actions that want to declare acceptable parameter values. Works in conjunction with

core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java

@@ -19,6 +19,7 @@
 package org.apache.struts2.interceptor;
 
 import com.opensymphony.xwork2.ActionContext;
+import org.apache.struts2.action.ParameterNameAware;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.interceptor.parameter.ParametersInterceptor;
@@ -52,7 +53,7 @@
  * <!-- START SNIPPET: extending -->
  *
  * <p>
- * The best way to add behavior to this interceptor is to utilize the {@link org.apache.struts2.interceptor.parameter.ParameterNameAware} interface in your
+ * The best way to add behavior to this interceptor is to utilize the {@link ParameterNameAware} interface in your
  * actions. However, if you wish to apply a global rule that isn't implemented in your action, then you could extend
  * this interceptor and override the {@link #acceptableName(String)} method.
  * </p>

core/src/main/java/org/apache/struts2/interceptor/parameter/ParametersInterceptor.java

@@ -37,6 +37,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.action.NoParameters;
+import org.apache.struts2.action.ParameterNameAware;
+import org.apache.struts2.action.ParameterValueAware;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.apache.struts2.dispatcher.Parameter;
 

core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java

@@ -44,6 +44,8 @@
 import ognl.OgnlContext;
 import ognl.PropertyAccessor;
 import org.apache.struts2.action.NoParameters;
+import org.apache.struts2.action.ParameterNameAware;
+import org.apache.struts2.action.ParameterValueAware;
 import org.apache.struts2.config.StrutsXmlConfigurationProvider;
 import org.apache.struts2.dispatcher.HttpParameters;
 import org.junit.Assert;