You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ku...@apache.org on 2024/11/02 12:06:37 UTC
(struts) branch 7.0.x/merge-master-2024-11-03 created (now 5e4000293)
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a change to branch 7.0.x/merge-master-2024-11-03
in repository https://gitbox.apache.org/repos/asf/struts.git
at 5e4000293 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
This branch includes the following new commits:
new 99a9bc72a Merge branch 'master' into 7.0.x/merge-master-2024-11-03
new 761892cad WW-3714 Move new Result class into result package
new 5e4000293 Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
The 3 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) 02/03: WW-3714 Move new Result class into result package
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 761892cadf52b7071bad4de97850610304a1a714
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Sat Nov 2 23:04:02 2024 +1100
WW-3714 Move new Result class into result package
---
.../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(-)
diff --git a/core/src/main/java/org/apache/struts2/ActionChainResult.java b/core/src/main/java/org/apache/struts2/ActionChainResult.java
index 447601b42..30f59b1a6 100644
--- a/core/src/main/java/org/apache/struts2/ActionChainResult.java
+++ b/core/src/main/java/org/apache/struts2/ActionChainResult.java
@@ -18,10 +18,11 @@
*/
package org.apache.struts2;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.util.TextParseUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.TextParseUtil;
import java.util.HashSet;
import java.util.LinkedList;
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 71e2c8330..f203cc777 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
/**
diff --git a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
index 079b7e17f..b146b7c74 100644
--- a/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
@@ -33,6 +33,7 @@ import org.apache.struts2.interceptor.Interceptor;
import org.apache.struts2.interceptor.PreResultListener;
import org.apache.struts2.interceptor.WithLazyParams;
import org.apache.struts2.ognl.OgnlUtil;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackFactory;
diff --git a/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java b/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java
index d6d88cb8a..f7f92750e 100644
--- a/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java
+++ b/core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java
@@ -24,6 +24,7 @@ import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.UnknownHandlerConfig;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/core/src/main/java/org/apache/struts2/ObjectFactory.java b/core/src/main/java/org/apache/struts2/ObjectFactory.java
index 32e273c87..57838aa77 100644
--- a/core/src/main/java/org/apache/struts2/ObjectFactory.java
+++ b/core/src/main/java/org/apache/struts2/ObjectFactory.java
@@ -18,24 +18,25 @@
*/
package org.apache.struts2;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.InterceptorConfig;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.conversion.TypeConverter;
-import org.apache.struts2.inject.Container;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.interceptor.Interceptor;
-import org.apache.struts2.util.ClassLoaderUtil;
-import org.apache.struts2.validator.Validator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import org.apache.struts2.factory.ActionFactory;
import org.apache.struts2.factory.ConverterFactory;
import org.apache.struts2.factory.InterceptorFactory;
import org.apache.struts2.factory.ResultFactory;
import org.apache.struts2.factory.UnknownHandlerFactory;
import org.apache.struts2.factory.ValidatorFactory;
+import org.apache.struts2.inject.Container;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.interceptor.Interceptor;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.ClassLoaderUtil;
+import org.apache.struts2.validator.Validator;
import java.io.Serializable;
import java.util.Map;
diff --git a/core/src/main/java/org/apache/struts2/UnknownHandler.java b/core/src/main/java/org/apache/struts2/UnknownHandler.java
index a763a01b6..97883cb97 100644
--- a/core/src/main/java/org/apache/struts2/UnknownHandler.java
+++ b/core/src/main/java/org/apache/struts2/UnknownHandler.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import org.apache.struts2.config.entities.ActionConfig;
+import org.apache.struts2.result.Result;
/**
* Handles cases when the result or action is unknown.
diff --git a/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java b/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java
index 8c7a33061..657cebe35 100644
--- a/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java
+++ b/core/src/main/java/org/apache/struts2/UnknownHandlerManager.java
@@ -19,6 +19,7 @@
package org.apache.struts2;
import org.apache.struts2.config.entities.ActionConfig;
+import org.apache.struts2.result.Result;
import java.util.List;
diff --git a/core/src/main/java/org/apache/struts2/config/NullResult.java b/core/src/main/java/org/apache/struts2/config/NullResult.java
index 4ecdf5d48..452a9eb33 100644
--- a/core/src/main/java/org/apache/struts2/config/NullResult.java
+++ b/core/src/main/java/org/apache/struts2/config/NullResult.java
@@ -19,7 +19,7 @@
package org.apache.struts2.config;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
/**
* Null result to get around annotation defaults that can't be null
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index b7583f6e6..718aec72a 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -18,6 +18,16 @@
*/
package org.apache.struts2.dispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
@@ -26,55 +36,45 @@ import org.apache.struts2.FileManager;
import org.apache.struts2.FileManagerFactory;
import org.apache.struts2.LocaleProviderFactory;
import org.apache.struts2.ObjectFactory;
-import org.apache.struts2.Result;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.StrutsStatics;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.ConfigurationManager;
import org.apache.struts2.config.ConfigurationProvider;
+import org.apache.struts2.config.DefaultPropertiesProvider;
import org.apache.struts2.config.FileManagerFactoryProvider;
import org.apache.struts2.config.FileManagerProvider;
+import org.apache.struts2.config.PropertiesConfigurationProvider;
import org.apache.struts2.config.ServletContextAwareConfigurationProvider;
+import org.apache.struts2.config.StrutsBeanSelectionProvider;
+import org.apache.struts2.config.StrutsJavaConfiguration;
+import org.apache.struts2.config.StrutsJavaConfigurationProvider;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.config.entities.InterceptorMapping;
import org.apache.struts2.config.entities.InterceptorStackConfig;
import org.apache.struts2.config.entities.PackageConfig;
import org.apache.struts2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.ContainerBuilder;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.interceptor.Interceptor;
+import org.apache.struts2.ognl.ThreadAllowlist;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ClassLoaderUtil;
+import org.apache.struts2.util.ObjectFactoryDestroyable;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackFactory;
+import org.apache.struts2.util.fs.JBossFileManager;
import org.apache.struts2.util.location.LocatableProperties;
import org.apache.struts2.util.location.Location;
import org.apache.struts2.util.location.LocationUtils;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.LocaleUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.config.DefaultPropertiesProvider;
-import org.apache.struts2.config.PropertiesConfigurationProvider;
-import org.apache.struts2.config.StrutsBeanSelectionProvider;
-import org.apache.struts2.config.StrutsJavaConfiguration;
-import org.apache.struts2.config.StrutsJavaConfigurationProvider;
-import org.apache.struts2.config.StrutsXmlConfigurationProvider;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
-import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
-import org.apache.struts2.ognl.ThreadAllowlist;
-import org.apache.struts2.util.ObjectFactoryDestroyable;
-import org.apache.struts2.util.fs.JBossFileManager;
import java.io.File;
import java.io.IOException;
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
index 6414d3922..4b21393d8 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
@@ -18,7 +18,7 @@
*/
package org.apache.struts2.dispatcher.mapper;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/src/main/java/org/apache/struts2/factory/ResultFactory.java b/core/src/main/java/org/apache/struts2/factory/ResultFactory.java
index 52df10c91..88331feba 100644
--- a/core/src/main/java/org/apache/struts2/factory/ResultFactory.java
+++ b/core/src/main/java/org/apache/struts2/factory/ResultFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.struts2.factory;
-import org.apache.struts2.Result;
import org.apache.struts2.config.entities.ResultConfig;
+import org.apache.struts2.result.Result;
import java.util.Map;
/**
- * Used by {@link org.apache.struts2.ObjectFactory} to build {@link org.apache.struts2.Result}
+ * Used by {@link org.apache.struts2.ObjectFactory} to build {@link Result}
*/
public interface ResultFactory {
diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
index 3aceaead0..53f0e32d9 100644
--- a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
+++ b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
@@ -19,11 +19,11 @@
package org.apache.struts2.factory;
import org.apache.struts2.ObjectFactory;
-import org.apache.struts2.Result;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.result.ParamNameAwareResult;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.reflection.ReflectionException;
import org.apache.struts2.util.reflection.ReflectionExceptionHandler;
import org.apache.struts2.util.reflection.ReflectionProvider;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
index 9e38264e9..f7755d212 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
@@ -22,10 +22,10 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ActionChainResult;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.Unchainable;
import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.CompoundRoot;
import org.apache.struts2.util.ProxyUtil;
import org.apache.struts2.util.TextParseUtil;
diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
index 73fe73754..55231f09d 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
@@ -18,12 +18,11 @@
*/
package org.apache.struts2.interceptor;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.interceptor.AbstractInterceptor;
-import org.apache.struts2.interceptor.ValidationAware;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionInvocation;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.result.Result;
import org.apache.struts2.result.ServletRedirectResult;
import java.io.Serial;
@@ -58,7 +57,7 @@ import java.util.Map;
* <p>
* In the 'AUTOMATIC' mode, the interceptor will always retrieve the stored action's message / errors
* and field errors and put them back into the {@link ValidationAware} action, and after Action execution,
- * if the {@link org.apache.struts2.Result} is an instance of {@link ServletRedirectResult}, the action's message / errors
+ * if the {@link Result} is an instance of {@link ServletRedirectResult}, the action's message / errors
* and field errors into automatically be stored in the HTTP session..
* </p>
*
diff --git a/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
index 69745b925..affdfc318 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
@@ -19,10 +19,11 @@
package org.apache.struts2.interceptor;
import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.result.Result;
/**
* PreResultListeners may be registered with an {@link ActionInvocation} to get a callback after the
- * {@link org.apache.struts2.Action} has been executed but before the {@link org.apache.struts2.Result}
+ * {@link org.apache.struts2.Action} has been executed but before the {@link Result}
* is executed.
*
* @author Jason Carreira
@@ -31,7 +32,7 @@ public interface PreResultListener {
/**
* This callback method will be called after the {@link org.apache.struts2.Action} execution and
- * before the {@link org.apache.struts2.Result} execution.
+ * before the {@link Result} execution.
*
* @param invocation the action invocation
* @param resultCode the result code returned by the action (eg. <code>success</code>).
diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
index 331f8e6c7..7801f7fcd 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
@@ -18,17 +18,17 @@
*/
package org.apache.struts2.interceptor;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
-import org.apache.struts2.util.ValueStack;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.InvocationSessionStore;
import org.apache.struts2.util.TokenHelper;
+import org.apache.struts2.util.ValueStack;
import java.io.Serial;
diff --git a/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java b/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java
index ddfc2bded..ef7425fba 100644
--- a/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java
@@ -22,8 +22,8 @@ import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionEventListener;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
-import org.apache.struts2.Result;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
import java.util.ArrayList;
diff --git a/core/src/main/java/org/apache/struts2/mock/MockResult.java b/core/src/main/java/org/apache/struts2/mock/MockResult.java
index 4993d8deb..c05f05abf 100644
--- a/core/src/main/java/org/apache/struts2/mock/MockResult.java
+++ b/core/src/main/java/org/apache/struts2/mock/MockResult.java
@@ -19,7 +19,7 @@
package org.apache.struts2.mock;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
/**
* Mock for a {@link Result}.
diff --git a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java
index 4895bbc90..0f7031346 100644
--- a/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java
+++ b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java
@@ -18,13 +18,12 @@
*/
package org.apache.struts2.result;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
-import org.apache.struts2.util.TextParseUtil;
-import org.apache.struts2.util.ValueStack;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.util.TextParseUtil;
+import org.apache.struts2.util.ValueStack;
import java.io.Serial;
import java.util.HashMap;
diff --git a/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java b/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java
index d3438e6df..c23cc204c 100644
--- a/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java
@@ -19,7 +19,7 @@
package org.apache.struts2.result;
/**
- * Accept parameter name/value to be set on {@link org.apache.struts2.Result}
+ * Accept parameter name/value to be set on {@link Result}
*/
public interface ParamNameAwareResult {
diff --git a/core/src/main/java/org/apache/struts2/result/PlainResult.java b/core/src/main/java/org/apache/struts2/result/PlainResult.java
index 160e97ba8..2b56ea31d 100644
--- a/core/src/main/java/org/apache/struts2/result/PlainResult.java
+++ b/core/src/main/java/org/apache/struts2/result/PlainResult.java
@@ -18,18 +18,16 @@
*/
package org.apache.struts2.result;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.struts2.ActionInvocation;
import org.apache.struts2.StrutsException;
import org.apache.struts2.result.plain.HttpHeader;
import org.apache.struts2.result.plain.ResponseBuilder;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletResponse;
-
/**
* This result can only be used in code, as a result of action's method, eg.:
* <p>
diff --git a/core/src/main/java/org/apache/struts2/Result.java b/core/src/main/java/org/apache/struts2/result/Result.java
similarity index 93%
rename from core/src/main/java/org/apache/struts2/Result.java
rename to core/src/main/java/org/apache/struts2/result/Result.java
index 407994eab..c30083d86 100644
--- a/core/src/main/java/org/apache/struts2/Result.java
+++ b/core/src/main/java/org/apache/struts2/result/Result.java
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2;
+package org.apache.struts2.result;
+
+import org.apache.struts2.Action;
+import org.apache.struts2.ActionInvocation;
import java.io.Serializable;
diff --git a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
index 5de96b130..fe78231ae 100644
--- a/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
@@ -19,9 +19,9 @@
package org.apache.struts2.result;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.util.reflection.ReflectionExceptionHandler;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.util.reflection.ReflectionExceptionHandler;
import java.io.Serial;
import java.util.List;
@@ -156,7 +156,7 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement
}
/**
- * @see org.apache.struts2.Result#execute(org.apache.struts2.ActionInvocation)
+ * @see Result#execute(org.apache.struts2.ActionInvocation)
*/
public void execute(ActionInvocation invocation) throws Exception {
if (invocation == null) {
diff --git a/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
index 12c278a29..675dbed05 100644
--- a/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
+++ b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
@@ -21,7 +21,6 @@ package org.apache.struts2.result;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.util.TextParseUtil;
@@ -106,11 +105,11 @@ import java.util.Collection;
* </pre>
*
* <p>
- * Please see the {@link org.apache.struts2.Result} class for more info on Results in general.
+ * Please see the {@link Result} class for more info on Results in general.
* </p>
* <!-- END SNIPPET: example -->
*
- * @see org.apache.struts2.Result
+ * @see Result
*/
public abstract class StrutsResultSupport implements Result, StrutsStatics {
diff --git a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
index 12b04e8aa..58f4ea90a 100644
--- a/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
+++ b/core/src/test/java/org/apache/struts2/ActionChainResultTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.struts2;
+import org.apache.struts2.result.Result;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -36,4 +37,4 @@ public class ActionChainResultTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/org/apache/struts2/ActionInvocationTest.java b/core/src/test/java/org/apache/struts2/ActionInvocationTest.java
index 861facf04..bca98a269 100644
--- a/core/src/test/java/org/apache/struts2/ActionInvocationTest.java
+++ b/core/src/test/java/org/apache/struts2/ActionInvocationTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.struts2;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.providers.XmlConfigurationProvider;
-import org.apache.struts2.mock.MockResult;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.dispatcher.HttpParameters;
+import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.Result;
import java.util.HashMap;
diff --git a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
index f7e3f2aa6..b853a23ce 100644
--- a/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
+++ b/core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.struts2;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.InterceptorMapping;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.dispatcher.HttpParameters;
import org.apache.struts2.interceptor.Interceptor;
import org.apache.struts2.mock.MockActionProxy;
import org.apache.struts2.mock.MockInterceptor;
import org.apache.struts2.mock.MockResult;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackFactory;
-import org.apache.struts2.config.StrutsXmlConfigurationProvider;
-import org.apache.struts2.dispatcher.HttpParameters;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/core/src/test/java/org/apache/struts2/SimpleAction.java b/core/src/test/java/org/apache/struts2/SimpleAction.java
index ba5ac9528..1f054eade 100644
--- a/core/src/test/java/org/apache/struts2/SimpleAction.java
+++ b/core/src/test/java/org/apache/struts2/SimpleAction.java
@@ -20,6 +20,7 @@ package org.apache.struts2;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
import java.util.ArrayList;
import java.util.Date;
diff --git a/core/src/test/java/org/apache/struts2/TestActionTagResult.java b/core/src/test/java/org/apache/struts2/TestActionTagResult.java
index 58fcc4fd4..c99f652cf 100644
--- a/core/src/test/java/org/apache/struts2/TestActionTagResult.java
+++ b/core/src/test/java/org/apache/struts2/TestActionTagResult.java
@@ -18,8 +18,7 @@
*/
package org.apache.struts2;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
public class TestActionTagResult implements Result {
diff --git a/core/src/test/java/org/apache/struts2/TestResult.java b/core/src/test/java/org/apache/struts2/TestResult.java
index 49a0f4082..26cbf37e4 100644
--- a/core/src/test/java/org/apache/struts2/TestResult.java
+++ b/core/src/test/java/org/apache/struts2/TestResult.java
@@ -18,13 +18,11 @@
*/
package org.apache.struts2;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
-import org.apache.struts2.util.ValueStack;
-import org.junit.Assert;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.ValueStack;
+import org.junit.Assert;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/test/java/org/apache/struts2/VoidResult.java b/core/src/test/java/org/apache/struts2/VoidResult.java
index 2eedd2dc1..f5657c45a 100644
--- a/core/src/test/java/org/apache/struts2/VoidResult.java
+++ b/core/src/test/java/org/apache/struts2/VoidResult.java
@@ -18,6 +18,8 @@
*/
package org.apache.struts2;
+import org.apache.struts2.result.Result;
+
/**
*/
public class VoidResult implements Result {
diff --git a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
index 104f2093e..45e6dd2c6 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
@@ -60,7 +60,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.mock.MockInterceptor"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"),
- Class.forName("org.apache.struts2.Result"),
+ Class.forName("org.apache.struts2.result.Result"),
Class.forName("org.apache.struts2.SimpleAction")
);
}
@@ -84,7 +84,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.mock.MockInterceptor"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"),
- Class.forName("org.apache.struts2.Result"),
+ Class.forName("org.apache.struts2.result.Result"),
Class.forName("org.apache.struts2.SimpleAction")
);
}
@@ -108,7 +108,7 @@ public class ConfigurationProviderOgnlAllowlistTest extends XWorkJUnit4TestCase
Class.forName("org.apache.struts2.Validateable"),
Class.forName("org.apache.struts2.Action"),
Class.forName("org.apache.struts2.interceptor.AbstractInterceptor"),
- Class.forName("org.apache.struts2.Result")
+ Class.forName("org.apache.struts2.result.Result")
);
}
}
diff --git a/core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java b/core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java
index 8b3cd156d..05aae7cf0 100644
--- a/core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java
+++ b/core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java
@@ -19,10 +19,10 @@
package org.apache.struts2.config.providers;
import org.apache.struts2.ActionContext;
-import org.apache.struts2.Result;
+import org.apache.struts2.StrutsException;
import org.apache.struts2.UnknownHandler;
import org.apache.struts2.config.entities.ActionConfig;
-import org.apache.struts2.StrutsException;
+import org.apache.struts2.result.Result;
public class SomeUnknownHandler implements UnknownHandler{
private ActionConfig actionConfig;
diff --git a/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java b/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
index 196ab2f35..65d4b4f41 100644
--- a/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
+++ b/core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
@@ -20,10 +20,10 @@ package org.apache.struts2.factory;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
-import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.result.ParamNameAwareResult;
+import org.apache.struts2.result.Result;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
index d38d861a9..658b5e4ca 100644
--- a/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
+++ b/core/src/test/java/org/apache/struts2/result/PlainResultTest.java
@@ -19,10 +19,9 @@
package org.apache.struts2.result;
import org.apache.struts2.ActionContext;
-import org.apache.struts2.Result;
-import org.apache.struts2.mock.MockActionInvocation;
import org.apache.struts2.StrutsException;
import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.mock.MockActionInvocation;
import org.apache.struts2.result.plain.ResponseBuilder;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java b/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java
index aef22de90..2bd310985 100644
--- a/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java
+++ b/core/src/test/java/org/apache/struts2/result/PostbackResultTest.java
@@ -21,12 +21,11 @@ package org.apache.struts2.result;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
-import org.apache.struts2.Result;
-import org.apache.struts2.util.ValueStack;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
+import org.apache.struts2.util.ValueStack;
import org.easymock.IMocksControl;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java
index a0b043fbb..ced68e3d9 100644
--- a/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java
+++ b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java
@@ -20,26 +20,25 @@ package org.apache.struts2.result;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
-import org.apache.struts2.Result;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsInternalTestCase;
+import org.apache.struts2.StrutsStatics;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.PackageConfig;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.mock.MockActionInvocation;
-import org.apache.struts2.util.ValueStack;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsInternalTestCase;
-import org.apache.struts2.StrutsStatics;
import org.apache.struts2.url.StrutsQueryStringBuilder;
import org.apache.struts2.url.StrutsUrlEncoder;
+import org.apache.struts2.util.ValueStack;
import org.easymock.IMocksControl;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/VoidResult.java b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/VoidResult.java
index 01acceca2..d81525fdf 100644
--- a/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/VoidResult.java
+++ b/plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/VoidResult.java
@@ -19,7 +19,7 @@
package org.apache.struts.beanvalidation;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
public class VoidResult implements Result {
public void execute(ActionInvocation invocation) throws Exception {
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index c5be55ffc..f7406e3dd 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -18,29 +18,38 @@
*/
package org.apache.struts2.convention;
-import org.apache.struts2.*;
+import jakarta.servlet.ServletContext;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.Action;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionSupport;
+import org.apache.struts2.ObjectFactory;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.UnknownHandler;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.config.ConfigurationException;
-import org.apache.struts2.config.entities.*;
+import org.apache.struts2.config.entities.ActionConfig;
+import org.apache.struts2.config.entities.InterceptorMapping;
+import org.apache.struts2.config.entities.PackageConfig;
+import org.apache.struts2.config.entities.ResultConfig;
+import org.apache.struts2.config.entities.ResultTypeConfig;
import org.apache.struts2.config.providers.InterceptorBuilder;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.struts2.util.TextParseUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.struts2.StrutsException;
-import jakarta.servlet.ServletContext;
import java.net.MalformedURLException;
-import java.util.*;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* <p>
diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
index 6aff13694..c17a75b02 100644
--- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
+++ b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
@@ -18,12 +18,14 @@
*/
package org.apache.struts2.convention;
+import jakarta.servlet.ServletContext;
+import junit.framework.TestCase;
+import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.ActionChainResult;
import org.apache.struts2.ActionContext;
import org.apache.struts2.FileManager;
import org.apache.struts2.FileManagerFactory;
import org.apache.struts2.ObjectFactory;
-import org.apache.struts2.Result;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.ExceptionMappingConfig;
@@ -34,16 +36,6 @@ import org.apache.struts2.config.entities.PackageConfig;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.config.entities.ResultTypeConfig;
import org.apache.struts2.config.impl.DefaultConfiguration;
-import org.apache.struts2.factory.DefaultInterceptorFactory;
-import org.apache.struts2.inject.Container;
-import org.apache.struts2.inject.Scope.Strategy;
-import org.apache.struts2.ognl.OgnlReflectionProvider;
-import org.apache.struts2.util.TextParseUtil;
-import org.apache.struts2.util.fs.DefaultFileManager;
-import org.apache.struts2.util.fs.DefaultFileManagerFactory;
-import org.apache.struts2.util.reflection.ReflectionException;
-import junit.framework.TestCase;
-import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.convention.actions.DefaultResultPathAction;
import org.apache.struts2.convention.actions.NoAnnotationAction;
import org.apache.struts2.convention.actions.Skip;
@@ -96,12 +88,20 @@ import org.apache.struts2.convention.actions.transactions.TransNameAction;
import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.Actions;
import org.apache.struts2.convention.dontfind.DontFindMeAction;
+import org.apache.struts2.factory.DefaultInterceptorFactory;
import org.apache.struts2.factory.StrutsResultFactory;
+import org.apache.struts2.inject.Container;
+import org.apache.struts2.inject.Scope.Strategy;
+import org.apache.struts2.ognl.OgnlReflectionProvider;
import org.apache.struts2.ognl.ProviderAllowlist;
+import org.apache.struts2.result.Result;
import org.apache.struts2.result.ServletDispatcherResult;
+import org.apache.struts2.util.TextParseUtil;
+import org.apache.struts2.util.fs.DefaultFileManager;
+import org.apache.struts2.util.fs.DefaultFileManagerFactory;
+import org.apache.struts2.util.reflection.ReflectionException;
import org.easymock.EasyMock;
-import jakarta.servlet.ServletContext;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
index 1cc2d4a1e..f021a61ec 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
@@ -18,22 +18,22 @@
*/
package org.apache.struts2.json;
-import org.apache.struts2.ActionContext;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.ModelDriven;
-import org.apache.struts2.Result;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.util.ValueStack;
-import org.apache.struts2.util.WildcardUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.ModelDriven;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.inject.Inject;
import org.apache.struts2.json.smd.SMDGenerator;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.ValueStack;
+import org.apache.struts2.util.WildcardUtil;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
index 34bf41d5d..78ee5535b 100644
--- a/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
+++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
@@ -18,19 +18,19 @@
*/
package org.apache.struts2.json;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.struts2.ActionContext;
-import org.apache.struts2.Result;
-import org.apache.struts2.mock.MockActionInvocation;
-import org.apache.struts2.util.ValueStack;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.junit.StrutsTestCase;
import org.apache.struts2.junit.util.TestUtils;
+import org.apache.struts2.mock.MockActionInvocation;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.ValueStack;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
-import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.SimpleDateFormat;
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
index b2d84f8f0..5c781bc30 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
@@ -18,22 +18,26 @@
*/
package org.apache.struts2.rest;
-import org.apache.struts2.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.struts2.Action;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.DefaultActionInvocation;
+import org.apache.struts2.ModelDriven;
+import org.apache.struts2.ServletActionContext;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.entities.ActionConfig;
import org.apache.struts2.config.entities.ResultConfig;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.interceptor.ValidationAware;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.result.HttpHeaderResult;
import org.apache.struts2.rest.handler.ContentTypeHandler;
import org.apache.struts2.rest.handler.HtmlHandler;
+import org.apache.struts2.result.HttpHeaderResult;
+import org.apache.struts2.result.Result;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
diff --git a/plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java b/plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java
index 6613949be..214fcaa50 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java
@@ -20,8 +20,14 @@ package org.apache.struts2;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.inject.Inject;
-
-import java.util.*;
+import org.apache.struts2.result.Result;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
index 4a5e84300..2ab25ce34 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
@@ -23,7 +23,6 @@ import org.apache.struts2.ActionChainResult;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ModelDrivenAction;
import org.apache.struts2.ObjectFactory;
-import org.apache.struts2.Result;
import org.apache.struts2.SimpleAction;
import org.apache.struts2.TestBean;
import org.apache.struts2.TextProvider;
@@ -36,13 +35,14 @@ import org.apache.struts2.inject.ContainerBuilder;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.interceptor.Interceptor;
import org.apache.struts2.interceptor.ModelDrivenInterceptor;
+import org.apache.struts2.interceptor.NoOpInterceptor;
import org.apache.struts2.mock.DummyTextProvider;
+import org.apache.struts2.result.Result;
import org.apache.struts2.test.StubConfigurationProvider;
import org.apache.struts2.util.location.LocatableProperties;
import org.apache.struts2.validator.Validator;
import org.apache.struts2.validator.validators.ExpressionValidator;
import org.apache.struts2.validator.validators.RequiredStringValidator;
-import org.apache.struts2.interceptor.NoOpInterceptor;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
import org.springframework.aop.interceptor.DebugInterceptor;
diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java
index 8a49aef79..10399d85a 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java
@@ -19,7 +19,7 @@
package org.apache.struts2.spring;
import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
+import org.apache.struts2.result.Result;
public class SpringResult implements Result {
diff --git a/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java b/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java
index e3a2a0e09..0986fa54b 100644
--- a/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java
+++ b/plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java
@@ -18,8 +18,12 @@
*/
package org.apache.struts2.spring.interceptor;
-import org.apache.struts2.*;
+import org.apache.struts2.ActionContext;
+import org.apache.struts2.ActionEventListener;
+import org.apache.struts2.ActionInvocation;
+import org.apache.struts2.ActionProxy;
import org.apache.struts2.interceptor.PreResultListener;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ValueStack;
import java.lang.reflect.Method;
diff --git a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java
index 26f618b60..b6d8ec62a 100644
--- a/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java
+++ b/plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java
@@ -18,18 +18,18 @@
*/
package org.apache.struts2.result.xslt;
-import org.apache.struts2.ActionInvocation;
-import org.apache.struts2.Result;
-import org.apache.struts2.inject.Inject;
-import org.apache.struts2.util.TextParseUtil;
-import org.apache.struts2.util.ValueStack;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsException;
+import org.apache.struts2.inject.Inject;
+import org.apache.struts2.result.Result;
+import org.apache.struts2.util.TextParseUtil;
+import org.apache.struts2.util.ValueStack;
-import jakarta.servlet.http.HttpServletResponse;
import javax.xml.XMLConstants;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys;
diff --git a/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java b/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java
index ee3e1b36f..c8ef8a2fe 100644
--- a/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java
+++ b/plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.struts2.result.xslt;
+import junit.framework.TestCase;
import org.apache.struts2.Action;
import org.apache.struts2.ActionContext;
-import org.apache.struts2.Result;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.junit.StrutsTestCase;
import org.apache.struts2.mock.MockActionInvocation;
+import org.apache.struts2.result.Result;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.struts2.util.ValueStack;
-import junit.framework.TestCase;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.junit.StrutsTestCase;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
(struts) 01/03: Merge branch 'master' into 7.0.x/merge-master-2024-11-03
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 99a9bc72a090dd9b2962494349dbeb628fbc22af
Merge: 46251a11f 22036174c
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Sat Nov 2 23:02:21 2024 +1100
Merge branch 'master' into 7.0.x/merge-master-2024-11-03
.../java/org/apache/struts2/components/UIBean.java | 9 +++-
.../org/apache/struts2/components/UIBeanTest.java | 48 ++++++++++++++++++----
2 files changed, 47 insertions(+), 10 deletions(-)
(struts) 03/03: Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03
Posted by ku...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch 7.0.x/merge-master-2024-11-03
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 5e40002937aefd6812c44772ab7351a2c8d2b30d
Merge: 761892cad d351843ec
Author: Kusal Kithul-Godage <gi...@kusal.io>
AuthorDate: Sat Nov 2 23:04:47 2024 +1100
Merge remote-tracking branch 'origin/WW-3714-result-repackage' into 7.0.x/merge-master-2024-11-03