WW-5352 Repackage ParametersInterceptor and related classes

apache · Jan 3, 2024 · 4698733 · 4698733
1 parent 07718b5
commit 4698733
Show file tree

Hide file tree

Showing 11 changed files with 654 additions and 558 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/NoParameters.java
@@ -33,5 +33,5 @@
  * @deprecated since Struts 6.2.0, use {@link org.apache.struts2.action.NoParameters}
  */
 @Deprecated
-public interface NoParameters {
+public interface NoParameters extends org.apache.struts2.action.NoParameters {
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterFilterInterceptor.java
@@ -26,7 +26,6 @@
 import org.apache.struts2.dispatcher.HttpParameters;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -98,7 +97,10 @@
  * </pre>
  *
  * @author Gabe
+ *
+ * @deprecated since 6.4.0, use {@link org.apache.struts2.interceptor.parameter.ParametersInterceptor}.
  */
+@Deprecated
 public class ParameterFilterInterceptor extends AbstractInterceptor {
 
     private static final Logger LOG = LogManager.getLogger(ParameterFilterInterceptor.class);

diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterNameAware.java
@@ -19,12 +19,10 @@
 package com.opensymphony.xwork2.interceptor;
 
 /**
- * This interface is implemented by actions that want to declare acceptable parameters. Works in conjunction with {@link
- * ParametersInterceptor}. For example, actions may want to create a white list of parameters they will accept or a
- * blacklist of parameters they will reject to prevent clients from setting other unexpected (and possibly dangerous)
- * parameters.
+ * @deprecated since 6.4.0, use {@link org.apache.struts2.interceptor.parameter.ParameterNameAware}.
  */
-public interface ParameterNameAware {
+@Deprecated
+public interface ParameterNameAware extends org.apache.struts2.interceptor.parameter.ParameterNameAware {
 
     /**
      * Tests if the the action will accept the parameter with the given name.
@@ -33,5 +31,5 @@ public interface ParameterNameAware {
      * @return <tt>true</tt> if accepted, <tt>false</tt> otherwise
      */
     boolean acceptableParameterName(String parameterName);
-    
+
 }
diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterValueAware.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParameterValueAware.java
@@ -19,12 +19,10 @@
 package com.opensymphony.xwork2.interceptor;
 
 /**
- * This interface is implemented by actions that want to declare acceptable parameter value. Works in conjunction with {@link
- * ParametersInterceptor}. For example, actions may want to create a white list of parameter values they will accept or a
- * blacklist of parameter values they will reject to prevent clients from setting other unexpected (and possibly dangerous)
- * parameter values.
+ * @deprecated since 6.4.0, use {@link org.apache.struts2.interceptor.parameter.ParameterValueAware}.
  */
-public interface ParameterValueAware {
+@Deprecated
+public interface ParameterValueAware extends org.apache.struts2.interceptor.parameter.ParameterValueAware {
 
     /**
      * Tests if the the action will accept the parameter with the given value.
@@ -33,5 +31,5 @@ public interface ParameterValueAware {
      * @return <tt>true</tt> if accepted, <tt>false</tt> otherwise
      */
     boolean acceptableParameterValue(String parameterValue);
-    
+
 }