Choose the longest prefix in JsonLdUtils.compareShortestLeast

ansell · ansell · commit a04b9b7a5989 · 2015-11-03T10:09:25.000+11:00
diff --git a/core/src/main/java/com/github/jsonldjava/core/JsonLdUtils.java b/core/src/main/java/com/github/jsonldjava/core/JsonLdUtils.java
@@ -602,7 +602,12 @@ static int compareShortestLeast(String a, String b) {
             return -1;
         } else if (b.length() < a.length()) {
             return 1;
+        } else if (a.indexOf(":") != b.indexOf(":")){
+            // Attempt to disambiguate to get the longest prefix, 
+            // by looking for the highest position for ":"
+            return a.indexOf(":") < b.indexOf(":") ? 1 : -1;
         }
+        
         return Integer.signum(a.compareTo(b));
     }
 
diff --git a/core/src/test/java/com/github/jsonldjava/core/LongestPrefixTest.java b/core/src/test/java/com/github/jsonldjava/core/LongestPrefixTest.java
@@ -63,7 +63,7 @@ public void fromRdfWithNamespaceLexicographicallyShortestChosen() throws Excepti
         String toJSONLD = JsonUtils.toPrettyString(fromRDF);
         System.out.println(toJSONLD);
         
-        assertTrue("The lexicographically shortest URI was not chosen", toJSONLD.contains("aat:rev/"));
+        assertFalse("The lexicographically shortest URI was not chosen", toJSONLD.contains("aat:rev/"));
 
         final RDFDataset rdf = (RDFDataset) JsonLdProcessor.toRDF(fromRDF, options);
         System.out.println(rdf.getNamespaces());

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,12 @@ static int compareShortestLeast(String a, String b) {`
`602`	`602`	`return -1;`
`603`	`603`	`} else if (b.length() < a.length()) {`
`604`	`604`	`return 1;`
	`605`	`+ } else if (a.indexOf(":") != b.indexOf(":")){`
	`606`	`+ // Attempt to disambiguate to get the longest prefix,`
	`607`	`+ // by looking for the highest position for ":"`
	`608`	`+ return a.indexOf(":") < b.indexOf(":") ? 1 : -1;`
`605`	`609`	`}`
	`610`	`+`
`606`	`611`	`return Integer.signum(a.compareTo(b));`
`607`	`612`	`}`
`608`	`613`