(struts) 01/01: WW-5411 Delete deprecated code part 1
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/WW-5411-delete-deprecated
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5919178ce956d6db679b8cf307ae75f49f026735
Author: Kusal Kithul-Godage
AuthorDate: Thu Jul 25 19:52:01 2024 +1000
WW-5411 Delete deprecated code part 1
---
.../conversion/impl/InstantiatingNullHandler.java | 18 +-
.../opensymphony/xwork2/inject/util/Strings.java | 57 -
.../xwork2/interceptor/AliasInterceptor.java | 10 +-
.../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +-
.../xwork2/interceptor/NoParameters.java | 37
.../interceptor/ParameterFilterInterceptor.java| 241 -
.../xwork2/interceptor/ParameterNameAware.java | 26 ---
.../xwork2/interceptor/ParameterValueAware.java| 26 ---
.../xwork2/interceptor/ParametersInterceptor.java | 25 ---
.../interceptor/StaticParametersInterceptor.java | 6 +-
.../xwork2/interceptor/annotations/Allowed.java| 38
.../AnnotationParameterFilterInterceptor.java | 115 --
.../interceptor/annotations/BlockByDefault.java| 41
.../xwork2/interceptor/annotations/Blocked.java| 38
.../org/apache/struts2/ServletActionContext.java | 13 +-
core/src/main/resources/struts-default.xml | 4 +-
core/src/main/resources/xwork-default.xml | 4 +-
.../providers/MockConfigurationProvider.java | 38 ++--
.../XmlConfigurationProviderMultilevelTest.java| 2 +-
.../ParameterFilterInterceptorTest.java| 127 ---
.../annotations/AllowingByDefaultAction.java | 44
.../annotations/AllowingByDefaultModel.java| 41
.../AnnotationParameterFilterInterceptorTest.java | 199 -
.../annotations/BlockingByDefaultAction.java | 45
.../annotations/BlockingByDefaultModel.java| 40
.../apache/struts2/TestConfigurationProvider.java | 6 +-
.../interceptor/ExecuteAndWaitInterceptorTest.java | 4 +-
.../config/providers/xwork-include-parent.xml | 2 +-
.../config/providers/xwork-test-multilevel.xml | 2 +-
core/src/test/resources/xwork-proxyinvoke.xml | 2 +-
core/src/test/resources/xwork-test-default.xml | 2 +-
core/src/test/resources/xwork-test-validation.xml | 2 +-
.../apache/struts2/junit/StrutsJUnit4TestCase.java | 10 +-
.../xwork2/spring/actionContext-xwork.xml | 6 +-
.../struts2/tiles/StrutsTilesContainerFactory.java | 24 +-
.../views/velocity/StrutsVelocityContext.java | 18 --
.../struts2/views/velocity/VelocityTagLibrary.java | 8 -
37 files changed, 78 insertions(+), 1248 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
index 9b74f76fc..e7cc1713b 100644
---
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
+++
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java
@@ -28,16 +28,24 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.beans.PropertyDescriptor;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
*
*
- * Provided that the key {@link ReflectionContextState#CREATE_NULL_OBJECTS} is
in the action context with a value of true (this key is set
- * only during the execution of the {@link
com.opensymphony.xwork2.interceptor.ParametersInterceptor}), OGNL expressions
- * that have caused a NullPointerException will be temporarily stopped for
evaluation while the system automatically
- * tries to solve the null references by automatically creating the object.
+ * Provided that the key {@link ReflectionContextState#CREATE_NULL_OBJECTS} is
in the action context with a value of
+ * true (this key is set only during the execution of the {@link
+ * org.apache.struts2.interceptor.parameter.ParametersInterceptor}), OGNL
expressions that have caused a
+ * NullPointerException will be temporarily stopped for evaluation while the
system automatically tries to solve the
+ * null references by automatically creating the object.
*
*
* The following rules are used when handling null references:
diff --git
a/core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
b/core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
deleted file mode 100644
index 2c4df91d9..0
--- a/core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Copyright (C) 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you
(struts) branch 7.0.x/WW-5411-delete-deprecated created (now 5919178ce)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git at 5919178ce WW-5411 Delete deprecated code part 1 This branch includes the following new commits: new 5919178ce WW-5411 Delete deprecated code part 1 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.
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (5919178ce -> 36176b665)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git from 5919178ce WW-5411 Delete deprecated code part 1 add 36176b665 WW-5411 Delete deprecated code part 2 No new revisions were added by this update. Summary of changes: .../rest/handler/AbstractContentTypeHandler.java | 20 -- .../struts2/rest/handler/ContentTypeHandler.java | 31 +++--- .../rest/handler/FormUrlEncodedHandler.java| 8 -- .../apache/struts2/rest/handler/HtmlHandler.java | 6 - .../struts2/rest/handler/JacksonJsonHandler.java | 6 - .../struts2/rest/handler/JacksonXmlHandler.java| 8 -- .../struts2/rest/handler/JuneauXmlHandler.java | 6 - .../rest/handler/MultipartFormDataHandler.java | 10 --- .../struts2/rest/handler/XStreamHandler.java | 6 - .../rest/ContentTypeHandlerManagerTest.java| 4 +-- .../rest/DefaultContentTypeHandlerManagerTest.java | 3 +-- 11 files changed, 44 insertions(+), 64 deletions(-)
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (36176b665 -> 6c6ef447c)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git from 36176b665 WW-5411 Delete deprecated code part 2 add 6c6ef447c WW-5411 Delete deprecated code part 3 No new revisions were added by this update. Summary of changes: .../xwork2/config/impl/AbstractMatcher.java| 84 +++--- .../xwork2/util/NamedVariablePatternMatcher.java | 2 +- .../opensymphony/xwork2/util/PatternMatcher.java | 14 ++-- .../xwork2/util/StrutsLocalizedTextProvider.java | 58 +-- .../views/freemarker/FreemarkerManager.java| 33 ++--- core/src/main/resources/struts-beans.xml | 15 .../portlet/interceptor/PortletContextAware.java | 32 - .../interceptor/PortletPreferencesAware.java | 32 - .../portlet/interceptor/PortletRequestAware.java | 32 - .../portlet/interceptor/PortletResponseAware.java | 32 - .../struts2/rest/ContentTypeHandlerManager.java| 22 ++ .../rest/DefaultContentTypeHandlerManager.java | 18 +++-- 12 files changed, 41 insertions(+), 333 deletions(-) delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java delete mode 100644 plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (6c6ef447c -> 0655b06cd)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git from 6c6ef447c WW-5411 Delete deprecated code part 3 add 0655b06cd WW-5411 Delete deprecated code part 4 No new revisions were added by this update. Summary of changes: .../xwork2/conversion/TypeConverter.java | 3 - .../xwork2/util/AbstractLocalizedTextProvider.java | 32 + .../validator/DelegatingValidatorContext.java | 78 +++--- .../java/org/apache/struts2/StrutsConstants.java | 19 -- .../config/StrutsXmlConfigurationProvider.java | 10 --- .../apache/struts2/dispatcher/HttpParameters.java | 55 +-- .../dispatcher/multipart/StrutsUploadedFile.java | 13 .../ActionMappingParametersInterceptor.java| 7 +- .../struts2/interceptor/csp/CspSettings.java | 6 -- .../parameter/ParametersInterceptor.java | 9 --- .../org/apache/struts2/ognl/ProviderAllowlist.java | 18 - .../org/apache/struts2/url/QueryStringParser.java | 6 -- .../struts2/url/StrutsQueryStringParser.java | 5 -- .../apache/struts2/util/ServletContextAware.java | 32 - .../apache/struts2/views/jsp/ui/AbstractUITag.java | 12 +--- .../util/StrutsLocalizedTextProviderTest.java | 9 --- 16 files changed, 64 insertions(+), 250 deletions(-) delete mode 100644 core/src/main/java/org/apache/struts2/util/ServletContextAware.java
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (0655b06cd -> e411f9c17)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git discard 0655b06cd WW-5411 Delete deprecated code part 4 add e411f9c17 WW-5411 Delete deprecated code part 4 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0655b06cd) \ N -- N -- N refs/heads/7.0.x/WW-5411-delete-deprecated (e411f9c17) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/struts2/interceptor/csp/DefaultCspSettings.java | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-)
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (e411f9c17 -> f73897435)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git from e411f9c17 WW-5411 Delete deprecated code part 4 add f73897435 WW-5411 Delete deprecated code part 5 No new revisions were added by this update. Summary of changes: .../xwork2/ognl/SecurityMemberAccess.java | 14 -- .../xwork2/util/StrutsLocalizedTextProvider.java | 12 ++-- .../util/reflection/ReflectionProviderFactory.java | 32 -- .../xwork2/ognl/OgnlValueStackTest.java| 9 +++--- .../xwork2/ognl/SecurityMemberAccessTest.java | 10 +-- .../xwork2/ognl/SetPropertiesTest.java | 8 -- .../util/StrutsLocalizedTextProviderTest.java | 7 ++--- .../com/test/ExternalSecurityMemberAccess.java | 6 ++-- .../com/test/ExternalSecurityMemberAccessTest.java | 4 +-- .../struts2/interceptor/CspInterceptorTest.java| 6 ++-- .../parameter/ParametersInterceptorTest.java | 2 +- .../util/SecurityMemberAccessInServletsTest.java | 4 +-- 12 files changed, 42 insertions(+), 72 deletions(-) delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/reflection/ReflectionProviderFactory.java
(struts) branch 7.0.x/WW-5411-delete-deprecated updated (f73897435 -> aec78dd16)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git omit f73897435 WW-5411 Delete deprecated code part 5 add 4e4cf468a WW-5411 Delete deprecated code part 5 add aec78dd16 WW-5411 Misc code cleanup This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f73897435) \ N -- N -- N refs/heads/7.0.x/WW-5411-delete-deprecated (aec78dd16) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../showcase/application/TestDataProvider.java | 23 +--- .../apache/struts2/showcase/hangman/Hangman.java | 29 +++- .../org/apache/struts2/showcase/hangman/Vocab.java | 31 -- .../com/opensymphony/xwork2/ActionSupport.java | 8 -- .../opensymphony/xwork2/DefaultTextProvider.java | 4 +-- .../opensymphony/xwork2/inject/ContainerImpl.java | 2 +- .../opensymphony/xwork2/ognl/OgnlValueStack.java | 2 ++ .../xwork2/ognl/SecurityMemberAccess.java | 29 .../xwork2/util/StrutsLocalizedTextProvider.java | 2 +- .../xwork2/util/fs/DefaultFileManager.java | 9 +-- .../factory/PrefixBasedActionProxyFactory.java | 12 ++--- .../debugging/DebuggingInterceptor.java| 11 .../result/ServletActionRedirectResult.java| 3 +-- .../struts2/result/ServletRedirectResult.java | 7 +++-- .../struts2/url/StrutsQueryStringParser.java | 3 +-- .../java/org/apache/struts2/util/MakeIterator.java | 4 +-- .../convention/DefaultResultMapBuilder.java| 13 - 17 files changed, 85 insertions(+), 107 deletions(-)
(struts) branch release/struts-7-0-x updated (c5dfe61ec -> fe49781a3)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from c5dfe61ec [maven-release-plugin] prepare for next development iteration add 5919178ce WW-5411 Delete deprecated code part 1 add 36176b665 WW-5411 Delete deprecated code part 2 add 6c6ef447c WW-5411 Delete deprecated code part 3 add e411f9c17 WW-5411 Delete deprecated code part 4 add 4e4cf468a WW-5411 Delete deprecated code part 5 add aec78dd16 WW-5411 Misc code cleanup add fe49781a3 Merge pull request #1002 from apache/7.0.x/WW-5411-delete-deprecated No new revisions were added by this update. Summary of changes: .../showcase/application/TestDataProvider.java | 23 +- .../apache/struts2/showcase/hangman/Hangman.java | 29 +-- .../org/apache/struts2/showcase/hangman/Vocab.java | 31 +-- .../com/opensymphony/xwork2/ActionSupport.java | 8 +- .../opensymphony/xwork2/DefaultTextProvider.java | 4 +- .../xwork2/config/impl/AbstractMatcher.java| 84 +-- .../xwork2/conversion/TypeConverter.java | 3 - .../conversion/impl/InstantiatingNullHandler.java | 18 +- .../opensymphony/xwork2/inject/ContainerImpl.java | 2 +- .../opensymphony/xwork2/inject/util/Strings.java | 57 - .../xwork2/interceptor/AliasInterceptor.java | 10 +- .../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +- .../xwork2/interceptor/NoParameters.java | 37 .../interceptor/ParameterFilterInterceptor.java| 241 - .../xwork2/interceptor/ParameterNameAware.java | 26 --- .../xwork2/interceptor/ParameterValueAware.java| 26 --- .../xwork2/interceptor/ParametersInterceptor.java | 25 --- .../interceptor/StaticParametersInterceptor.java | 6 +- .../xwork2/interceptor/annotations/Allowed.java| 38 .../AnnotationParameterFilterInterceptor.java | 115 -- .../interceptor/annotations/BlockByDefault.java| 41 .../xwork2/interceptor/annotations/Blocked.java| 38 .../opensymphony/xwork2/ognl/OgnlValueStack.java | 2 + .../xwork2/ognl/SecurityMemberAccess.java | 43 +--- .../xwork2/util/AbstractLocalizedTextProvider.java | 32 +-- .../xwork2/util/NamedVariablePatternMatcher.java | 2 +- .../opensymphony/xwork2/util/PatternMatcher.java | 14 +- .../xwork2/util/StrutsLocalizedTextProvider.java | 70 +- .../xwork2/util/fs/DefaultFileManager.java | 9 +- .../util/reflection/ReflectionProviderFactory.java | 32 --- .../validator/DelegatingValidatorContext.java | 78 +-- .../org/apache/struts2/ServletActionContext.java | 13 +- .../java/org/apache/struts2/StrutsConstants.java | 19 -- .../config/StrutsXmlConfigurationProvider.java | 10 - .../apache/struts2/dispatcher/HttpParameters.java | 55 + .../dispatcher/multipart/StrutsUploadedFile.java | 13 -- .../factory/PrefixBasedActionProxyFactory.java | 12 +- .../ActionMappingParametersInterceptor.java| 7 +- .../struts2/interceptor/csp/CspSettings.java | 6 - .../interceptor/csp/DefaultCspSettings.java| 9 +- .../debugging/DebuggingInterceptor.java| 11 +- .../parameter/ParametersInterceptor.java | 9 - .../org/apache/struts2/ognl/ProviderAllowlist.java | 18 -- .../result/ServletActionRedirectResult.java| 3 +- .../struts2/result/ServletRedirectResult.java | 7 +- .../org/apache/struts2/url/QueryStringParser.java | 6 - .../struts2/url/StrutsQueryStringParser.java | 8 +- .../java/org/apache/struts2/util/MakeIterator.java | 4 +- .../apache/struts2/util/ServletContextAware.java | 32 --- .../views/freemarker/FreemarkerManager.java| 33 +-- .../apache/struts2/views/jsp/ui/AbstractUITag.java | 12 +- core/src/main/resources/struts-beans.xml | 15 -- core/src/main/resources/struts-default.xml | 4 +- core/src/main/resources/xwork-default.xml | 4 +- .../providers/MockConfigurationProvider.java | 38 ++-- .../XmlConfigurationProviderMultilevelTest.java| 2 +- .../ParameterFilterInterceptorTest.java| 127 --- .../annotations/AllowingByDefaultAction.java | 44 .../annotations/AllowingByDefaultModel.java| 41 .../AnnotationParameterFilterInterceptorTest.java | 199 - .../annotations/BlockingByDefaultAction.java | 45 .../annotations/BlockingByDefaultModel.java| 40 .../xwork2/ognl/OgnlValueStackTest.java| 9 +- .../xwork2/ognl/SecurityMemberAccessTest.java | 10 +- .../xwork2/ognl/SetPropertiesTest.java | 8 +- .../util/StrutsLocalizedTextProviderTest.java | 16 +- .../com/test/ExternalSecurityMemberAccess.java | 6 +- .../com/test/ExternalSecurityMemberAccessTest.java | 4 +- .../a
(struts) branch 7.0.x/WW-5411-delete-deprecated deleted (was aec78dd16)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated in repository https://gitbox.apache.org/repos/asf/struts.git was aec78dd16 WW-5411 Misc code cleanup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch 7.0.x/WW-5411-delete-deprecated-2 created (now 78e019862)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated-2 in repository https://gitbox.apache.org/repos/asf/struts.git at 78e019862 WW-5411 General code clean up using modern language features This branch includes the following new commits: new 78e019862 WW-5411 General code clean up using modern language features 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.
(struts) branch 7.0.x/WW-5411-delete-deprecated-2 updated (78e019862 -> d1d21026c)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated-2 in repository https://gitbox.apache.org/repos/asf/struts.git discard 78e019862 WW-5411 General code clean up using modern language features add d1d21026c WW-5411 General code clean up using modern language features This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (78e019862) \ N -- N -- N refs/heads/7.0.x/WW-5411-delete-deprecated-2 (d1d21026c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../xwork2/inject/ConstructionContext.java | 150 .../xwork2/inject/ContainerBuilder.java| 6 +- .../opensymphony/xwork2/inject/ContainerImpl.java | 10 +- .../com/opensymphony/xwork2/inject/Factory.java| 10 +- .../xwork2/inject/InternalFactory.java | 10 +- .../interceptor/PrefixMethodInvocationUtil.java| 191 ++--- .../org/apache/struts2/views/jsp/ui/SelectTag.java | 6 +- 7 files changed, 186 insertions(+), 197 deletions(-)
(struts) branch 7.0.x/WW-5411-delete-deprecated-2 updated (d1d21026c -> 35d9c0b41)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated-2 in repository https://gitbox.apache.org/repos/asf/struts.git discard d1d21026c WW-5411 General code clean up using modern language features add 35d9c0b41 WW-5411 General code clean up using modern language features This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d1d21026c) \ N -- N -- N refs/heads/7.0.x/WW-5411-delete-deprecated-2 (35d9c0b41) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../xwork2/validator/validators/ConversionErrorFieldValidator.java | 3 ++- .../validators/RepopulateConversionErrorFieldValidatorSupport.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
(struts) branch dependabot/maven/org.apache.commons-commons-lang3-3.15.0 deleted (was 7e5e49e81)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.apache.commons-commons-lang3-3.15.0 in repository https://gitbox.apache.org/repos/asf/struts.git was 7e5e49e81 Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch master updated (f977f0c0e -> e3e854a67)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from f977f0c0e [maven-release-plugin] prepare for next development iteration add 7e5e49e81 Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 new e3e854a67 Merge pull request #1000 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.15.0 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) 01/01: Merge pull request #1000 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.15.0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit e3e854a67b6a72843a3af3476aacec7efc1c0a56 Merge: f977f0c0e 7e5e49e81 Author: Lukasz Lenart AuthorDate: Thu Jul 25 20:05:11 2024 +0200 Merge pull request #1000 from apache/dependabot/maven/org.apache.commons-commons-lang3-3.15.0 Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.15.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch release/struts-7-0-x updated (fe49781a3 -> 5cd03aa02)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from fe49781a3 Merge pull request #1002 from apache/7.0.x/WW-5411-delete-deprecated add 35d9c0b41 WW-5411 General code clean up using modern language features add 5cd03aa02 Merge pull request #1003 from apache/7.0.x/WW-5411-delete-deprecated-2 No new revisions were added by this update. Summary of changes: .../showcase/application/TestDataProvider.java | 108 +-- .../main/java/com/opensymphony/xwork2/Action.java | 12 +- .../com/opensymphony/xwork2/ActionChainResult.java | 3 +- .../opensymphony/xwork2/ActionEventListener.java | 12 +- .../opensymphony/xwork2/CompositeTextProvider.java | 26 ++- .../xwork2/DefaultActionInvocation.java| 19 +- .../opensymphony/xwork2/DefaultActionProxy.java| 6 +- .../xwork2/DefaultActionProxyFactory.java | 16 +- .../opensymphony/xwork2/DefaultTextProvider.java | 26 ++- .../xwork2/DefaultUnknownHandlerManager.java | 2 +- .../xwork2/StrutsTextProviderFactory.java | 18 +- .../com/opensymphony/xwork2/XWorkTestCase.java | 3 +- .../xwork2/config/FileManagerFactoryProvider.java | 6 +- .../xwork2/config/FileManagerProvider.java | 8 +- .../xwork2/config/entities/ActionConfig.java | 41 ++-- .../xwork2/config/entities/AllowedMethods.java | 8 +- .../config/entities/ExceptionMappingConfig.java| 16 +- .../xwork2/config/entities/InterceptorConfig.java | 15 +- .../xwork2/config/entities/InterceptorMapping.java | 9 +- .../config/entities/InterceptorStackConfig.java| 13 +- .../xwork2/config/entities/PackageConfig.java | 44 +++-- .../xwork2/config/entities/Parameterizable.java| 2 +- .../xwork2/config/entities/ResultConfig.java | 15 +- .../xwork2/config/entities/ResultTypeConfig.java | 9 +- .../xwork2/config/impl/ActionConfigMatcher.java| 15 +- .../xwork2/config/impl/DefaultConfiguration.java | 2 + .../config/impl/LocatableConstantFactory.java | 10 +- .../xwork2/config/impl/LocatableFactory.java | 27 +-- .../xwork2/config/impl/MockConfiguration.java | 27 ++- .../xwork2/config/impl/NamespaceMatch.java | 4 +- .../xwork2/config/providers/CycleDetector.java | 8 +- .../xwork2/config/providers/DirectedGraph.java | 17 +- .../config/providers/InterceptorBuilder.java | 26 +-- .../config/providers/XmlConfigurationProvider.java | 3 +- .../providers/XmlDocConfigurationProvider.java | 18 +- .../xwork2/config/providers/XmlHelper.java | 2 +- .../xwork2/conversion/ObjectTypeDeterminer.java| 14 +- .../xwork2/conversion/impl/DateConverter.java | 36 ++-- .../impl/DefaultObjectTypeDeterminer.java | 11 +- .../conversion/impl/DefaultTypeConverter.java | 73 +++ .../xwork2/conversion/impl/NumberConverter.java| 21 +-- .../xwork2/conversion/impl/StringConverter.java| 6 +- .../conversion/impl/XWorkBasicConverter.java | 17 +- .../xwork2/conversion/impl/XWorkConverter.java | 56 +++--- .../xwork2/conversion/impl/XWorkList.java | 8 +- .../xwork2/factory/DefaultInterceptorFactory.java | 5 +- .../factory/DefaultUnknownHandlerFactory.java | 1 + .../xwork2/inject/ConstructionContext.java | 150 +++ .../xwork2/inject/ContainerBuilder.java| 32 ++-- .../opensymphony/xwork2/inject/ContainerImpl.java | 28 +-- .../xwork2/inject/ExternalContext.java | 14 +- .../com/opensymphony/xwork2/inject/Factory.java| 10 +- .../xwork2/inject/InitializableFactory.java| 4 +- .../com/opensymphony/xwork2/inject/Inject.java | 37 ++-- .../xwork2/inject/InternalContext.java | 82 .../xwork2/inject/InternalFactory.java | 10 +- .../java/com/opensymphony/xwork2/inject/Key.java | 5 +- .../java/com/opensymphony/xwork2/inject/Scope.java | 33 ++-- .../com/opensymphony/xwork2/inject/Scoped.java | 19 +- .../xwork2/inject/util/ReferenceCache.java | 16 +- .../xwork2/inject/util/ReferenceMap.java | 58 +++--- .../xwork2/inject/util/ReferenceType.java | 2 +- .../xwork2/interceptor/AbstractInterceptor.java| 3 + .../xwork2/interceptor/AliasInterceptor.java | 3 +- .../xwork2/interceptor/ChainingInterceptor.java| 15 +- .../interceptor/ConversionErrorInterceptor.java| 17 +- .../interceptor/DefaultWorkflowInterceptor.java| 8 +- .../xwork2/interceptor/ExceptionHolder.java| 8 +- .../interceptor/ExceptionMappingInterceptor.java | 9 +- .../xwork2/interceptor/LoggingInterceptor.java | 2 +- .../interceptor/MethodFilterInterceptorUtil.java | 48 +++-- .../xwork2/interceptor/ModelDrivenInterceptor.java | 5 +- .../interceptor/PrefixMethodInvoca
(struts) branch 7.0.x/WW-5411-delete-deprecated-2 deleted (was 35d9c0b41)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated-2 in repository https://gitbox.apache.org/repos/asf/struts.git was 35d9c0b41 WW-5411 General code clean up using modern language features The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch 7.0.x/WW-5411-delete-deprecated-3 created (now d0b53465b)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch 7.0.x/WW-5411-delete-deprecated-3 in repository https://gitbox.apache.org/repos/asf/struts.git at d0b53465b WW-5411 Delete deprecated code part 6 This branch includes the following new commits: new d0b53465b WW-5411 Delete deprecated code part 6 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.
(struts) 01/01: WW-5411 Delete deprecated code part 6
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/WW-5411-delete-deprecated-3
in repository https://gitbox.apache.org/repos/asf/struts.git
commit d0b53465b5e8caa596c9a62ef4bacdb801551fae
Author: Kusal Kithul-Godage
AuthorDate: Fri Jul 26 16:59:01 2024 +1000
WW-5411 Delete deprecated code part 6
---
.../java/com/opensymphony/xwork2/ognl/OgnlUtil.java| 16
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 18 +-
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index af9bdd3d4..0b9c1641f 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -103,22 +103,6 @@ public class OgnlUtil {
enableExpressionCache = BooleanUtils.toBoolean(cache);
}
-/**
- * @deprecated since 6.4.0, changing maximum cache size after
initialisation is not necessary.
- */
-@Deprecated
-protected void setExpressionCacheMaxSize(String maxSize) {
-expressionCache.setEvictionLimit(Integer.parseInt(maxSize));
-}
-
-/**
- * @deprecated since 6.4.0, changing maximum cache size after
initialisation is not necessary.
- */
-@Deprecated
-protected void setBeanInfoCacheMaxSize(String maxSize) {
-beanInfoCache.setEvictionLimit(Integer.parseInt(maxSize));
-}
-
@Inject(value = StrutsConstants.STRUTS_OGNL_ENABLE_EVAL_EXPRESSION,
required = false)
protected void setEnableEvalExpression(String evalExpression) {
this.enableEvalExpression = BooleanUtils.toBoolean(evalExpression);
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 255677d00..0d96337da 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -181,9 +181,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testLRUCacheEnabledMaxSize() throws OgnlException {
// Force usage of LRU cache factories for the OgnlUtil instance
-this.ognlUtil = generateOgnlUtilInstanceWithDefaultLRUCacheFactories();
-ognlUtil.setEnableExpressionCache("true");
-ognlUtil.setExpressionCacheMaxSize("1");
+this.ognlUtil =
generateOgnlUtilInstanceWithDefaultLRUCacheFactories(1, 25);
Object expr0 = ognlUtil.compile("test");
Object expr2 = ognlUtil.compile("test");
assertSame(expr0, expr2);
@@ -410,8 +408,7 @@ public class OgnlUtilTest extends XWorkTestCase {
public void testBeanInfoLRUCacheLimits() throws IntrospectionException {
// Force usage of LRU cache factories for the OgnlUtil instance
-this.ognlUtil = generateOgnlUtilInstanceWithDefaultLRUCacheFactories();
-ognlUtil.setBeanInfoCacheMaxSize("1");
+this.ognlUtil =
generateOgnlUtilInstanceWithDefaultLRUCacheFactories(25, 1);
final TestBean1 testBean1 = new TestBean1();
final TestBean2 testBean2 = new TestBean2();
// Test that the BeanInfo cache is functioning as expected.
@@ -434,7 +431,6 @@ public class OgnlUtilTest extends XWorkTestCase {
// LRU cache should not contain TestBean1 beaninfo anymore. A new
entry should exist in the cache.
Object beanInfo1_4 = ognlUtil.getBeanInfo(testBean1);
assertNotSame("BeanInfo dropped from LRU cache is the same as newly
added ?", beanInfo1_1, beanInfo1_4);
-ognlUtil.setBeanInfoCacheMaxSize(String.valueOf(Integer.MAX_VALUE));
}
public void testClearRuntimeCache() {
@@ -1648,16 +1644,20 @@ public class OgnlUtilTest extends XWorkTestCase {
assertThrows(OgnlException.class, () ->
ognlUtil.getValue(vulnerableExpr, ognlUtil.createDefaultContext(null), null));
}
+private OgnlUtil generateOgnlUtilInstanceWithDefaultLRUCacheFactories() {
+return generateOgnlUtilInstanceWithDefaultLRUCacheFactories(25, 25);
+}
+
/**
* Generate a new OgnlUtil instance (not configured by the {@link
ContainerBuilder}) that can be used for
* basic tests, with its Expression and BeanInfo factories set to LRU mode.
*
* @return OgnlUtil instance with LRU enabled Expression and BeanInfo
factories
*/
-private OgnlUtil generateOgnlUtilInstanceWithDefaultLRUCacheFactories() {
+private OgnlUtil generateOgnlUtilInstanceWithDefaultLRUCacheFactories(int
expressionCacheMaxSize, int beanInfoCacheMaxSize) {
final OgnlUtil result;
-final DefaultOgnlExpressionCacheFactory
expressionFactory = new DefaultOgnlExpressionCacheFactory<>(String.valueOf(25),
LRU.toString());
-final DefaultOgnlBeanInfoCacheFactory, BeanInfo>
beanInfoFactory = new D
