This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch
WW-2934-skip-validators-on-conversion-error
in repository https://gitbox.apache.org/repos/asf/struts.git
from eb6c67c3d WW-2934 test(core): assert custom conversion message
survives and cover nested field skip
add 8a5323fbd WW-5539 Concurrency performance enhancements (#1799)
add c3e9db1b2 WW-5413 Avoid writing small in-memory multipart uploads to
disk (#1805)
add 833220346 WW-5474 Count files only for maxFiles, add maxParameterCount
(#1806)
add 12015d0bf WW-5540 Add caching to AbstractLocalizedTextProvider (#1808)
add 0b2bc2be1 WW-3427 Add regression test for conversion errors on aliased
properties (#1814)
add 676b9d34e Merge remote-tracking branch 'origin/main' into
WW-2934-skip-validators-on-conversion-error
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/struts2/StrutsConstants.java | 5 +
.../conversion/StrutsTypeConverterHolder.java | 103 +-
.../struts2/conversion/TypeConverterHolder.java | 59 +-
.../struts2/conversion/impl/XWorkConverter.java | 75 +-
.../multipart/AbstractMultiPartRequest.java | 86 +-
.../FileUploadParameterCountLimitException.java | 25 +-
.../multipart/JakartaMultiPartRequest.java | 150 +--
.../multipart/JakartaStreamMultiPartRequest.java | 34 +-
.../multipart/StrutsInMemoryUploadedFile.java | 213 ++++
.../dispatcher/multipart/StrutsUploadedFile.java | 8 +
.../struts2/dispatcher/multipart/UploadedFile.java | 38 +
.../interceptor/AbstractFileUploadInterceptor.java | 16 +-
.../text/AbstractLocalizedTextProvider.java | 260 ++++-
.../struts2/text/StrutsLocalizedTextProvider.java | 61 +-
.../validator/DefaultActionValidatorManager.java | 65 +-
.../struts2/validator/DefaultValidatorFactory.java | 4 +-
.../org/apache/struts2/default.properties | 3 +
.../org/apache/struts2/struts-messages.properties | 4 +
.../conversion/StrutsTypeConverterHolderTest.java | 442 +++++++
.../conversion/TypeConverterHolderTest.java | 151 +++
.../conversion/impl/XWorkConverterTest.java | 252 ++++
.../multipart/AbstractMultiPartRequestTest.java | 26 +-
.../multipart/JakartaMultiPartRequestTest.java | 353 +++---
.../JakartaStreamMultiPartRequestTest.java | 63 +-
.../multipart/StrutsInMemoryUploadedFileTest.java | 217 ++++
.../multipart/StrutsUploadedFileTest.java} | 42 +-
.../dispatcher/multipart/UploadedFileTest.java | 91 ++
.../ActionFileUploadInterceptorTest.java | 40 +
.../AliasConversionAction.java} | 32 +-
.../struts2/interceptor/AliasInterceptorTest.java | 24 +
.../interceptor/ThrowingTypeConverter.java} | 20 +-
.../org/apache/struts2/text/CacheFixture.java} | 19 +-
.../text/StrutsLocalizedTextProviderTest.java | 216 ++++
.../DefaultActionValidatorManagerTest.java | 182 +++
.../AliasConversionAction-conversion.properties | 3 +-
.../apache/struts2/text/CacheFixture.properties | 6 +-
.../struts2/text/CacheFixture_de.properties} | 2 +-
...st-allowlist.xml => xwork-alias-conversion.xml} | 26 +-
.../2026-07-21-WW-5539-concurrency-performance.md | 1215 ++++++++++++++++++++
...6-07-22-WW-5413-inmemory-upload-optimization.md | 827 +++++++++++++
...6-07-22-WW-5474-multipart-maxfiles-semantics.md | 594 ++++++++++
...7-23-WW-5540-localized-text-provider-caching.md | 871 ++++++++++++++
...07-21-WW-5539-concurrency-performance-design.md | 332 ++++++
...-WW-5413-inmemory-upload-optimization-design.md | 136 +++
...-WW-5474-multipart-maxfiles-semantics-design.md | 100 ++
...-5540-localized-text-provider-caching-design.md | 263 +++++
46 files changed, 7191 insertions(+), 563 deletions(-)
copy plugins/json/src/main/java/org/apache/struts2/json/JSONException.java =>
core/src/main/java/org/apache/struts2/dispatcher/multipart/FileUploadParameterCountLimitException.java
(55%)
create mode 100644
core/src/main/java/org/apache/struts2/dispatcher/multipart/StrutsInMemoryUploadedFile.java
create mode 100644
core/src/test/java/org/apache/struts2/conversion/StrutsTypeConverterHolderTest.java
create mode 100644
core/src/test/java/org/apache/struts2/conversion/TypeConverterHolderTest.java
create mode 100644
core/src/test/java/org/apache/struts2/dispatcher/multipart/StrutsInMemoryUploadedFileTest.java
copy
core/src/{main/java/org/apache/struts2/util/classloader/AbstractResourceStore.java
=>
test/java/org/apache/struts2/dispatcher/multipart/StrutsUploadedFileTest.java}
(52%)
create mode 100644
core/src/test/java/org/apache/struts2/dispatcher/multipart/UploadedFileTest.java
copy
core/src/test/java/org/apache/struts2/{validator/ConversionErrorSkipAction.java
=> interceptor/AliasConversionAction.java} (53%)
copy core/src/{main/java/org/apache/struts2/interceptor/NoOpInterceptor.java
=> test/java/org/apache/struts2/interceptor/ThrowingTypeConverter.java} (61%)
copy core/src/{main/java/org/apache/struts2/result/plain/DateHttpHeader.java
=> test/java/org/apache/struts2/text/CacheFixture.java} (72%)
copy
apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties
=>
core/src/test/resources/org/apache/struts2/interceptor/AliasConversionAction-conversion.properties
(92%)
copy
apps/showcase/src/main/resources/org/apache/struts2/showcase/UITagExample-conversion.properties
=> core/src/test/resources/org/apache/struts2/text/CacheFixture.properties
(83%)
copy core/src/{main/resources/template/css_xhtml/theme.properties =>
test/resources/org/apache/struts2/text/CacheFixture_de.properties} (96%)
copy
core/src/test/resources/{org/apache/struts2/config/providers/xwork-test-allowlist.xml
=> xwork-alias-conversion.xml} (62%)
create mode 100644
docs/superpowers/plans/2026-07-21-WW-5539-concurrency-performance.md
create mode 100644
docs/superpowers/plans/2026-07-22-WW-5413-inmemory-upload-optimization.md
create mode 100644
docs/superpowers/plans/2026-07-22-WW-5474-multipart-maxfiles-semantics.md
create mode 100644
docs/superpowers/plans/2026-07-23-WW-5540-localized-text-provider-caching.md
create mode 100644
docs/superpowers/specs/2026-07-21-WW-5539-concurrency-performance-design.md
create mode 100644
docs/superpowers/specs/2026-07-22-WW-5413-inmemory-upload-optimization-design.md
create mode 100644
docs/superpowers/specs/2026-07-22-WW-5474-multipart-maxfiles-semantics-design.md
create mode 100644
docs/superpowers/specs/2026-07-23-WW-5540-localized-text-provider-caching-design.md
