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 46251a11f Merge pull request #1107 from apache/7.0.x/WW-5478-delete-result add 87df4a229 WW-3714 Move new Result class into result package add 3931968b1 Merge pull request #1111 from apache/7.0.x/WW-3714-result-repkg No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/ActionChainResult.java | 5 +- .../java/org/apache/struts2/ActionInvocation.java | 1 + .../apache/struts2/DefaultActionInvocation.java | 1 + .../struts2/DefaultUnknownHandlerManager.java | 1 + .../java/org/apache/struts2/ObjectFactory.java | 15 +++--- .../java/org/apache/struts2/UnknownHandler.java | 1 + .../org/apache/struts2/UnknownHandlerManager.java | 1 + .../java/org/apache/struts2/config/NullResult.java | 2 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 56 +++++++++++----------- .../struts2/dispatcher/mapper/ActionMapping.java | 2 +- .../org/apache/struts2/factory/ResultFactory.java | 4 +- .../struts2/factory/StrutsResultFactory.java | 2 +- .../struts2/interceptor/ChainingInterceptor.java | 2 +- .../interceptor/MessageStoreInterceptor.java | 7 ++- .../struts2/interceptor/PreResultListener.java | 5 +- .../interceptor/TokenSessionStoreInterceptor.java | 8 ++-- .../apache/struts2/mock/MockActionInvocation.java | 2 +- .../java/org/apache/struts2/mock/MockResult.java | 2 +- .../apache/struts2/result/HttpHeaderResult.java | 7 ++- .../struts2/result/ParamNameAwareResult.java | 2 +- .../org/apache/struts2/result/PlainResult.java | 8 ++-- .../org/apache/struts2/{ => result}/Result.java | 5 +- .../result/ServletActionRedirectResult.java | 4 +- .../apache/struts2/result/StrutsResultSupport.java | 5 +- .../org/apache/struts2/ActionChainResultTest.java | 3 +- .../org/apache/struts2/ActionInvocationTest.java | 6 +-- .../struts2/DefaultActionInvocationTest.java | 5 +- .../test/java/org/apache/struts2/SimpleAction.java | 1 + .../org/apache/struts2/TestActionTagResult.java | 3 +- .../test/java/org/apache/struts2/TestResult.java | 8 ++-- .../test/java/org/apache/struts2/VoidResult.java | 2 + .../ConfigurationProviderOgnlAllowlistTest.java | 6 +-- .../config/providers/SomeUnknownHandler.java | 4 +- .../struts2/factory/StrutsResultFactoryTest.java | 4 +- .../org/apache/struts2/result/PlainResultTest.java | 3 +- .../apache/struts2/result/PostbackResultTest.java | 3 +- .../struts2/result/ServletRedirectResultTest.java | 13 +++-- .../apache/struts/beanvalidation/VoidResult.java | 2 +- .../convention/ConventionUnknownHandler.java | 25 ++++++---- .../PackageBasedActionConfigBuilderTest.java | 24 +++++----- .../java/org/apache/struts2/json/JSONResult.java | 18 +++---- .../org/apache/struts2/json/JSONResultTest.java | 8 ++-- .../apache/struts2/rest/RestActionInvocation.java | 20 ++++---- .../test/java/org/apache/struts2/SimpleAction.java | 10 +++- .../struts2/spring/SpringObjectFactoryTest.java | 4 +- .../org/apache/struts2/spring/SpringResult.java | 2 +- .../spring/interceptor/TestActionInvocation.java | 6 ++- .../org/apache/struts2/result/xslt/XSLTResult.java | 12 ++--- .../apache/struts2/result/xslt/XSLTResultTest.java | 8 ++-- 49 files changed, 188 insertions(+), 160 deletions(-) rename core/src/main/java/org/apache/struts2/{ => result}/Result.java (93%)