You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/02/24 00:34:42 UTC
git commit: WICKET-4338 reverted,
post parameters don't belong to page parameters
Updated Branches:
refs/heads/wicket-1.5.x c1448f3b4 -> 229f465b7
WICKET-4338 reverted, post parameters don't belong to page parameters
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/229f465b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/229f465b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/229f465b
Branch: refs/heads/wicket-1.5.x
Commit: 229f465b7b4b22adf2686d1219f9a782f17d61ba
Parents: c1448f3
Author: Sven Meier <sv...@apache.org>
Authored: Fri Feb 24 00:33:59 2012 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Fri Feb 24 00:33:59 2012 +0100
----------------------------------------------------------------------
.../mapper/parameter/PageParametersEncoder.java | 15 ++-----------
.../parameter/PageParametersEncoderTest.java | 16 ++++++++------
2 files changed, 12 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/229f465b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
index 5687a71..2312995 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoder.java
@@ -16,13 +16,9 @@
*/
package org.apache.wicket.request.mapper.parameter;
-import java.util.List;
-
-import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
-import org.apache.wicket.util.string.StringValue;
/**
* Simple encoder with direct indexed/named parameters mapping.
@@ -51,15 +47,10 @@ public class PageParametersEncoder implements IPageParametersEncoder
parameters.set(i, s);
++i;
}
-
- IRequestParameters requestParameters = request.getRequestParameters();
- for (String paramName : requestParameters.getParameterNames())
+
+ for (QueryParameter p : request.getUrl().getQueryParameters())
{
- List<StringValue> parameterValues = requestParameters.getParameterValues(paramName);
- for (StringValue paramValue : parameterValues)
- {
- parameters.add(paramName, paramValue);
- }
+ parameters.add(p.getName(), p.getValue());
}
return parameters.isEmpty() ? null : parameters;
http://git-wip-us.apache.org/repos/asf/wicket/blob/229f465b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java
index e07439f..8b0926e 100644
--- a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java
+++ b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersEncoderTest.java
@@ -38,11 +38,12 @@ import org.junit.Test;
public class PageParametersEncoderTest extends Assert
{
/**
- * Tests that PageParametersEncoder decodes both GET and POST parameters
+ * Tests that PageParametersEncoder decodes GET parameters, not POST
+ *
* @throws Exception
*/
@Test
- public void decodePostParameters() throws Exception
+ public void decodeParameters() throws Exception
{
PageParametersEncoder encoder = new PageParametersEncoder();
Request request = new Request()
@@ -89,9 +90,9 @@ public class PageParametersEncoderTest extends Assert
assertEquals("idx2", pageParameters.get(1).toOptionalString());
assertEquals("value1", pageParameters.get("named1").toOptionalString());
assertEquals("value2", pageParameters.get("named2").toOptionalString());
- assertEquals("1", pageParameters.get("postOne").toOptionalString());
- assertEquals("2", pageParameters.getValues("postTwo").get(0).toOptionalString());
- assertEquals("2.1", pageParameters.getValues("postTwo").get(1).toOptionalString());
+ assertEquals(null, pageParameters.get("postOne").toOptionalString());
+ assertTrue(pageParameters.getValues("postTwo").isEmpty());
+ assertTrue(pageParameters.getValues("postTwo").isEmpty());
}
/**
@@ -102,7 +103,8 @@ public class PageParametersEncoderTest extends Assert
private final Map<String, List<StringValue>> params = new HashMap<String, List<StringValue>>();
{
params.put("postOne", Arrays.asList(StringValue.valueOf("1")));
- params.put("postTwo", Arrays.asList(StringValue.valueOf("2"), StringValue.valueOf("2.1")));
+ params.put("postTwo",
+ Arrays.asList(StringValue.valueOf("2"), StringValue.valueOf("2.1")));
}
public Set<String> getParameterNames()
@@ -114,7 +116,7 @@ public class PageParametersEncoderTest extends Assert
{
List<StringValue> values = params.get(name);
return (values != null && !values.isEmpty()) ? values.get(0)
- : StringValue.valueOf((String)null);
+ : StringValue.valueOf((String)null);
}
public List<StringValue> getParameterValues(String name)