WICKET-4845 Make BasicResourceReferenceMapper public so it is easy to extend it

Lower the cyclomatic complexity of the method by replacing an 'if' with a 
helper which does the same


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0a235fe3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0a235fe3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0a235fe3

Branch: refs/heads/wicket-1.5.x
Commit: 0a235fe3e2314ef450342ccd4dc26edb8b7c4053
Parents: 09b8c77
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Fri Nov 2 15:52:44 2012 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Fri Nov 2 15:52:44 2012 +0200

----------------------------------------------------------------------
 .../mapper/BasicResourceReferenceMapper.java       |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/0a235fe3/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
 
b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
index 6f1e8af..f9c8c7b 100755
--- 
a/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapper.java
@@ -113,10 +113,7 @@ public class BasicResourceReferenceMapper extends 
AbstractResourceReferenceMappe
                                        
getCachingStrategy().undecorateUrl(resourceUrl);
                                        segment = resourceUrl.getFileName();
 
-                                       if (Strings.isEmpty(segment))
-                                       {
-                                               throw new 
IllegalStateException("caching strategy returned empty name for " + 
resourceUrl);
-                                       }
+                                       Checks.notEmpty(segment, "Caching 
strategy returned empty name for '%s'", resourceUrl);
                                }
                                if (name.length() > 0)
                                {

Reply via email to