You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/04/25 09:30:59 UTC
git commit: WICKET-5565 PackageMapper - Could not resolve class
Repository: wicket
Updated Branches:
refs/heads/master 44f4782a2 -> 204849bc6
WICKET-5565 PackageMapper - Could not resolve class
Move the more complete code for calculating the compatibility score from MountedMapper to AbstractBookmarkableMapper
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/204849bc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/204849bc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/204849bc
Branch: refs/heads/master
Commit: 204849bc6046ed73f447f8daa7a1502f3e53a0fb
Parents: 44f4782
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Apr 25 10:29:59 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Apr 25 10:29:59 2014 +0300
----------------------------------------------------------------------
.../mapper/AbstractBookmarkableMapper.java | 20 +++++++++++++++-
.../core/request/mapper/MountedMapper.java | 24 --------------------
.../core/request/mapper/PackageMapper.java | 13 -----------
.../core/request/mapper/PackageMapperTest.java | 4 ++--
4 files changed, 21 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/204849bc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index e9ad89c..e38d956 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -204,7 +204,25 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
* @see IRequestMapper#getCompatibilityScore(Request)
*/
@Override
- public abstract int getCompatibilityScore(Request request);
+ public int getCompatibilityScore(Request request)
+ {
+ if (urlStartsWith(request.getUrl(), mountSegments))
+ {
+ /* see WICKET-5056 - alter score with pathSegment type */
+ int countOptional = 0;
+ int fixedSegments = 0;
+ for (MountPathSegment pathSegment : pathSegments)
+ {
+ fixedSegments += pathSegment.getFixedPartSize();
+ countOptional += pathSegment.getOptionalParameters();
+ }
+ return mountSegments.length - countOptional + fixedSegments;
+ }
+ else
+ {
+ return 0;
+ }
+ }
/**
* Creates a {@code IRequestHandler} that processes a bookmarkable request.
http://git-wip-us.apache.org/repos/asf/wicket/blob/204849bc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
index da6c4c4..fdf1dc2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
@@ -268,30 +268,6 @@ public class MountedMapper extends AbstractBookmarkableMapper
}
/**
- * @see AbstractBookmarkableMapper#getCompatibilityScore(org.apache.wicket.request.Request)
- */
- @Override
- public int getCompatibilityScore(Request request)
- {
- if (urlStartsWith(request.getUrl(), mountSegments))
- {
- /* see WICKET-5056 - alter score with pathSegment type */
- int countOptional = 0;
- int fixedSegments = 0;
- for (MountPathSegment pathSegment : pathSegments)
- {
- fixedSegments += pathSegment.getFixedPartSize();
- countOptional += pathSegment.getOptionalParameters();
- }
- return mountSegments.length - countOptional + fixedSegments;
- }
- else
- {
- return 0;
- }
- }
-
- /**
* @see AbstractBookmarkableMapper#checkPageClass(java.lang.Class)
*/
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/204849bc/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 2037356..ff8b81a 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
@@ -221,17 +221,4 @@ public class PackageMapper extends AbstractBookmarkableMapper
{
return false;
}
-
- @Override
- public int getCompatibilityScore(Request request)
- {
- if (urlStartsWith(request.getUrl(), mountSegments))
- {
- return mountSegments.length;
- }
- else
- {
- return 0;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/204849bc/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 d79b685..9285fa0 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
@@ -655,12 +655,12 @@ public class PackageMapperTest extends AbstractMapperTest
MockWebRequest request = new MockWebRequest(url);
int score = encoder.getCompatibilityScore(request);
- assertEquals(2, score);
+ assertEquals(4, score);
url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
request = new MockWebRequest(url);
score = namedParametersEncoder.getCompatibilityScore(request);
- assertEquals(4, score);
+ assertEquals(6, score);
}
}