This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git
from ddc29445f Merge pull request #1051 from apache/merge/master-to-7xx-2024-09-10 add 5c5683907 WW-5468 Fixes @StrutsParameter for ModelDriven add a57f51cc2 WW-5468 Reworked fix, exempt ModelDriven Action parameters add 58e19dde3 WW-5468 Remove unneeded annotations add f6c17e9c6 WW-5468 Replace tabs with spaces add 762a0e02e Merge pull request #1072 from apache/fix/WW-5468-modeldriven-2 No new revisions were added by this update. Summary of changes: .../showcase/modelDriven/ModelDrivenAction.java | 2 +- .../java/com/opensymphony/xwork2/ModelDriven.java | 6 + .../parameter/ParametersInterceptor.java | 59 ++- .../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +- .../xwork2/ModelDrivenAnnotationAction.java | 3 +- .../interceptor/ModelDrivenInterceptorTest.java | 2 +- .../xwork2/test/ModelDrivenAction2.java | 4 +- .../xwork2/test/ModelDrivenAnnotationAction2.java | 4 +- .../xwork2/test/subtest/NullModelDrivenAction.java | 3 +- .../validator/VisitorValidatorModelAction.java | 5 +- .../parameter/StrutsParameterAnnotationTest.java | 35 +- .../apache/struts2/result/StreamResultTest.java | 6 +- .../beanvalidation/actions/ModelDrivenAction.java | 5 +- .../actions/ValidateGroupAction.java | 5 +- .../apache/struts2/junit/StrutsRestTestCase.java | 3 +- .../struts2/rest/RestActionInvocationTest.java | 404 ++++++++++----------- .../com/opensymphony/xwork2/ModelDrivenAction.java | 3 +- 17 files changed, 292 insertions(+), 260 deletions(-)