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/3e3fbf8f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3e3fbf8f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3e3fbf8f Branch: refs/heads/master Commit: 3e3fbf8fff62ca88866ce9a1657f7ae44f918052 Parents: 2d18ae1 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 16:04:53 2012 +0200 ---------------------------------------------------------------------- .../mapper/BasicResourceReferenceMapper.java | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3e3fbf8f/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java index 20789ab..c785a5d 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapper.java @@ -118,11 +118,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) {
