This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit bea1c6f09f05ab88cca2d7cc14b2d4a6fb999a9a
Merge: b387abae0 7541d9ab3
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Sun May 15 14:40:12 2022 +0430
Merge pull request #549 from apache/WW-5181-static-methods
[WW-5181] Blocks permanently access to static methods
.../StrutsDefaultConfigurationProvider.java | 1 -
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 8 +-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 20 ++--
.../xwork2/ognl/OgnlValueStackFactory.java | 44 ++------
.../xwork2/ognl/SecurityMemberAccess.java | 80 +++++---------
.../xwork2/ognl/accessor/XWorkMethodAccessor.java | 12 +--
.../java/org/apache/struts2/StrutsConstants.java | 3 -
.../struts2/config/entities/ConstantConfig.java | 10 --
.../interceptor/ParametersInterceptorTest.java | 15 ++-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 8 +-
.../xwork2/ognl/OgnlValueStackTest.java | 120 +++------------------
.../xwork2/ognl/SecurityMemberAccessTest.java | 107 +++++++++---------
.../xwork2/ognl/SetPropertiesTest.java | 16 +--
.../ognl => test}/SecurityMemberAccessTest.java | 109 ++++++++++---------
.../com/test/TestSecurityMemberAccess.java} | 22 ++--
.../util/SecurityMemberAccessInServletsTest.java | 4 +-
core/src/test/resources/xwork-test-beans.xml | 1 +
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 4 +-
.../SecurityMemberAccessProxyTest.java | 7 +-
19 files changed, 223 insertions(+), 368 deletions(-)
