This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit bd783a0e19f503af2d12b830a28b1b214c0995c9
Merge: 5057aeac8 71d77df3f
Author: Kusal Kithul-Godage <git...@kusal.io>
AuthorDate: Fri Jan 26 11:00:16 2024 +1100
Merge pull request #832 from apache/WW-5352-parameter-annotation-3
.../org/apache/struts2/showcase/UITagExample.java | 24 +-
.../showcase/action/ParamsAnnotationAction.java | 133 ++++++++
.../struts2/showcase/action/SkillAction.java | 2 +
.../struts2/showcase/async/ChatRoomAction.java | 3 +
.../struts2/showcase/conversion/AddressAction.java | 4 +-
.../showcase/conversion/OperationsEnumAction.java | 2 +
.../struts2/showcase/conversion/PersonAction.java | 2 +
.../showcase/filedownload/FileDownloadAction.java | 2 +
.../showcase/fileupload/FileUploadAction.java | 2 +
.../PersonAction.java => model/MyDto.java} | 35 +--
.../validation/FieldValidatorsExampleAction.java | 11 +
.../struts2/showcase/wait/LongProcessAction.java | 2 +
.../struts-params-annotation.xml} | 43 +--
apps/showcase/src/main/resources/struts.xml | 14 +-
.../src/main/webapp/WEB-INF/paramsannotation.vm | 19 ++
.../struts2/showcase/StrutsParametersTest.java | 239 ++++++++++++++
.../xwork2/config/impl/DefaultConfiguration.java | 2 +
.../xwork2/ognl/SecurityMemberAccess.java | 10 +-
.../security/DefaultAcceptedPatternsChecker.java | 18 +-
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../struts2/components/IteratorComponent.java | 13 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 8 +
.../parameter/ParametersInterceptor.java | 204 +++++++++++-
.../interceptor/parameter/StrutsParameter.java | 44 +++
.../org/apache/struts2/ognl/ThreadAllowlist.java | 51 +++
.../struts2/views/jsp/ComponentTagSupport.java | 19 +-
core/src/main/resources/struts-beans.xml | 1 +
.../xwork2/ognl/SecurityMemberAccessTest.java | 6 +-
.../struts2/components/IteratorComponentTest.java | 20 +-
.../parameter/StrutsParameterAnnotationTest.java | 348 +++++++++++++++++++++
30 files changed, 1189 insertions(+), 95 deletions(-)
