Author: julien(a)jboss.com Date: 2008-01-15 18:40:57 -0500 (Tue, 15 Jan 2008) New Revision: 9519 Removed: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParameters.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ActionContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ActionContextSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ParametersTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestActionContext.java Log: remove PortletParameters class in favor of ParameterMap Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParameters.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParameters.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParameters.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -1,148 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.ParameterMap; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - - -/** - * A set of parameters. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7209 $ - */ -public final class PortletParameters extends ParameterMap implements Serializable -{ - - /** The serialVersionUID */ - private static final long serialVersionUID = -8529807471117491810L; - - /** Creates an empty parameter set. */ - public PortletParameters() - { - } - - /** - * Copy the parameter map to initialize the object state. - * - * @param parameterMap the parameter map - * @throws NullPointerException if the map contains a null key or a null value - * @throws IllegalArgumentException if the map is null or it contains a value with a zero length array or a null - * element in the array - * @throws ClassCastException if the map contains a key that is not a string or a value that is not a string - * array - */ - public PortletParameters(Map<String,String[]> parameterMap) throws NullPointerException, ClassCastException, IllegalArgumentException - { - if (parameterMap == null) - { - throw new IllegalArgumentException("No null map accepted"); - } - - // - replace(parameterMap); - } - - /** - * Append the content of the argument map to that map. If both maps contains an entry sharing the same key, then the - * string arrays or the two entries will be concatenated into a single array. Each entry present on the argument map - * and not in the current map will be kept as is. The argument validation is performed before the state is updated. - * - * @param params the parameters to appends - * @throws NullPointerException if the map contains a null key or a null value - * @throws IllegalArgumentException if the map is null or it contains a value with a zero length array or a null - * element in the array - * @throws ClassCastException if the map contains a key that is not a string or a value that is not a string - * array - */ - public void append(Map<String, String[]> params) throws ClassCastException, NullPointerException, IllegalArgumentException - { - // Clone - params = new HashMap<String, String[]>(params); - - // - for (Map.Entry<String, String[]> entry : params.entrySet()) - { - String[] existingValue = get(entry.getKey()); - - // Perform the appending operation if the entry exist - if (existingValue != null) - { - String[] appendedValue = entry.getValue(); - String[] newValue = new String[existingValue.length + appendedValue.length]; - System.arraycopy(existingValue, 0, newValue, 0, existingValue.length); - System.arraycopy(appendedValue, 0, newValue, existingValue.length, appendedValue.length); - entry.setValue(newValue); - } - } - - // - putAll(params); - } - - public String toString() - { - StringBuffer buffer = new StringBuffer("Parameters["); - for (Iterator i = entrySet().iterator(); i.hasNext();) - { - Map.Entry entry = (Map.Entry)i.next(); - String name = (String)entry.getKey(); - String[] values = (String[])entry.getValue(); - buffer.append(name); - for (int j = 0; j < values.length; j++) - { - buffer.append(j > 0 ? ',' : '=').append(values[j]); - } - if (i.hasNext()) - { - buffer.append(" | "); - } - } - buffer.append(']'); - return buffer.toString(); - } - - /** - * Safely wrap the map as a portlet parameters object. If the map is already a portlet parameter object, just return - * that object otherwise return a wrapper around the map. - * - * @param map the map - * @return the portlet parameters - */ - public static PortletParameters wrap(Map<String, String[]> map) - { - if (map instanceof PortletParameters) - { - return (PortletParameters)map; - } - else - { - return new PortletParameters(map); - } - } -} Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletParametersStateString.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet; import org.jboss.portal.common.util.Base64; +import org.jboss.portal.common.util.ParameterMap; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -51,7 +52,7 @@ private static final String EOF = "__EOF__"; /** The data. */ - private PortletParameters parameters; + private ParameterMap parameters; /** * Factory method that will create the most appropriate form. @@ -89,7 +90,7 @@ public static PortletParametersStateString create(Map<String, String[]> parameterMap) { - PortletParameters params = PortletParameters.wrap(parameterMap); + ParameterMap params = ParameterMap.wrap(parameterMap); return new PortletParametersStateString(params); } @@ -139,7 +140,7 @@ current = ois.readUTF(); } - parameters = new PortletParameters(params); + parameters = ParameterMap.clone(params); } catch (Exception e) { @@ -148,14 +149,14 @@ } else { - parameters = new PortletParameters(); + parameters = new ParameterMap(); } } /** Creates an empty parameter set. */ public PortletParametersStateString() { - this.parameters = new PortletParameters(); + this.parameters = new ParameterMap(); } /** @@ -164,9 +165,9 @@ * @param parameterMap the parameter map to clone * @throws IllegalArgumentException if the parameter map is null or not valid */ - public PortletParametersStateString(PortletParameters parameterMap) + public PortletParametersStateString(ParameterMap parameterMap) { - this.parameters = new PortletParameters(parameterMap); + this.parameters = ParameterMap.clone(parameterMap); } /** @@ -260,7 +261,7 @@ * * @return the parameter object */ - public PortletParameters getParameters() + public ParameterMap getParameters() { return parameters; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestDecoder.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -24,8 +24,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.OpaqueStateString; @@ -94,7 +94,7 @@ private StateString interactionState; /** . */ - private PortletParameters form; + private ParameterMap form; /** . */ private int type; @@ -202,7 +202,7 @@ } // Julien : - PortletParameters form = new PortletParameters(); + ParameterMap form = new ParameterMap(); if (bodyParams != null) { form.putAll(bodyParams); @@ -250,7 +250,7 @@ } // - form = new PortletParameters(); + form = new ParameterMap(); if (bodyParams != null) { form.putAll(bodyParams); @@ -312,7 +312,7 @@ return interactionState; } - public PortletParameters getForm() + public ParameterMap getForm() { return form; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/PortletRequestEncoder.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -27,7 +27,6 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.RenderURL; import org.jboss.portal.portlet.ActionURL; @@ -66,7 +65,7 @@ public PortletRequestEncoder() { - this(new PortletParameters()); + this(new ParameterMap()); } public void encode(PortletURL portletURL) throws IllegalArgumentException @@ -109,7 +108,7 @@ } // Add the parameters - PortletParameters parameters = ((PortletParametersStateString)interactionState).getParameters(); + ParameterMap parameters = ((PortletParametersStateString)interactionState).getParameters(); configure(parameters); } else @@ -147,7 +146,7 @@ if (navigationalState instanceof PortletParametersStateString) { // Add the parameters - PortletParameters parameters = ((PortletParametersStateString)navigationalState).getParameters(); + ParameterMap parameters = ((PortletParametersStateString)navigationalState).getParameters(); configure(parameters); } else @@ -181,7 +180,7 @@ return queryParameters; } - private void configure(PortletParameters parameters) + private void configure(ParameterMap parameters) { for (Iterator i = parameters.entrySet().iterator(); i.hasNext();) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -24,7 +24,7 @@ import org.jboss.portal.common.http.QueryStringParser; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.PortletParameters; +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; import javax.servlet.RequestDispatcher; @@ -104,7 +104,7 @@ // if (queryString.length() > 0) { - this.parameters = new PortletParameters(rreq.getParameterMap()); + this.parameters = ParameterMap.clone(rreq.getParameterMap()); this.parameters.putAll(QueryStringParser.getInstance().parseQueryString(queryString)); } else Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/RequestParameters.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -26,7 +26,6 @@ import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; /** @@ -58,7 +57,7 @@ StateString interactionState = actionContext.getInteractionState(); // Take care of the interaction state if any - PortletParameters privateParameters = null; + ParameterMap privateParameters = null; // if (interactionState != null) @@ -79,7 +78,7 @@ } // - PortletParameters form = actionContext.getForm(); + ParameterMap form = actionContext.getForm(); if (form != null) { if (privateParameters == null) @@ -88,7 +87,7 @@ } else { - privateParameters = new PortletParameters(privateParameters); + privateParameters = ParameterMap.clone(privateParameters); privateParameters.append(form); } } @@ -102,7 +101,7 @@ { if (privateParameters != null) { - PortletParameters tmp = new PortletParameters(privateParameters); + ParameterMap tmp = ParameterMap.clone(privateParameters); tmp.append(publicParameters); parameters = tmp; } @@ -153,7 +152,7 @@ { if (privateParameters != null) { - parameters = new PortletParameters(privateParameters); + parameters = ParameterMap.clone(privateParameters); parameters.putAll(publicParameters); } else Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,11 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.PortletParameters; -import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.common.util.ParameterMap; import javax.portlet.ActionRequest; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.StateString; @@ -32,6 +31,7 @@ import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.jboss.portal.Mode; import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.util.ParameterMap; import javax.portlet.BaseURL; import javax.portlet.PortletRequest; @@ -156,7 +156,7 @@ return null; } - protected abstract PortletParameters getInternalParameters(); + protected abstract ParameterMap getInternalParameters(); } public static class InternalActionURL extends InternalPortletURL implements ActionURL @@ -165,7 +165,7 @@ /** . */ private PortletParametersStateString parameters = new PortletParametersStateString(); - protected PortletParameters getInternalParameters() + protected ParameterMap getInternalParameters() { return parameters.getParameters(); } @@ -188,7 +188,7 @@ /** . */ private PortletParametersStateString navigationalState = new PortletParametersStateString(); - protected PortletParameters getInternalParameters() + protected ParameterMap getInternalParameters() { return navigationalState.getParameters(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,18 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.spi.RenderContext; -import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.common.util.ParameterMap; import javax.portlet.RenderRequest; -import javax.servlet.http.Cookie; -import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -27,7 +27,6 @@ import org.jboss.portal.portlet.invocation.response.StateResponse; import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.info.ContainerEventingInfo; @@ -372,7 +371,7 @@ { /** The navigational state returned. */ - protected PortletParameters navigationalState = new PortletParameters(); + protected ParameterMap navigationalState = new ParameterMap(); /** The new window state requested. */ protected org.jboss.portal.WindowState windowState; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -24,7 +24,6 @@ import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MarkupInfo; @@ -45,7 +44,7 @@ protected StateString interactionState; /** . */ - protected PortletParameters form; + protected ParameterMap form; protected AbstractActionContext( @@ -55,7 +54,7 @@ ParameterMap publicNavigationalState, MarkupInfo markupInfo, StateString interactionState, - PortletParameters form) + ParameterMap form) { super(mode, windowState, navigationalState, publicNavigationalState, markupInfo); @@ -94,7 +93,7 @@ return interactionState; } - public PortletParameters getForm() + public ParameterMap getForm() { return form; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ActionContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ActionContext.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ActionContext.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.spi; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.StateString; +import org.jboss.portal.common.util.ParameterMap; import java.io.BufferedReader; import java.io.IOException; @@ -109,5 +109,5 @@ * * @return the request form */ - PortletParameters getForm(); + ParameterMap getForm(); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ActionContextSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ActionContextSupport.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ActionContextSupport.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.spi; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.ActionContext; +import org.jboss.portal.common.util.ParameterMap; import java.io.BufferedReader; import java.io.IOException; @@ -67,7 +67,7 @@ throw new UnsupportedOperationException(); } - public PortletParameters getForm() + public ParameterMap getForm() { throw new UnsupportedOperationException(); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ParametersTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ParametersTestCase.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/ParametersTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet; -import org.jboss.portal.portlet.PortletParameters; +import org.jboss.portal.common.util.ParameterMap; import java.util.Arrays; import java.util.HashMap; @@ -45,12 +45,12 @@ { } - private PortletParameters param; + private ParameterMap param; @Create public void setUp() { - param = new PortletParameters(); + param = new ParameterMap(); } @Destroy @@ -190,7 +190,7 @@ @Test public void testReplaceWithParameters() { - PortletParameters other = new PortletParameters(); + ParameterMap other = new ParameterMap(); other.setValue("a", "b"); other.setValues("c", new String[]{"d", "e"}); param.replace(other); @@ -203,7 +203,7 @@ { try { - new PortletParameters(null); + ParameterMap.clone(null); fail("Expected IllegalArgumentException"); } catch (IllegalArgumentException e) @@ -216,7 +216,7 @@ { try { - new PortletParameters((Map)null); + ParameterMap.clone(null); fail("Expected IllegalArgumentException"); } catch (IllegalArgumentException e) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -24,8 +24,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.portlet.impl.PortletRequestDecoder; import org.jboss.unit.api.pojo.annotations.Test; @@ -510,7 +510,7 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertEquals(new PortletParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -522,7 +522,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.MODE_MASK))); queryParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString())); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertEquals(new PortletParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -534,7 +534,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.WINDOW_STATE_MASK))); queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString())); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertEquals(new PortletParametersStateString(), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -550,7 +550,7 @@ Map bodyParams = new HashMap(); PortletRequestDecoder o = new PortletRequestDecoder(); PortletParametersStateString intState = new PortletParametersStateString(); - PortletParameters form = new PortletParameters(); + ParameterMap form = new ParameterMap(); // Query parameter queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK))); @@ -625,7 +625,7 @@ // Empty queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertNull(o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -637,7 +637,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.NAVIGATIONAL_STATE_PARAMETER, asStringArray("navstatevalue")); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertNull(o.getInteractionState()); assertEquals(new OpaqueStateString("navstatevalue"), o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -649,7 +649,7 @@ queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK))); queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue")); o.decode(queryParams, null); - assertEquals(new PortletParameters(), o.getForm()); + assertEquals(new ParameterMap(), o.getForm()); assertEquals(new OpaqueStateString("intstatevalue"), o.getInteractionState()); assertNull(o.getNavigationalState()); assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType()); @@ -664,7 +664,7 @@ queryParams.put("foo3", new String[]{"bar4"}); bodyParams.put("foo3", new String[]{"bar5"}); o.decode(queryParams, bodyParams); - PortletParameters form = new PortletParameters(); + ParameterMap form = new ParameterMap(); form.setValue("foo1", "bar1"); form.setValues("foo2", new String[]{"bar2", "bar3"}); form.setValues("foo3", new String[]{"bar5"}); Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/PortletRequestEncoderTestCase.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -24,7 +24,6 @@ import org.jboss.portal.portlet.impl.PortletRequestEncoder; import org.jboss.portal.portlet.impl.PortletRequestDecoder; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.Mode; @@ -57,7 +56,7 @@ @Create public void setUp() throws Exception { - params = new PortletParameters(); + params = new ParameterMap(); encoder = new PortletRequestEncoder(params); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.PortletParameters; - import javax.xml.namespace.QName; import java.util.Map; import java.util.HashMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -25,7 +25,6 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.EventInfo; @@ -169,7 +168,7 @@ publicNS, MARKUP_INFO, PortletParametersStateString.create(action.queryParameters), - action.bodyParameters != null ? new PortletParameters(action.bodyParameters) : null); + action.bodyParameters != null ? ParameterMap.clone(action.bodyParameters) : null); ActionInvocation actionInvocation = new ActionInvocation(actionContext); // Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestActionContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestActionContext.java 2008-01-15 22:57:36 UTC (rev 9518) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/TestActionContext.java 2008-01-15 23:40:57 UTC (rev 9519) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.test; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletURL; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractActionContext; @@ -55,7 +54,7 @@ ParameterMap publicNavigationalState, MarkupInfo markupInfo, StateString interactionState, - PortletParameters form) + ParameterMap form) { super(mode, windowState, navigationalState, publicNavigationalState, markupInfo, interactionState, form);