From 58e19dde30c79dc2cb2a36abea50d07024916933 Mon Sep 17 00:00:00 2001 From: Kusal Kithul-Godage Date: Sat, 12 Oct 2024 22:52:53 +1100 Subject: [PATCH] WW-5468 Remove unneeded annotations --- .../struts2/showcase/modelDriven/ModelDrivenAction.java | 2 +- .../test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 3 +-- .../com/opensymphony/xwork2/ModelDrivenAnnotationAction.java | 3 +-- .../xwork2/interceptor/ModelDrivenInterceptorTest.java | 2 +- .../com/opensymphony/xwork2/test/ModelDrivenAction2.java | 4 +--- .../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +--- .../xwork2/test/subtest/NullModelDrivenAction.java | 3 ++- .../xwork2/validator/VisitorValidatorModelAction.java | 5 ++--- .../struts/beanvalidation/actions/ModelDrivenAction.java | 5 +---- .../struts/beanvalidation/actions/ValidateGroupAction.java | 5 +---- .../org/apache/struts2/rest/RestActionInvocationTest.java | 2 -- .../test/java/com/opensymphony/xwork2/ModelDrivenAction.java | 3 +-- 12 files changed, 13 insertions(+), 28 deletions(-) diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java index 60692b0e6..0fae6c481 100644 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java @@ -42,7 +42,7 @@ public class ModelDrivenAction extends ActionSupport implements ModelDriven { } @Override - public Object getModel() { + public Gangster getModel() { return new Gangster(); } } diff --git a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java index 6ffcad2ff..e300d036b 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java +++ b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java @@ -44,9 +44,8 @@ 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() { + public TestBean 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..f05641732 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java +++ b/core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java @@ -44,9 +44,8 @@ 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() { + public AnnotatedTestBean 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 { @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..5e29e6899 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,9 +34,8 @@ 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() { + public TestBean2 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..b2fcdf542 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,9 +35,8 @@ 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() { + public AnnotationTestBean2 getModel() { return model; } } diff --git a/core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java b/core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java index be0916d9d..3551a4643 100644 --- a/core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java +++ b/core/src/test/java/com/opensymphony/xwork2/test/subtest/NullModelDrivenAction.java @@ -19,6 +19,7 @@ package com.opensymphony.xwork2.test.subtest; import com.opensymphony.xwork2.ModelDrivenAction; +import com.opensymphony.xwork2.TestBean; /** * Extends ModelDrivenAction to return a null model. @@ -31,7 +32,7 @@ public class NullModelDrivenAction extends ModelDrivenAction { * @return the model to be pushed onto the ValueStack instead of the Action itself */ @Override - public Object getModel() { + public TestBean getModel() { return null; } } 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..9ec226f98 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,7 @@ package com.opensymphony.xwork2.validator; import com.opensymphony.xwork2.ModelDriven; -import org.apache.struts2.interceptor.parameter.StrutsParameter; +import com.opensymphony.xwork2.TestBean; /** @@ -33,9 +33,8 @@ 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() { + public TestBean 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, 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 { @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 model; - @StrutsParameter(depth = 1) @Override public List 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..e300d036b 100644 --- a/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java +++ b/plugins/spring/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java @@ -44,9 +44,8 @@ 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() { + public TestBean getModel() { return model; } }