(struts) 02/03: WW-3714 Deprecate and migrate ValidationInterceptor

[kusal]

This is an automated email from the ASF dual-hosted git repository.

kusal pushed a commit to branch kusal-depr-apis-8
in repository https://gitbox.apache.org/repos/asf/struts.git

commit ab1240df6f9ae118eb04ac3b3b202f98c6a9e170
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Thu Oct 17 18:56:34 2024 +1100

    WW-3714 Deprecate and migrate ValidationInterceptor
---
 .../opensymphony/xwork2/validator/ValidationInterceptor.java |  4 +++-
 .../apache/struts2}/validator/ValidationInterceptor.java     | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
 
b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
index cc22250e3..67e35f66a 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
@@ -23,10 +23,10 @@ import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil;
-import com.opensymphony.xwork2.interceptor.ValidationAware;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.Validateable;
+import org.apache.struts2.interceptor.ValidationAware;
 
 /**
  * <!-- START SNIPPET: description -->
@@ -129,7 +129,9 @@ import org.apache.struts2.Validateable;
  * @author <a href='mailto:the_mindstorm[at]evolva[dot]ro'>Alexandru 
Popescu</a>
  * @see ActionValidatorManager
  * @see com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor
+ * @deprecated since 6.7.0, use {@link 
org.apache.struts2.validator.ValidationInterceptor} instead.
  */
+@Deprecated
 public class ValidationInterceptor extends MethodFilterInterceptor {
 
     private static final Logger LOG = 
LogManager.getLogger(ValidationInterceptor.class);
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
 b/core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java
similarity index 96%
copy from 
core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
copy to 
core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java
index cc22250e3..22194c613 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/validator/ValidationInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/validator/ValidationInterceptor.java
@@ -16,17 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.validator;
+package org.apache.struts2.validator;
 
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ActionProxy;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.interceptor.PrefixMethodInvocationUtil;
-import com.opensymphony.xwork2.interceptor.ValidationAware;
+import com.opensymphony.xwork2.validator.ActionValidatorManager;
+import com.opensymphony.xwork2.validator.ValidatorConfig;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.ActionProxy;
 import org.apache.struts2.Validateable;
+import org.apache.struts2.interceptor.MethodFilterInterceptor;
+import org.apache.struts2.interceptor.ValidationAware;
 
 /**
  * <!-- START SNIPPET: description -->