WW-4572 Simplifies method name
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6ab6ec87 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6ab6ec87 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6ab6ec87 Branch: refs/heads/master Commit: 6ab6ec879cc9eb1997b88856173d2123b32509ee Parents: 69da41e Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Oct 7 10:06:10 2016 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Oct 7 10:06:10 2016 +0200 ---------------------------------------------------------------------- .../xwork2/interceptor/ParametersInterceptor.java | 4 ++-- .../xwork2/interceptor/StaticParametersInterceptor.java | 2 +- .../org/apache/struts2/components/ActionComponent.java | 2 +- .../org/apache/struts2/dispatcher/HttpParameters.java | 2 +- .../interceptor/ActionMappingParametersInteceptor.java | 4 ++-- .../java/com/opensymphony/xwork2/ActionContextTest.java | 2 +- .../interceptor/StaticParametersInterceptorTest.java | 2 +- .../xwork2/validator/DoubleRangeValidatorTest.java | 2 +- .../xwork2/validator/ValidatorAnnotationTest.java | 4 ++-- .../interceptor/ExecuteAndWaitInterceptorTest.java | 2 +- .../struts2/interceptor/FileUploadInterceptorTest.java | 4 ++-- .../apache/struts2/interceptor/I18nInterceptorTest.java | 2 +- .../struts2/interceptor/MessageStoreInterceptorTest.java | 11 ++++------- .../interceptor/MessageStorePreResultListenerTest.java | 4 ++-- .../interceptor/ServletConfigInterceptorTest.java | 4 ++-- .../apache/struts2/interceptor/TokenInterceptorTest.java | 2 +- .../java/org/apache/struts2/util/TokenHelperTest.java | 2 +- .../apache/struts2/portlet/result/PortletResultTest.java | 3 +-- 18 files changed, 27 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java index 4c94b6b..c1439c5 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java @@ -161,10 +161,10 @@ public class ParametersInterceptor extends MethodFilterInterceptor { HttpParameters params; Map<String, Parameter> acceptableParameters; if (ordered) { - params = HttpParameters.createEmpty().withComparator(getOrderedComparator()).withParent(parameters).build(); + params = HttpParameters.create().withComparator(getOrderedComparator()).withParent(parameters).build(); acceptableParameters = new TreeMap<>(getOrderedComparator()); } else { - params = HttpParameters.createEmpty().withParent(parameters).build(); + params = HttpParameters.create().withParent(parameters).build(); acceptableParameters = new TreeMap<>(); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java index 658883f..8aab382 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java @@ -218,7 +218,7 @@ public class StaticParametersInterceptor extends AbstractInterceptor { protected void addParametersToContext(ActionContext ac, Map<String, ?> newParams) { HttpParameters previousParams = ac.getParameters(); - HttpParameters.Builder combinedParams = HttpParameters.createEmpty(); + HttpParameters.Builder combinedParams = HttpParameters.create(); if (overwrite) { if (previousParams != null) { combinedParams = combinedParams.withParent(previousParams); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/components/ActionComponent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/ActionComponent.java b/core/src/main/java/org/apache/struts2/components/ActionComponent.java index 762aafd..d6fb690 100644 --- a/core/src/main/java/org/apache/struts2/components/ActionComponent.java +++ b/core/src/main/java/org/apache/struts2/components/ActionComponent.java @@ -216,7 +216,7 @@ public class ActionComponent extends ContextBean { parentParams = new ActionContext(getStack().getContext()).getParameters(); } - HttpParameters.Builder builder = HttpParameters.createEmpty(); + HttpParameters.Builder builder = HttpParameters.create(); if (parentParams != null) { builder = builder.withParent(parentParams); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java index 5c6360e..ad94ff2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java @@ -20,7 +20,7 @@ public class HttpParameters implements Cloneable { return new Builder(requestParameterMap); } - public static Builder createEmpty() { + public static Builder create() { return new Builder(new HashMap<String, Object>()); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java index 01dec16..5d25c30 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java @@ -86,7 +86,7 @@ public class ActionMappingParametersInteceptor extends ParametersInterceptor { if (mapping != null) { return HttpParameters.create(mapping.getParams()).build(); } else { - return HttpParameters.createEmpty().build(); + return HttpParameters.create().build(); } } @@ -103,7 +103,7 @@ public class ActionMappingParametersInteceptor extends ParametersInterceptor { @Override protected void addParametersToContext(ActionContext ac, Map<String, ?> newParams) { HttpParameters previousParams = ac.getParameters(); - HttpParameters.Builder combinedParams = HttpParameters.createEmpty().withParent(previousParams).withExtraParams(newParams); + HttpParameters.Builder combinedParams = HttpParameters.create().withParent(previousParams).withExtraParams(newParams); ac.setParameters(combinedParams.build()); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java index 2608353..c8b8d5d 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ActionContextTest.java @@ -89,7 +89,7 @@ public class ActionContextTest extends XWorkTestCase { } public void testParameters() { - context.setParameters(HttpParameters.createEmpty().build()); + context.setParameters(HttpParameters.create().build()); assertEquals(0, context.getParameters().getNames().size()); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java b/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java index 6c0ecb6..fad3655 100644 --- a/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptorTest.java @@ -126,7 +126,7 @@ public class StaticParametersInterceptorTest extends XWorkTestCase { User user = new User(); ActionContext.getContext().getValueStack().push(user); - ActionContext.getContext().setParameters(HttpParameters.createEmpty().build()); + ActionContext.getContext().setParameters(HttpParameters.create().build()); int before = ActionContext.getContext().getValueStack().size(); interceptor.setMerge("false"); interceptor.intercept(mai); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java index a335de9..64e4c2c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/DoubleRangeValidatorTest.java @@ -235,7 +235,7 @@ public class DoubleRangeValidatorTest extends XWorkTestCase { loadConfigurationProviders(provider, new MockConfigurationProvider()); val = new DoubleRangeFieldValidator(); val.setValueStack(ActionContext.getContext().getValueStack()); - ActionContext.getContext().setParameters(HttpParameters.createEmpty().build()); + ActionContext.getContext().setParameters(HttpParameters.create().build()); } @Override http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java index cfaa765..4867af5 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/ValidatorAnnotationTest.java @@ -37,7 +37,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { public void testNotAnnotatedMethodSuccess2() throws Exception { HashMap<String, Object> extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "notAnnotatedMethod", null, extraContext); proxy.execute(); @@ -50,7 +50,7 @@ public class ValidatorAnnotationTest extends XWorkTestCase { public void testAnnotatedMethodFailure() throws Exception { HashMap<String, Object> extraContext = new HashMap<>(); - extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build()); ActionProxy proxy = actionProxyFactory.createActionProxy("", "annotatedMethod", null, extraContext); proxy.execute(); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java index 0c2854c..7ed4ecb 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptorTest.java @@ -173,7 +173,7 @@ public class ExecuteAndWaitInterceptorTest extends StrutsInternalTestCase { params = new HashMap(); context = new HashMap(); context.put(ActionContext.SESSION, session); - context.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + context.put(ActionContext.PARAMETERS, HttpParameters.create().build()); request = new StrutsMockHttpServletRequest(); httpSession = new StrutsMockHttpSession(); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java index ecc624a..c7cb236 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/FileUploadInterceptorTest.java @@ -201,7 +201,7 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { mai.setResultCode("success"); mai.setInvocationContext(ActionContext.getContext()); - ActionContext.getContext().setParameters(HttpParameters.createEmpty().build()); + ActionContext.getContext().setParameters(HttpParameters.create().build()); ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest(req, 2000)); interceptor.intercept(mai); @@ -222,7 +222,7 @@ public class FileUploadInterceptorTest extends StrutsInternalTestCase { mai.setResultCode("success"); mai.setInvocationContext(ActionContext.getContext()); - ActionContext.getContext().setParameters(HttpParameters.createEmpty().build()); + ActionContext.getContext().setParameters(HttpParameters.create().build()); ActionContext.getContext().put(ServletActionContext.HTTP_REQUEST, createMultipartRequest(req, 2000)); interceptor.intercept(mai); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java index 2744eb1..de056b9 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java @@ -201,7 +201,7 @@ public class I18nInterceptorTest extends TestCase { session = new HashMap(); Map<String, Object> ctx = new HashMap<String, Object>(); - ctx.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + ctx.put(ActionContext.PARAMETERS, HttpParameters.create().build()); ctx.put(ActionContext.SESSION, session); ac = new ActionContext(ctx); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java index 1e73955..380873b 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java @@ -27,12 +27,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.interceptor.PreResultListener; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.dispatcher.HttpParameters; -import org.apache.struts2.result.ServletActionRedirectResult; import org.easymock.EasyMock; import com.opensymphony.xwork2.Action; @@ -40,7 +38,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionSupport; -import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -76,7 +73,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); HttpServletRequest mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class); @@ -151,7 +148,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { EasyMock.replay(mockedRequest); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); actionContext.put(ActionContext.SESSION, sessionMap); mockActionInvocation.getInvocationContext(); @@ -203,7 +200,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); actionContext.put(ActionContext.SESSION, sessionMap); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); @@ -289,7 +286,7 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase { public void testRequestOperationMode3() throws Exception { ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class); mockActionInvocation.getInvocationContext(); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java index 482a9b2..e888a55 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java @@ -111,7 +111,7 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); actionContext.put(ActionContext.SESSION, sessionMap); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); @@ -191,7 +191,7 @@ public class MessageStorePreResultListenerTest extends StrutsInternalTestCase { action.addFieldError("field2", "some field error 2"); ActionContext actionContext = new ActionContext(new HashMap()); - actionContext.setParameters(HttpParameters.createEmpty().build()); + actionContext.setParameters(HttpParameters.create().build()); actionContext.setSession(sessionMap); HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java index 1320b60..fca80f7 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java @@ -88,7 +88,7 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase { MockActionInvocation mai = createActionInvocation(mock); - HttpParameters param = HttpParameters.createEmpty().build(); + HttpParameters param = HttpParameters.create().build(); mai.getInvocationContext().setParameters(param); mock.setParameters(param.toMap()); @@ -104,7 +104,7 @@ public class ServletConfigInterceptorTest extends StrutsInternalTestCase { MockActionInvocation mai = createActionInvocation(mock); - HttpParameters param = HttpParameters.createEmpty().build(); + HttpParameters param = HttpParameters.create().build(); mai.getInvocationContext().setParameters(param); mock.setParameters(param); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index 5f29e1b..26d52d4 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -113,7 +113,7 @@ public class TokenInterceptorTest extends StrutsInternalTestCase { params = new TreeMap<>(); extraContext = new TreeMap<>(); extraContext.put(ActionContext.SESSION, session); - extraContext.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + extraContext.put(ActionContext.PARAMETERS, HttpParameters.create().build()); request = new StrutsMockHttpServletRequest(); httpSession = new StrutsMockHttpSession(); http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java index a4d86eb..da44e9f 100644 --- a/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java +++ b/core/src/test/java/org/apache/struts2/util/TokenHelperTest.java @@ -93,7 +93,7 @@ public class TokenHelperTest extends TestCase { session = new HashMap(); Map ctxMap = new TreeMap(); ctxMap.put(ActionContext.SESSION, session); - ctxMap.put(ActionContext.PARAMETERS, HttpParameters.createEmpty().build()); + ctxMap.put(ActionContext.PARAMETERS, HttpParameters.create().build()); ActionContext ctx = new ActionContext(ctxMap); ActionContext.setContext(ctx); } http://git-wip-us.apache.org/repos/asf/struts/blob/6ab6ec87/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java ---------------------------------------------------------------------- diff --git a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java index b1297e3..b36cf74 100644 --- a/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java +++ b/plugins/portlet/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java @@ -23,7 +23,6 @@ package org.apache.struts2.portlet.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; -import com.sun.net.httpserver.HttpsParameters; import junit.textui.TestRunner; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.HttpParameters; @@ -74,7 +73,7 @@ public class PortletResultTest extends MockObjectTestCase implements StrutsStati Map<String, Object> context = new HashMap<String, Object>(); context.put(SESSION, sessionMap); - context.put(PARAMETERS, HttpParameters.createEmpty().build()); + context.put(PARAMETERS, HttpParameters.create().build()); context.put(STRUTS_PORTLET_CONTEXT, mockCtx.proxy()); ActionContext.setContext(new ActionContext(context));
