Repository: metamodel Updated Branches: refs/heads/master 78edbe864 -> 325656dd5
Turned "assert" in ResourceUtils into "if" ... and thus allow non-conforming Resource implementations. Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/325656dd Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/325656dd Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/325656dd Branch: refs/heads/master Commit: 325656dd5177806a99895ae72ab7a2284edacd5e Parents: 78edbe8 Author: Kasper Sørensen <[email protected]> Authored: Tue Nov 20 18:56:59 2018 -0800 Committer: Kasper Sørensen <[email protected]> Committed: Tue Nov 20 18:56:59 2018 -0800 ---------------------------------------------------------------------- .../org/apache/metamodel/util/ResourceUtils.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/325656dd/core/src/main/java/org/apache/metamodel/util/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/util/ResourceUtils.java b/core/src/main/java/org/apache/metamodel/util/ResourceUtils.java index 9e2faea..83ab622 100644 --- a/core/src/main/java/org/apache/metamodel/util/ResourceUtils.java +++ b/core/src/main/java/org/apache/metamodel/util/ResourceUtils.java @@ -76,12 +76,14 @@ public class ResourceUtils { * @return */ public static String getParentName(Resource resource) { - String name = resource.getName(); - String qualifiedPath = resource.getQualifiedPath(); + final String name = resource.getName(); + final String qualifiedPath = resource.getQualifiedPath(); - assert qualifiedPath.endsWith(name); + if (!qualifiedPath.endsWith(name)) { + return ""; + } - int indexOfChild = qualifiedPath.length() - name.length(); + final int indexOfChild = qualifiedPath.length() - name.length(); if (indexOfChild <= 0) { return ""; @@ -95,9 +97,9 @@ public class ResourceUtils { parentQualifiedPath = parentQualifiedPath.substring(0, parentQualifiedPath.length() - 1); - int lastIndexOfSlash = parentQualifiedPath.lastIndexOf('/'); - int lastIndexOfBackSlash = parentQualifiedPath.lastIndexOf('\\'); - int lastIndexToUse = Math.max(lastIndexOfSlash, lastIndexOfBackSlash); + final int lastIndexOfSlash = parentQualifiedPath.lastIndexOf('/'); + final int lastIndexOfBackSlash = parentQualifiedPath.lastIndexOf('\\'); + final int lastIndexToUse = Math.max(lastIndexOfSlash, lastIndexOfBackSlash); if (lastIndexToUse == -1) { return parentQualifiedPath; @@ -106,7 +108,7 @@ public class ResourceUtils { // add one because of the slash/backslash itself // lastIndexToUse++; - String parentName = parentQualifiedPath.substring(lastIndexToUse + 1); + final String parentName = parentQualifiedPath.substring(lastIndexToUse + 1); return parentName; } }
