Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3714 Move new Result class into result package

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2024-11-02 23:04:02 +11:00
parent 46251a11fb
commit 87df4a229d
49 changed files with 193 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/ActionChainResult.java
+3 -2
View File
@@ -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;
core/src/main/java/org/apache/struts2/ActionInvocation.java
+1
View File
@@ -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;
/**
core/src/main/java/org/apache/struts2/DefaultActionInvocation.java
+1
View File
@@ -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;
core/src/main/java/org/apache/struts2/DefaultUnknownHandlerManager.java
+1
View File
@@ -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;
core/src/main/java/org/apache/struts2/ObjectFactory.java
+8 -7
View File
@@ -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;
core/src/main/java/org/apache/struts2/UnknownHandler.java
+1
View File
@@ -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.
core/src/main/java/org/apache/struts2/UnknownHandlerManager.java
+1
View File
@@ -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;
core/src/main/java/org/apache/struts2/config/NullResult.java
+1 -1
View File
@@ -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
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+30 -30
View File
@@ -18,36 +18,6 @@
*/
package org.apache.struts2.dispatcher;
import org.apache.struts2.ActionContext;
import org.apache.struts2.ActionInvocation;
import org.apache.struts2.ActionProxy;
import org.apache.struts2.ActionProxyFactory;
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.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.FileManagerFactoryProvider;
import org.apache.struts2.config.FileManagerProvider;
import org.apache.struts2.config.ServletContextAwareConfigurationProvider;
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.inject.Container;
import org.apache.struts2.inject.ContainerBuilder;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.interceptor.Interceptor;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.struts2.util.ValueStack;
import org.apache.struts2.util.ValueStackFactory;
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;
@@ -58,23 +28,53 @@ 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;
import org.apache.struts2.ActionProxyFactory;
import org.apache.struts2.FileManager;
import org.apache.struts2.FileManagerFactory;
import org.apache.struts2.LocaleProviderFactory;
import org.apache.struts2.ObjectFactory;
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 java.io.File;
import java.io.IOException;
core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
+1 -1
View File
@@ -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;
core/src/main/java/org/apache/struts2/factory/ResultFactory.java
+2 -2
View File
@@ -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 {
core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java
+1 -1
View File
@@ -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;
core/src/main/java/org/apache/struts2/interceptor/ChainingInterceptor.java
+1 -1
View File
@@ -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;
core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
+3 -4
View File
@@ -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>
*
core/src/main/java/org/apache/struts2/interceptor/PreResultListener.java
+3 -2
View File
@@ -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>).
core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java
+4 -4
View File
@@ -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;
core/src/main/java/org/apache/struts2/mock/MockActionInvocation.java
+1 -1
View File
@@ -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;
core/src/main/java/org/apache/struts2/mock/MockResult.java
+1 -1
View File
@@ -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}.
core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java
+3 -4
View File
@@ -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;
core/src/main/java/org/apache/struts2/result/ParamNameAwareResult.java
+1 -1
View File
@@ -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 {
core/src/main/java/org/apache/struts2/result/PlainResult.java
+3 -5
View File
@@ -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>
core/src/main/java/org/apache/struts2/Result.java → core/src/main/java/org/apache/struts2/result/Result.java
+4 -1
View File
@@ -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;
core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java
+2 -2
View File
@@ -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) {
core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java
+2 -3
View File
@@ -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 {
core/src/test/java/org/apache/struts2/ActionChainResultTest.java
+2 -1
View File
@@ -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 {
}
}
}
}
core/src/test/java/org/apache/struts2/ActionInvocationTest.java
+3 -3
View File
@@ -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;
core/src/test/java/org/apache/struts2/DefaultActionInvocationTest.java
+3 -2
View File
@@ -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;
core/src/test/java/org/apache/struts2/SimpleAction.java
+1
View File
@@ -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;
core/src/test/java/org/apache/struts2/TestActionTagResult.java
+1 -2
View File
@@ -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 {
core/src/test/java/org/apache/struts2/TestResult.java
+3 -5
View File
@@ -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;
core/src/test/java/org/apache/struts2/VoidResult.java
+2
View File
@@ -18,6 +18,8 @@
*/
package org.apache.struts2;
import org.apache.struts2.result.Result;
/**
*/
public class VoidResult implements Result {
core/src/test/java/org/apache/struts2/config/providers/ConfigurationProviderOgnlAllowlistTest.java
+3 -3
View File
@@ -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")
);
}
}
core/src/test/java/org/apache/struts2/config/providers/SomeUnknownHandler.java
+2 -2
View File
@@ -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;
core/src/test/java/org/apache/struts2/factory/StrutsResultFactoryTest.java
+2 -2
View File
@@ -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;
core/src/test/java/org/apache/struts2/result/PlainResultTest.java
+1 -2
View File
@@ -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;
core/src/test/java/org/apache/struts2/result/PostbackResultTest.java
+1 -2
View File
@@ -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;
core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java
+6 -7
View File
@@ -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;
plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/VoidResult.java
+1 -1
View File
@@ -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 {
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+20 -11
View File
@@ -18,29 +18,38 @@
*/
package org.apache.struts2.convention;
import org.apache.struts2.*;
import org.apache.struts2.config.Configuration;
import org.apache.struts2.config.ConfigurationException;
import org.apache.struts2.config.entities.*;
import org.apache.struts2.config.providers.InterceptorBuilder;
import org.apache.struts2.inject.Container;
import org.apache.struts2.inject.Inject;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.struts2.util.TextParseUtil;
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.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 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>
plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
+12 -12
View File
@@ -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;
plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
+9 -9
View File
@@ -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;
plugins/json/src/test/java/org/apache/struts2/json/JSONResultTest.java
+4 -4
View File
@@ -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;
plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
+12 -8
View File
@@ -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;
plugins/spring/src/test/java/org/apache/struts2/SimpleAction.java
+7 -1
View File
@@ -20,8 +20,14 @@ 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.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
plugins/spring/src/test/java/org/apache/struts2/spring/SpringObjectFactoryTest.java
+2 -2
View File
@@ -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;
plugins/spring/src/test/java/org/apache/struts2/spring/SpringResult.java
+1 -1
View File
@@ -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 {
plugins/spring/src/test/java/org/apache/struts2/spring/interceptor/TestActionInvocation.java
+5 -1
View File
@@ -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;
plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java
+6 -6
View File
@@ -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;
plugins/xslt/src/test/java/org/apache/struts2/result/xslt/XSLTResultTest.java
+5 -5
View File
@@ -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.mock.MockActionInvocation;
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.apache.struts2.mock.MockActionInvocation;
import org.apache.struts2.result.Result;
import org.apache.struts2.util.ClassLoaderUtil;
import org.apache.struts2.util.ValueStack;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;