This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch fix/WW-5468-modeldriven-2
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 10f47305b10f2f033d1d8c1c1001e118a1bf2d69
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Sat Oct 12 22:52:53 2024 +1100
WW-5468 Remove unneeded annotations
---
core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 1 -
.../java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java | 1 -
.../opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java | 2 +-
.../test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java | 2 --
.../com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java | 2 --
.../opensymphony/xwork2/validator/VisitorValidatorModelAction.java | 2 --
.../org/apache/struts/beanvalidation/actions/ModelDrivenAction.java | 5 +----
.../apache/struts/beanvalidation/actions/ValidateGroupAction.java | 5 +----
.../test/java/org/apache/struts2/rest/RestActionInvocationTest.java | 2 --
.../src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 1 -
10 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
index 6ffcad2ff..0e04af38c 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
@@ -44,7 +44,6 @@ public class ModelDrivenAction extends ActionSupport
implements ModelDriven {
/**
* @return the model to be pushed onto the ValueStack after the Action
itself
*/
- @StrutsParameter(depth = 2)
@Override
public Object getModel() {
return model;
diff --git
a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
index 5549b60b1..d52ead805 100644
---
a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
+++
b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
@@ -44,7 +44,6 @@ public class ModelDrivenAnnotationAction extends
ActionSupport implements ModelD
/**
* @return the model to be pushed onto the ValueStack after the Action
itself
*/
- @StrutsParameter(depth = 2)
@Override
public Object getModel() {
return model;
diff --git
a/core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
b/core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
index 65b21c86d..f6513f5f2 100644
---
a/core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/interceptor/ModelDrivenInterceptorTest.java
@@ -178,7 +178,7 @@ public class ModelDrivenInterceptorTest extends
XWorkTestCase {
}
- public class ModelDrivenAction extends ActionSupport implements
ModelDriven {
+ public class ModelDrivenAction extends ActionSupport implements
ModelDriven<Object> {
@Override
public Object getModel() {
diff --git
a/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
index 0c445860b..b25b83090 100644
--- a/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
+++ b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAction2.java
@@ -19,7 +19,6 @@
package com.opensymphony.xwork2.test;
import com.opensymphony.xwork2.ModelDrivenAction;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
/**
@@ -35,7 +34,6 @@ public class ModelDrivenAction2 extends ModelDrivenAction {
/**
* @return the model to be pushed onto the ValueStack after the Action
itself
*/
- @StrutsParameter(depth = 3)
@Override
public Object getModel() {
return model;
diff --git
a/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
index 7c26dcfab..44aaa7280 100644
---
a/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
+++
b/core/src/test/java/com/opensymphony/xwork2/test/ModelDrivenAnnotationAction2.java
@@ -19,7 +19,6 @@
package com.opensymphony.xwork2.test;
import com.opensymphony.xwork2.ModelDrivenAnnotationAction;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
/**
@@ -36,7 +35,6 @@ public class ModelDrivenAnnotationAction2 extends
ModelDrivenAnnotationAction {
/**
* @return the model to be pushed onto the ValueStack after the Action
itself
*/
- @StrutsParameter(depth = 3)
@Override
public Object getModel() {
return model;
diff --git
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
index 9f5baeee0..6b9a4a56b 100644
---
a/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
+++
b/core/src/test/java/com/opensymphony/xwork2/validator/VisitorValidatorModelAction.java
@@ -19,7 +19,6 @@
package com.opensymphony.xwork2.validator;
import com.opensymphony.xwork2.ModelDriven;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
/**
@@ -33,7 +32,6 @@ public class VisitorValidatorModelAction extends
VisitorValidatorTestAction impl
/**
* @return the model to be pushed onto the ValueStack instead of the
Action itself
*/
- @StrutsParameter(depth = 2)
@Override
public Object getModel() {
return getBean();
diff --git
a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java
b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java
index 296f42c62..48ee558f6 100644
---
a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java
+++
b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ModelDrivenAction.java
@@ -20,17 +20,14 @@ package org.apache.struts.beanvalidation.actions;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ModelDriven;
-import org.apache.struts.beanvalidation.models.Person;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
import jakarta.validation.Valid;
+import org.apache.struts.beanvalidation.models.Person;
public class ModelDrivenAction extends ActionSupport implements
ModelDriven<Person>, ModelDrivenActionInterface {
@Valid
private final Person model = new Person();
- @StrutsParameter(depth = 2)
@Override
public Person getModel() {
return model;
diff --git
a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
index 20aabf15b..9acc31df6 100644
---
a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
+++
b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/actions/ValidateGroupAction.java
@@ -20,18 +20,15 @@ package org.apache.struts.beanvalidation.actions;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ModelDriven;
+import jakarta.validation.Valid;
import org.apache.struts.beanvalidation.constraints.ValidationGroup;
import org.apache.struts.beanvalidation.models.Person;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
-
-import jakarta.validation.Valid;
public class ValidateGroupAction extends ActionSupport implements
ModelDriven<Person> {
@Valid
private final Person model = new Person();
- @StrutsParameter(depth = 2)
@Override
public Person getModel() {
return model;
diff --git
a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java
b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java
index 0e64f2ef8..6536fd187 100644
---
a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java
+++
b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java
@@ -35,7 +35,6 @@ import com.opensymphony.xwork2.util.XWorkTestCaseHelper;
import jakarta.servlet.http.HttpServletResponse;
import junit.framework.TestCase;
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.interceptor.parameter.StrutsParameter;
import org.apache.struts2.ognl.StrutsOgnlGuard;
import org.apache.struts2.result.HttpHeaderResult;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -298,7 +297,6 @@ public class RestActionInvocationTest extends TestCase {
List<String> model;
- @StrutsParameter(depth = 1)
@Override
public List<String> getModel() {
return model;
diff --git
a/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
b/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
index 6ffcad2ff..0e04af38c 100644
---
a/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
+++
b/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
@@ -44,7 +44,6 @@ public class ModelDrivenAction extends ActionSupport
implements ModelDriven {
/**
* @return the model to be pushed onto the ValueStack after the Action
itself
*/
- @StrutsParameter(depth = 2)
@Override
public Object getModel() {
return model;
