You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/04/24 14:31:16 UTC
git commit: PackageMapper issue [WICKET-5565]. The compatibility
score is not correct.
Repository: wicket
Updated Branches:
refs/heads/master 57d8f0514 -> 44f4782a2
PackageMapper issue [WICKET-5565]. The compatibility score is not
correct.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/44f4782a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/44f4782a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/44f4782a
Branch: refs/heads/master
Commit: 44f4782a23de19e81e7aeb79ffd5c286d9367dce
Parents: 57d8f05
Author: bitstorm <an...@gmail.com>
Authored: Thu Apr 24 14:25:45 2014 +0200
Committer: bitstorm <an...@gmail.com>
Committed: Thu Apr 24 14:25:45 2014 +0200
----------------------------------------------------------------------
.../core/request/mapper/PackageMapper.java | 10 ++++++++--
.../core/request/mapper/PackageMapperTest.java | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/44f4782a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
index ad15d6d..2037356 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
@@ -225,7 +225,13 @@ public class PackageMapper extends AbstractBookmarkableMapper
@Override
public int getCompatibilityScore(Request request)
{
- // always return 0 here so that the mounts have higher priority
- return 0;
+ if (urlStartsWith(request.getUrl(), mountSegments))
+ {
+ return mountSegments.length;
+ }
+ else
+ {
+ return 0;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/44f4782a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index 0666061..d79b685 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -29,6 +29,7 @@ import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.mapper.PackageMapperTest.OuterPage.InnerPage;
import org.apache.wicket.markup.html.link.ILinkListener;
+import org.apache.wicket.mock.MockWebRequest;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
@@ -643,4 +644,23 @@ public class PackageMapperTest extends AbstractMapperTest
checkPage(page, 15);
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
}
+
+ /**
+ * https://issues.apache.org/jira/browse/WICKET-5565
+ */
+ @Test
+ public void testGetCompatibilityScore()
+ {
+ Url url = Url.parse(MOUNT_PATH + '/' + "MyPage");
+ MockWebRequest request = new MockWebRequest(url);
+ int score = encoder.getCompatibilityScore(request);
+
+ assertEquals(2, score);
+
+ url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
+ request = new MockWebRequest(url);
+ score = namedParametersEncoder.getCompatibilityScore(request);
+
+ assertEquals(4, score);
+ }
}