This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4cc874d426d08f01e76513d265526fbfaefa84cf
Merge: f35c808ef 117b9c741
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Wed Mar 5 21:48:25 2025 +1100
Merge pull request #1236 from apache/WW-5534-proxyutil
WW-5534 Simplify ProxyUtil, add OgnlCache#computeIfAbsent
core/pom.xml | 8 +-
.../struts2/interceptor/ChainingInterceptor.java | 24 +--
.../java/org/apache/struts2/ognl/OgnlCache.java | 34 ++--
.../org/apache/struts2/ognl/OgnlCaffeineCache.java | 7 +
.../org/apache/struts2/ognl/OgnlDefaultCache.java | 16 +-
.../java/org/apache/struts2/ognl/OgnlLRUCache.java | 6 +
.../java/org/apache/struts2/ognl/OgnlUtil.java | 31 ++--
.../java/org/apache/struts2/util/ProxyUtil.java | 180 +++++++--------------
.../java/org/apache/struts2/ognl/OgnlUtilTest.java | 38 +++--
.../org/apache/struts2/json/DefaultJSONWriter.java | 6 +-
10 files changed, 175 insertions(+), 175 deletions(-)
