This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
from 5057aeac8 Merge pull request #862 from apache/lukaszlenart-patch-1 add eca0666f0 WW-5352 Introduce StrutsParameter annotation add ad576f0fd WW-5352 Introduce ThreadAllowlist bean add 4255da3ee WW-5352 First draft implementation add bf3f407b5 WW-5352 Ensure allowlist is cleared if in unexpected state add 4c5f2b026 WW-5352 Add full unit test coverage add e9154b922 Merge branch 'master' into WW-5352-parameter-annotation-3 add 5d7930123 WW-5352 Fix missing curved bracket add 4c60f39c7 WW-5352 Enable annotations for showcase add b2c754226 WW-5352 Dispatcher should up thread allowlist add a57c2882e WW-5352 Reinstate manual allowlist for generic types add 0a71e2c3b WW-5352 Implement auto-allowlisting for Iterator component add 770d31110 WW-5352 Mild optimisation add 6df80041e WW-5352 Auto allowlist parameterized types! add f106b2098 WW-5352 Map-like type support add bf7737fa0 WW-5352 Add unit test coverage for generics add 56d8361b4 WW-5352 Implement transition mode add 49b9c0c78 WW-5352 Ensure superclasses and interfaces allowlisted add 728d695ce WW-5352 Add debug logging for parameter rejections add b50616942 WW-5352 Acceptance test coverage add 71d77df3f WW-5352 Normalise parameter name new bd783a0e1 Merge pull request #832 from apache/WW-5352-parameter-annotation-3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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 + .../org/apache/struts2/showcase/model/MyDto.java | 23 +- .../validation/FieldValidatorsExampleAction.java | 11 + .../struts2/showcase/wait/LongProcessAction.java | 2 + .../main/resources/struts-params-annotation.xml | 10 +- apps/showcase/src/main/resources/struts.xml | 14 +- .../src/main/webapp/WEB-INF/paramsannotation.vm | 8 +- .../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 | 96 +++--- .../apache/struts2/ognl/ThreadAllowlist.java} | 48 ++- .../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, 1131 insertions(+), 146 deletions(-) create mode 100644 apps/showcase/src/main/java/org/apache/struts2/showcase/action/ParamsAnnotationAction.java copy core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java => apps/showcase/src/main/java/org/apache/struts2/showcase/model/MyDto.java (67%) copy plugins/xslt/src/main/resources/struts-plugin.xml => apps/showcase/src/main/resources/struts-params-annotation.xml (78%) copy plugins/embeddedjsp/src/test/resources/org/apache/struts2/dont-use.jsp => apps/showcase/src/main/webapp/WEB-INF/paramsannotation.vm (93%) create mode 100644 apps/showcase/src/test/java/it/org/apache/struts2/showcase/StrutsParametersTest.java copy plugins/convention/src/main/java/org/apache/struts2/convention/annotation/ExceptionMapping.java => core/src/main/java/org/apache/struts2/interceptor/parameter/StrutsParameter.java (57%) copy core/src/main/java/{com/opensymphony/xwork2/mock/MockContainer.java => org/apache/struts2/ognl/ThreadAllowlist.java} (50%) create mode 100644 core/src/test/java/org/apache/struts2/interceptor/parameter/StrutsParameterAnnotationTest.java