[gatein-commits] gatein SVN: r5014 - in portal/branches/navcontroller/component/web/controller/src: main/java/org/exoplatform/web/controller/router and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Nov 10 09:57:32 EST 2010
Author: julien_viet
Date: 2010-11-10 09:57:31 -0500 (Wed, 10 Nov 2010)
New Revision: 5014
Added:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteParam.java
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java
Log:
make route param a real param
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -95,7 +95,7 @@
{
String name = reader.getAttributeValue(null, "name");
String value = reader.getAttributeValue(null, "value");
- routeDesc.addParam(QualifiedName.parse(name), value);
+ routeDesc.addRouteParam(QualifiedName.parse(name), value);
}
else if (requestParamQN.equals(reader.getName()))
{
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -23,9 +23,11 @@
import org.exoplatform.web.controller.router.EncodingMode;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* Describes a route.
@@ -40,7 +42,7 @@
private final String path;
/** . */
- private final Map<QualifiedName, String> params;
+ private final Map<QualifiedName, RouteParamDescriptor> routeParams;
/** . */
private final Map<QualifiedName, PathParamDescriptor> pathParams;
@@ -54,7 +56,7 @@
public RouteDescriptor(String path)
{
this.path = path;
- this.params = new HashMap<QualifiedName, String>();
+ this.routeParams = new HashMap<QualifiedName, RouteParamDescriptor>();
this.pathParams = new HashMap<QualifiedName, PathParamDescriptor>();
this.requestParams = new HashMap<String, RequestParamDescriptor>();
this.children = new ArrayList<RouteDescriptor>();
@@ -65,22 +67,32 @@
return path;
}
- public RouteDescriptor addParam(QualifiedName name, String value)
+ public RouteDescriptor addRouteParam(QualifiedName name, String value)
{
- params.put(name, value);
+ routeParams.put(name, new RouteParamDescriptor(name, value));
return this;
}
- public RouteDescriptor addParam(String name, String value)
+ public RouteDescriptor addRouteParam(String name, String value)
{
- return addParam(QualifiedName.parse(name), value);
+ return addRouteParam(QualifiedName.parse(name), value);
}
- public Map<QualifiedName, String> getParams()
+ public Set<QualifiedName> getRouteParamNames()
{
- return params;
+ return routeParams.keySet();
}
+ public Collection<RouteParamDescriptor> getRouteParams()
+ {
+ return routeParams.values();
+ }
+
+ public RouteParamDescriptor getRouteParam(QualifiedName name)
+ {
+ return routeParams.get(name);
+ }
+
public RouteDescriptor addRequestParam(QualifiedName name, String matchName, String matchValue, boolean required)
{
return addRequestParam(new RequestParamDescriptor(name, matchName, matchValue, required));
@@ -103,11 +115,21 @@
return this;
}
- public Map<String, RequestParamDescriptor> getRequestParams()
+ public Collection<RequestParamDescriptor> getRequestParams()
{
- return requestParams;
+ return requestParams.values();
}
+ public Set<String> getRequestParamMatchNames()
+ {
+ return requestParams.keySet();
+ }
+
+ public RequestParamDescriptor getRequestParam(String matchName)
+ {
+ return requestParams.get(matchName);
+ }
+
public Map<QualifiedName, PathParamDescriptor> getPathParams()
{
return pathParams;
Added: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteParamDescriptor.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * 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.exoplatform.web.controller.metadata;
+
+import org.exoplatform.web.controller.QualifiedName;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class RouteParamDescriptor
+{
+
+ /** . */
+ private final QualifiedName name;
+
+ /** . */
+ private final String value;
+
+ public RouteParamDescriptor(QualifiedName name, String value)
+ {
+ if (name == null)
+ {
+ throw new NullPointerException("No null name accepted");
+ }
+ if (value == null)
+ {
+ throw new NullPointerException("No null value accepted");
+ }
+
+ //
+ this.name = name;
+ this.value = value;
+ }
+
+ public QualifiedName getName()
+ {
+ return name;
+ }
+
+ public String getValue()
+ {
+ return value;
+ }
+}
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -23,6 +23,7 @@
import org.exoplatform.web.controller.metadata.PathParamDescriptor;
import org.exoplatform.web.controller.metadata.RequestParamDescriptor;
import org.exoplatform.web.controller.metadata.RouteDescriptor;
+import org.exoplatform.web.controller.metadata.RouteParamDescriptor;
import java.util.ArrayList;
import java.util.Collections;
@@ -59,7 +60,7 @@
private final List<PatternRoute> patterns;
/** . */
- private final Map<QualifiedName, String> routeParameters;
+ private final Map<QualifiedName, RouteParam> routeParams;
/** . */
private final Map<String, RequestParam> requestParams;
@@ -70,7 +71,7 @@
this.terminal = false;
this.segments = new LinkedHashMap<String, List<SegmentRoute>>();
this.patterns = new ArrayList<PatternRoute>();
- this.routeParameters = new HashMap<QualifiedName, String>();
+ this.routeParams = new HashMap<QualifiedName, RouteParam>();
this.requestParams = new HashMap<String, RequestParam>();
}
@@ -164,12 +165,12 @@
Map<QualifiedName, String> abc = new HashMap<QualifiedName, String>(blah);
// Match first the static parameteters
- for (Map.Entry<QualifiedName, String> a : routeParameters.entrySet())
+ for (RouteParam param : routeParams.values())
{
- String s = blah.get(a.getKey());
- if (a.getValue().equals(s))
+ String value = blah.get(param.name);
+ if (param.value.equals(value))
{
- abc.remove(a.getKey());
+ abc.remove(param.name);
}
else
{
@@ -414,13 +415,13 @@
// Update parameters if it is possible
if (ret != null)
{
- if (routeParameters.size() > 0)
+ if (routeParams.size() > 0)
{
- for (Map.Entry<QualifiedName, String> entry : routeParameters.entrySet())
+ for (RouteParam param : routeParams.values())
{
- if (!ret.containsKey(entry.getKey()))
+ if (!ret.containsKey(param.name))
{
- ret.put(entry.getKey(), entry.getValue());
+ ret.put(param.name, param.value);
}
}
}
@@ -508,15 +509,25 @@
Route route = append(descriptor.getPathParams(), descriptor.getPath());
//
- route.terminal = true;
- route.routeParameters.putAll(descriptor.getParams());
- for (RequestParamDescriptor requestParamDescriptor : descriptor.getRequestParams().values())
+ Map<QualifiedName, RouteParam> routeParams = new HashMap<QualifiedName, RouteParam>();
+ for (RouteParamDescriptor routeParamDesc : descriptor.getRouteParams())
{
- RequestParam requestParamDef = new RequestParam(requestParamDescriptor);
- route.requestParams.put(requestParamDef.getMatchName(), requestParamDef);
+ routeParams.put(routeParamDesc.getName(), new RouteParam(routeParamDesc.getName(), routeParamDesc.getValue()));
}
//
+ Map<String, RequestParam> requestParams = new HashMap<String, RequestParam>();
+ for (RequestParamDescriptor requestParamDesc : descriptor.getRequestParams())
+ {
+ requestParams.put(requestParamDesc.getMatchName(), new RequestParam(requestParamDesc));
+ }
+
+ //
+ route.terminal = true;
+ route.routeParams.putAll(routeParams);
+ route.requestParams.putAll(requestParams);
+
+ //
for (RouteDescriptor childDescriptor : descriptor.getChildren())
{
route.append(childDescriptor);
@@ -526,17 +537,6 @@
return route;
}
- final Route append(
- Map<QualifiedName, PathParamDescriptor> pathParamDescriptors,
- String path,
- Map<QualifiedName, String> parameters)
- {
- Route route = append(pathParamDescriptors, path);
- route.terminal = true;
- route.routeParameters.putAll(parameters);
- return route;
- }
-
/**
* Append a path, creates the necessary routes and returns the last route added.
*
Added: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteParam.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteParam.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/RouteParam.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * 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.exoplatform.web.controller.router;
+
+import org.exoplatform.web.controller.QualifiedName;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+class RouteParam
+{
+
+ /** . */
+ final QualifiedName name;
+
+ /** . */
+ final String value;
+
+ public RouteParam(QualifiedName name, String value)
+ {
+ this.name = name;
+ this.value = value;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "RouteParam[name=" + name + ",value=" + value + "]";
+ }
+}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -54,7 +54,9 @@
assertTrue(i.hasNext());
RouteDescriptor route1 = i.next();
assertEquals("/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}", route1.getPath());
- assertEquals(Collections.singletonMap(WebAppController.HANDLER_PARAM, "portal"), route1.getParams());
+ assertEquals(Collections.singleton(WebAppController.HANDLER_PARAM), route1.getRouteParamNames());
+ assertEquals(WebAppController.HANDLER_PARAM, route1.getRouteParam(WebAppController.HANDLER_PARAM).getName());
+ assertEquals("portal", route1.getRouteParam(WebAppController.HANDLER_PARAM).getValue());
assertEquals(Collections.singleton(QualifiedName.parse("gtn:path")), route1.getPathParams().keySet());
assertEquals(QualifiedName.parse("gtn:path"), route1.getPathParams().get(QualifiedName.parse("gtn:path")).getName());
assertEquals(".*", route1.getPathParams().get(QualifiedName.parse("gtn:path")).getPattern());
@@ -64,7 +66,9 @@
assertTrue(i.hasNext());
RouteDescriptor route2 = i.next();
assertEquals("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}", route2.getPath());
- assertEquals(Collections.singletonMap(WebAppController.HANDLER_PARAM, "portal"), route2.getParams());
+ assertEquals(Collections.singleton(WebAppController.HANDLER_PARAM), route2.getRouteParamNames());
+ assertEquals(WebAppController.HANDLER_PARAM, route2.getRouteParam(WebAppController.HANDLER_PARAM).getName());
+ assertEquals("portal", route2.getRouteParam(WebAppController.HANDLER_PARAM).getValue());
assertEquals(Collections.singleton(QualifiedName.parse("gtn:path")), route2.getPathParams().keySet());
assertEquals(QualifiedName.parse("gtn:path"), route2.getPathParams().get(QualifiedName.parse("gtn:path")).getName());
assertEquals(".*", route2.getPathParams().get(QualifiedName.parse("gtn:path")).getPattern());
@@ -74,41 +78,49 @@
assertTrue(i.hasNext());
RouteDescriptor route3 = i.next();
assertEquals("/upload", route3.getPath());
- assertEquals(Collections.singletonMap(WebAppController.HANDLER_PARAM, "upload"), route3.getParams());
+ assertEquals(Collections.singleton(WebAppController.HANDLER_PARAM), route3.getRouteParamNames());
+ assertEquals(WebAppController.HANDLER_PARAM, route3.getRouteParam(WebAppController.HANDLER_PARAM).getName());
+ assertEquals("upload", route3.getRouteParam(WebAppController.HANDLER_PARAM).getValue());
//
assertTrue(i.hasNext());
RouteDescriptor route4 = i.next();
assertEquals("/download", route4.getPath());
- assertEquals(Collections.singletonMap(WebAppController.HANDLER_PARAM, "download"), route4.getParams());
+ assertEquals(Collections.singleton(WebAppController.HANDLER_PARAM), route4.getRouteParamNames());
+ assertEquals(WebAppController.HANDLER_PARAM, route4.getRouteParam(WebAppController.HANDLER_PARAM).getName());
+ assertEquals("download", route4.getRouteParam(WebAppController.HANDLER_PARAM).getValue());
//
assertTrue(i.hasNext());
RouteDescriptor route5 = i.next();
assertEquals("/a", route5.getPath());
- assertEquals(Collections.singletonMap(QualifiedName.create("a"), "a_value"), route5.getParams());
+ assertEquals(Collections.singleton(QualifiedName.create("a")), route5.getRouteParamNames());
+ assertEquals(QualifiedName.create("a"), route5.getRouteParam(QualifiedName.create("a")).getName());
+ assertEquals("a_value", route5.getRouteParam(QualifiedName.create("a")).getValue());
assertEquals(1, route5.getChildren().size());
RouteDescriptor route5_1 = route5.getChildren().get(0);
assertEquals("/b", route5_1.getPath());
- assertEquals(Collections.singletonMap(QualifiedName.create("b"), "b_value"), route5_1.getParams());
+ assertEquals(Collections.singleton(QualifiedName.create("b")), route5_1.getRouteParamNames());
+ assertEquals(QualifiedName.create("b"), route5_1.getRouteParam(QualifiedName.create("b")).getName());
+ assertEquals("b_value", route5_1.getRouteParam(QualifiedName.create("b")).getValue());
//
assertTrue(i.hasNext());
RouteDescriptor route6 = i.next();
assertEquals("/b", route6.getPath());
- assertEquals(new HashSet<String>(Arrays.asList("foo", "bar", "juu")), route6.getRequestParams().keySet());
- assertEquals(QualifiedName.parse("foo"), route6.getRequestParams().get("foo").getName());
- assertEquals("foo", route6.getRequestParams().get("foo").getMatchName());
- assertEquals(null, route6.getRequestParams().get("foo").getMatchValue());
- assertEquals(false, route6.getRequestParams().get("foo").isRequired());
- assertEquals(QualifiedName.parse("bar"), route6.getRequestParams().get("bar").getName());
- assertEquals("bar", route6.getRequestParams().get("bar").getMatchName());
- assertEquals("bar", route6.getRequestParams().get("bar").getMatchValue());
- assertEquals(false, route6.getRequestParams().get("bar").isRequired());
- assertEquals(QualifiedName.parse("juu"), route6.getRequestParams().get("juu").getName());
- assertEquals("juu", route6.getRequestParams().get("juu").getMatchName());
- assertEquals("juu", route6.getRequestParams().get("juu").getMatchValue());
- assertEquals(true, route6.getRequestParams().get("juu").isRequired());
+ assertEquals(new HashSet<String>(Arrays.asList("foo", "bar", "juu")), route6.getRequestParamMatchNames());
+ assertEquals(QualifiedName.parse("foo"), route6.getRequestParam("foo").getName());
+ assertEquals("foo", route6.getRequestParam("foo").getMatchName());
+ assertEquals(null, route6.getRequestParam("foo").getMatchValue());
+ assertEquals(false, route6.getRequestParam("foo").isRequired());
+ assertEquals(QualifiedName.parse("bar"), route6.getRequestParam("bar").getName());
+ assertEquals("bar", route6.getRequestParam("bar").getMatchName());
+ assertEquals("bar", route6.getRequestParam("bar").getMatchValue());
+ assertEquals(false, route6.getRequestParam("bar").isRequired());
+ assertEquals(QualifiedName.parse("juu"), route6.getRequestParam("juu").getName());
+ assertEquals("juu", route6.getRequestParam("juu").getMatchName());
+ assertEquals("juu", route6.getRequestParam("juu").getMatchValue());
+ assertEquals(true, route6.getRequestParam("juu").isRequired());
//
assertFalse(i.hasNext());
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -38,8 +38,8 @@
{
RouteDescriptor descriptor = new RouteDescriptor("/a").
- addParam("foo", "bar").
- addRoute(new RouteDescriptor("/b").addParam("juu", "daa"));
+ addRouteParam("foo", "bar").
+ addRoute(new RouteDescriptor("/b").addRouteParam("juu", "daa"));
//
Router router = new Router(new RouterDescriptor().addRoute(descriptor));
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -44,14 +44,14 @@
RouterDescriptor routerMD = new RouterDescriptor();
RouteDescriptor portal = new RouteDescriptor("/").
- addParam(QualifiedName.parse("gtn:handler"), "portal").
+ addRouteParam(QualifiedName.parse("gtn:handler"), "portal").
addRequestParam(QualifiedName.parse("gtn:componentid"), "portal:componentId", null, false).
addRequestParam(QualifiedName.parse("gtn:action"), "portal:action", null, false).
addRequestParam(QualifiedName.parse("gtn:objectid"), "portal:objectId", null, false).
addRoute(new RouteDescriptor("/public/{gtn:sitename}{gtn:path}").
- addParam(QualifiedName.parse("gtn:access"), "public")).addPathParam(QualifiedName.parse("gtn:path"), ".*", EncodingMode.PRESERVE_PATH).
+ addRouteParam(QualifiedName.parse("gtn:access"), "public")).addPathParam(QualifiedName.parse("gtn:path"), ".*", EncodingMode.PRESERVE_PATH).
addRoute(new RouteDescriptor("/private/{gtn:sitename}{gtn:path}").addPathParam(QualifiedName.parse("gtn:path"), ".*", EncodingMode.PRESERVE_PATH).
- addParam(QualifiedName.parse("gtn:access"), "private"));
+ addRouteParam(QualifiedName.parse("gtn:access"), "private"));
//
routerMD.addRoute(portal);
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -96,7 +96,7 @@
public void testParameterPropagationToDescendants() throws Exception
{
RouterDescriptor routerMD = new RouterDescriptor();
- routerMD.addRoute(new RouteDescriptor("/").addParam("p", "a"));
+ routerMD.addRoute(new RouteDescriptor("/").addRouteParam("p", "a"));
routerMD.addRoute(new RouteDescriptor("/a"));
Router router = new Router(routerMD);
@@ -168,7 +168,7 @@
public void testTwoRules1() throws Exception
{
RouterDescriptor routerMD = new RouterDescriptor();
- routerMD.addRoute(new RouteDescriptor("/a").addParam("b", "b"));
+ routerMD.addRoute(new RouteDescriptor("/a").addRouteParam("b", "b"));
routerMD.addRoute(new RouteDescriptor("/a/b"));
Router router = new Router(routerMD);
@@ -180,7 +180,7 @@
public void testTwoRules2() throws Exception
{
RouterDescriptor routerMD = new RouterDescriptor();
- routerMD.addRoute(new RouteDescriptor("/{a}").addParam("b", "b"));
+ routerMD.addRoute(new RouteDescriptor("/{a}").addRouteParam("b", "b"));
routerMD.addRoute(new RouteDescriptor("/{a}/b"));
Router router = new Router(routerMD);
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-10 14:00:56 UTC (rev 5013)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-10 14:57:31 UTC (rev 5014)
@@ -44,26 +44,26 @@
//
RouteDescriptor portalRouteMD = new RouteDescriptor("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}");
- portalRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site");
+ portalRouteMD.addRouteParam(QualifiedName.create("gtn", "controller"), "site");
portalRouteMD.addRequestParam(QualifiedName.create("gtn", "componentid"), "portal:componentId", null, false);
portalRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH);
routerMD.addRoute(portalRouteMD);
//
RouteDescriptor portalRouteMD2 = new RouteDescriptor("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}");
- portalRouteMD2.addParam(QualifiedName.create("gtn", "controller"), "site");
+ portalRouteMD2.addRouteParam(QualifiedName.create("gtn", "controller"), "site");
portalRouteMD2.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH);
routerMD.addRoute(portalRouteMD2);
//
RouteDescriptor groupRouteMD = new RouteDescriptor("/groups/{gtn:sitetype}/{gtn:sitename}{gtn:path}");
- groupRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site");
+ groupRouteMD.addRouteParam(QualifiedName.create("gtn", "controller"), "site");
groupRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH);
routerMD.addRoute(groupRouteMD);
//
RouteDescriptor userRouteMD = new RouteDescriptor("/users/{gtn:sitetype}/{gtn:sitename}{gtn:path}");
- userRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site");
+ userRouteMD.addRouteParam(QualifiedName.create("gtn", "controller"), "site");
userRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH);
routerMD.addRoute(userRouteMD);
More information about the gatein-commits
mailing list