Author: julien(a)jboss.com
Date: 2008-04-14 09:22:19 -0400 (Mon, 14 Apr 2008)
New Revision: 10579
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java
Log:
avoid to use ParameterMap in interfaces as it is really the implementation of a
Map<String, String[]> that is very convenient. the framework should not force the
client of the framework to use that type
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -32,7 +32,6 @@
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.cache.CacheLevel;
import org.jboss.portal.common.util.Base64;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.io.SerializationFilter;
import org.jboss.portal.common.io.Serialization;
@@ -107,7 +106,7 @@
String resourceId =
req.getParameter(ControllerRequestParameterNames.RESOURCE_ID);
//
- ParameterMap formParameters = null;
+ Map<String, String[]> formParameters = null;
if (req.getBody() instanceof Body.Form)
{
formParameters = ((Body.Form)req.getBody()).getParameters();
@@ -145,7 +144,7 @@
{
if (ControllerRequestParameterNames.ACTION_PHASE.equals(phase))
{
- ParameterMap formParameters = null;
+ Map<String, String[]> formParameters = null;
if (req.getBody() instanceof Body.Form)
{
formParameters = ((Body.Form)req.getBody()).getParameters();
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -22,11 +22,12 @@
******************************************************************************/
package org.jboss.portal.portlet.controller.request;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState;
import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -38,7 +39,7 @@
private final StateString interactionState;
/** . */
- private final ParameterMap bodyParameters;
+ private final Map<String, String[]> bodyParameters;
/**
* Build a new portlet action request.
@@ -53,7 +54,7 @@
public PortletActionRequest(
String windowId,
StateString interactionState,
- ParameterMap bodyParameters,
+ Map<String, String[]> bodyParameters,
PortletWindowNavigationalState windowNavigationalState,
PortletPageNavigationalState pageNavigationalState) throws
IllegalArgumentException
{
@@ -75,7 +76,7 @@
return interactionState;
}
- public ParameterMap getBodyParameters()
+ public Map<String, String[]> getBodyParameters()
{
return bodyParameters;
}
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java
===================================================================
---
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -22,12 +22,13 @@
******************************************************************************/
package org.jboss.portal.portlet.controller.request;
-import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState;
import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState;
import org.jboss.portal.portlet.cache.CacheLevel;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -42,7 +43,7 @@
private final StateString resourceState;
/** . */
- private final ParameterMap bodyParameters;
+ private final Map<String, String[]> bodyParameters;
/** . */
private final Scope scope;
@@ -61,7 +62,7 @@
String windowId,
String resourceId,
StateString resourceState,
- ParameterMap bodyParameters,
+ Map<String, String[]> bodyParameters,
Scope scope) throws IllegalArgumentException
{
super(windowId);
@@ -103,7 +104,7 @@
return resourceState;
}
- public ParameterMap getBodyParameters()
+ public Map<String, String[]> getBodyParameters()
{
return bodyParameters;
}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -33,7 +33,6 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.io.DataOutputStream;
-import java.io.InputStream;
import java.io.DataInputStream;
import java.util.HashMap;
import java.util.Map;
@@ -323,7 +322,7 @@
*
* @return the parameter object
*/
- public ParameterMap getParameters()
+ public Map<String, String[]> getParameters()
{
return parameters;
}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -33,6 +33,7 @@
import org.jboss.portal.portlet.info.NavigationInfo;
import java.util.Iterator;
+import java.util.Map;
/**
* The main responsibility of this class is to combine the different parameter sources
(private navigational state,
@@ -76,13 +77,16 @@
ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo,
invocation.getPublicNavigationalState());
// Get render parameters
- ParameterMap privateParameters =
safeBuildParameters(invocation.getNavigationalState());
+ Map<String, String[]> privateParameters =
safeBuildParameters(invocation.getNavigationalState());
// Build combined map
- ParameterMap parameters = safeCombine(privateParameters, publicParameters);
+ Map<String, String[]> parameters = safeCombine(privateParameters,
publicParameters);
//
- return new PortletRequestParameterMap(parameters, privateParameters,
publicParameters);
+ return new PortletRequestParameterMap(
+ parameters,
+ privateParameters,
+ publicParameters);
}
public static PortletRequestParameterMap create(NavigationInfo navigationInfo,
RenderInvocation context)
@@ -91,13 +95,16 @@
ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo,
context.getPublicNavigationalState());
// Get render parameters
- ParameterMap privateParameters =
safeBuildParameters(context.getNavigationalState());
+ Map<String, String[]> privateParameters =
safeBuildParameters(context.getNavigationalState());
// Build combined map
- ParameterMap parameters = safeCombine(privateParameters, publicParameters);
+ Map<String, String[]> parameters = safeCombine(privateParameters,
publicParameters);
//
- return new PortletRequestParameterMap(parameters, privateParameters,
publicParameters);
+ return new PortletRequestParameterMap(
+ parameters,
+ privateParameters,
+ publicParameters);
}
/**
@@ -115,16 +122,19 @@
ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo,
invocation.getPublicNavigationalState());
// The private parameters
- ParameterMap privateParameters =
safeBuildParameters(invocation.getInteractionState());
+ Map<String, String[]> privateParameters =
safeBuildParameters(invocation.getInteractionState());
// Combine form if we have one
privateParameters = safeCombine(privateParameters, invocation.getForm());
// Combine to get shared map
- ParameterMap parameters = safeCombine(privateParameters, publicParameters);
+ Map<String, String[]> parameters = safeCombine(privateParameters,
publicParameters);
//
- return new PortletRequestParameterMap(parameters, privateParameters,
publicParameters);
+ return new PortletRequestParameterMap(
+ parameters,
+ privateParameters,
+ publicParameters);
}
/** . */
@@ -137,27 +147,38 @@
protected final ParameterMap publicParameters;
protected PortletRequestParameterMap(
- ParameterMap parameters,
- ParameterMap privateParameters,
- ParameterMap publicParameters)
+ Map<String, String[]> parameters,
+ Map<String, String[]> privateParameters,
+ Map<String, String[]> publicParameters)
{
if (privateParameters != null)
{
- privateParameters = privateParameters.as(COPY_MODE);
+ this.privateParameters = ParameterMap.wrap(privateParameters, COPY_MODE);
}
+ else
+ {
+ this.privateParameters = null;
+ }
+
+ //
if (publicParameters != null)
{
- publicParameters = publicParameters.as(COPY_MODE);
+ this.publicParameters = ParameterMap.wrap(publicParameters, COPY_MODE);
}
- if (parameters != null)
+ else
{
- parameters = parameters.as(COPY_MODE);
+ this.publicParameters = null;
}
//
- this.parameters = parameters;
- this.privateParameters = privateParameters;
- this.publicParameters = publicParameters;
+ if (parameters != null)
+ {
+ this.parameters = ParameterMap.wrap(parameters, COPY_MODE);
+ }
+ else
+ {
+ this.parameters = null;
+ }
}
public ParameterMap getParameters()
@@ -201,7 +222,7 @@
}
}
- protected static ParameterMap safeBuildParameters(StateString stateString)
+ protected static Map<String, String[]> safeBuildParameters(StateString
stateString)
{
if (stateString != null)
{
@@ -213,7 +234,7 @@
}
}
- protected static ParameterMap safeCombine(ParameterMap privateParameters, ParameterMap
publicParameters)
+ protected static Map<String, String[]> safeCombine(Map<String, String[]>
privateParameters, Map<String, String[]> publicParameters)
{
if (publicParameters != null)
{
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -26,6 +26,8 @@
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.invocation.ResourceInvocation;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -37,21 +39,22 @@
protected final ParameterMap privateRenderParameters;
protected ResourceRequestParameterMap(
- ParameterMap parameters,
- ParameterMap privateParameters,
- ParameterMap publicParameters,
- ParameterMap privateRenderParameters)
+ Map<String, String[]> parameters,
+ Map<String, String[]> privateParameters,
+ Map<String, String[]> publicParameters,
+ Map<String, String[]> privateRenderParameters)
{
super(parameters, privateParameters, publicParameters);
//
if (privateRenderParameters != null)
{
- privateRenderParameters = privateRenderParameters.as(COPY_MODE);
+ this.privateRenderParameters = ParameterMap.wrap(privateRenderParameters,
COPY_MODE);
}
-
- //
- this.privateRenderParameters = privateRenderParameters;
+ else
+ {
+ this.privateRenderParameters = null;
+ }
}
public ParameterMap getPrivateRenderParameters()
@@ -76,10 +79,10 @@
ParameterMap publicParameters = safeBuildPublicParameters(navigationInfo,
invocation.getPublicNavigationalState());
// Combine private render parameters if any
- ParameterMap privateRenderParameters =
safeBuildParameters(invocation.getNavigationalState());
+ Map<String, String[]> privateRenderParameters =
safeBuildParameters(invocation.getNavigationalState());
// The private parameters
- ParameterMap privateParameters =
safeBuildParameters(invocation.getResourceState());
+ Map<String, String[]> privateParameters =
safeBuildParameters(invocation.getResourceState());
// Combine form if we have one
privateParameters = safeCombine(privateParameters, invocation.getForm());
@@ -88,9 +91,13 @@
privateParameters = safeCombine(privateParameters, privateRenderParameters);
// Combine to get shared map
- ParameterMap parameters = safeCombine(privateParameters, publicParameters);
+ Map<String, String[]> parameters = safeCombine(privateParameters,
publicParameters);
//
- return new ResourceRequestParameterMap(parameters, privateParameters,
publicParameters, privateRenderParameters);
+ return new ResourceRequestParameterMap(
+ parameters,
+ privateParameters,
+ publicParameters,
+ privateRenderParameters);
}
}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -25,8 +25,9 @@
import org.jboss.portal.portlet.spi.RequestContext;
import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.common.util.ParameterMap;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
@@ -41,7 +42,7 @@
protected StateString interactionState;
/** . */
- protected ParameterMap form;
+ protected Map<String, String[]> form;
public ActionInvocation(PortletInvocationContext ctx) throws IllegalArgumentException
{
@@ -58,12 +59,12 @@
this.interactionState = interactionState;
}
- public ParameterMap getForm()
+ public Map<String, String[]> getForm()
{
return form;
}
- public void setForm(ParameterMap form)
+ public void setForm(Map<String, String[]> form)
{
this.form = form;
}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2008-04-14
12:39:36 UTC (rev 10578)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2008-04-14
13:22:19 UTC (rev 10579)
@@ -26,8 +26,9 @@
import org.jboss.portal.portlet.spi.PortletInvocationContext;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.portlet.cache.CacheLevel;
-import org.jboss.portal.common.util.ParameterMap;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -48,7 +49,7 @@
private StateString resourceState;
/** . */
- private ParameterMap form;
+ private Map<String, String[]> form;
/** . */
private CacheLevel cacheLevel;
@@ -88,12 +89,12 @@
this.resourceState = resourceState;
}
- public ParameterMap getForm()
+ public Map<String, String[]> getForm()
{
return form;
}
- public void setForm(ParameterMap form)
+ public void setForm(Map<String, String[]> form)
{
this.form = form;
}