fix omit prefix layout bug when delimiter has multiple characters and…

… is not found
OCFL · Oct 12, 2021 · b24159a · b24159a
1 parent 3c42ee8
commit b24159a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/...va/edu/wisc/library/ocfl/core/extension/storage/layout/FlatOmitPrefixLayoutExtension.java b/...va/edu/wisc/library/ocfl/core/extension/storage/layout/FlatOmitPrefixLayoutExtension.java
@@ -109,9 +109,12 @@ public String mapObjectId(String objectId) {
 
         // Use lowercase of delimiter and objectId, per specification
         String id = objectId.toLowerCase();
-
         int index = id.lastIndexOf(delim);
-        String dir = objectId.substring(index + delim.length());
+        String dir = objectId;
+
+        if (index > -1) {
+            dir = objectId.substring(index + delim.length());
+        }
 
         if (OcflConstants.EXTENSIONS_DIR.equals(dir) || dir.isEmpty()) {
             throw new OcflExtensionException(String.format("The object id <%s> is incompatible with layout extension " +

diff --git a/.../layout/impl/FlatLayoutExtensionTest.java → ...orage/layout/FlatLayoutExtensionTest.java b/.../layout/impl/FlatLayoutExtensionTest.java → ...orage/layout/FlatLayoutExtensionTest.java
@@ -1,4 +1,4 @@
-package edu.wisc.library.ocfl.core.extension.storage.layout.impl;
+package edu.wisc.library.ocfl.core.extension.storage.layout;
 
 import edu.wisc.library.ocfl.api.exception.OcflExtensionException;
 import edu.wisc.library.ocfl.core.extension.storage.layout.FlatLayoutExtension;

diff --git a/...du/wisc/library/ocfl/core/extension/storage/layout/FlatOmitPrefixLayoutExtensionTest.java b/...du/wisc/library/ocfl/core/extension/storage/layout/FlatOmitPrefixLayoutExtensionTest.java
@@ -112,4 +112,13 @@ public void testTwoOccurrencesOfMultiCharDelimiter() {
         assertEquals("f8.05v", result);
     }
 
+    @Test
+    public void multiCharacterDelemiterNotFound() {
+        config.setDelimiter("edu/");
+        ext.init(config);
+
+        String result = ext.mapObjectId("https://institution.gov/abc/f8.05v");
+        assertEquals("https://institution.gov/abc/f8.05v", result);
+    }
+
 }
diff --git a/...leIdEncapsulationLayoutExtensionTest.java → ...leIdEncapsulationLayoutExtensionTest.java b/...leIdEncapsulationLayoutExtensionTest.java → ...leIdEncapsulationLayoutExtensionTest.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package edu.wisc.library.ocfl.core.extension.storage.layout.impl;
+package edu.wisc.library.ocfl.core.extension.storage.layout;
 
 import edu.wisc.library.ocfl.api.exception.OcflExtensionException;
 import edu.wisc.library.ocfl.api.model.DigestAlgorithm;

diff --git a/...impl/HashedNTupleLayoutExtensionTest.java → ...yout/HashedNTupleLayoutExtensionTest.java b/...impl/HashedNTupleLayoutExtensionTest.java → ...yout/HashedNTupleLayoutExtensionTest.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package edu.wisc.library.ocfl.core.extension.storage.layout.impl;
+package edu.wisc.library.ocfl.core.extension.storage.layout;
 
 import edu.wisc.library.ocfl.api.exception.OcflExtensionException;
 import edu.wisc.library.ocfl.api.model.DigestAlgorithm;