include latest changes for rangeRequests in fcrepo-storage-ocfl

fcrepo-exts · Jan 16, 2025 · 916d252 · 916d252
1 parent 1714a40
commit 916d252
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.main.class>org.fcrepo.migration.PicocliMigrator</project.main.class>
     <spring.version>5.2.24.RELEASE</spring.version>
-    <fcrepo-storage-ocfl.version>6.4.0-SNAPSHOT</fcrepo-storage-ocfl.version>
+    <fcrepo-storage-ocfl.version>6.4.0</fcrepo-storage-ocfl.version>
     <lucene.version>7.1.0</lucene.version>
     <jena.version>4.2.0</jena.version>
     <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>

diff --git a/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java b/src/main/java/org/fcrepo/migration/OcflSessionFactoryFactoryBean.java
@@ -22,6 +22,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import io.ocfl.api.OcflConfig;
 import io.ocfl.api.model.DigestAlgorithm;
+import io.ocfl.api.DigestAlgorithmRegistry;
 import io.ocfl.core.OcflRepositoryBuilder;
 import io.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
 import io.ocfl.core.path.mapper.LogicalPathMappers;
@@ -93,7 +94,8 @@ public OcflSessionFactoryFactoryBean(final Path ocflRoot,
                                          final String user,
                                          final String userUri,
                                          final boolean disableChecksumValidation) {
-        this(ocflRoot, stagingDir, migrationType, user, userUri, DigestAlgorithm.sha512, disableChecksumValidation);
+        this(ocflRoot, stagingDir, migrationType, user, userUri,
+                DigestAlgorithmRegistry.sha512, disableChecksumValidation);
     }
 
     @Override

diff --git a/src/main/java/org/fcrepo/migration/handlers/ocfl/OcflObjectSessionWrapper.java b/src/main/java/org/fcrepo/migration/handlers/ocfl/OcflObjectSessionWrapper.java
@@ -111,6 +111,18 @@ public ResourceContent readContent(final String resourceId, final String version
         return readContentTimer.record(() -> inner.readContent(resourceId, versionNumber));
     }
 
+    @Override
+    public ResourceContent readRange(final String resourceId, final String versionNumber,
+                                     final long startPosition, final long endPosition) {
+        return readContentTimer.record(() -> inner.readRange(resourceId, versionNumber,
+                                                        startPosition, endPosition));
+    }
+
+    @Override
+    public ResourceContent readRange(final String resourceId, final long startPosition, final long endPosition) {
+        return readContentTimer.record(() -> inner.readRange(resourceId, null, startPosition, endPosition));
+    }
+
     @Override
     public List<OcflVersionInfo> listVersions(final String resourceId) {
         return listVersionsTimer.record(() -> inner.listVersions(resourceId));

diff --git a/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java b/src/main/java/org/fcrepo/migration/handlers/ocfl/PlainOcflObjectSession.java
@@ -253,6 +253,17 @@ public ResourceContent readContent(final String resourceId, final String version
         throw new UnsupportedOperationException("Not implemented");
     }
 
+    @Override
+    public ResourceContent readRange(final String resourceId, final String versionNumber,
+                                     final long startPosition, final long endPosition) {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    @Override
+    public ResourceContent readRange(final String resourceId, final long startPosition, final long endPosition) {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
     @Override
     public List<OcflVersionInfo> listVersions(final String resourceId) {
         throw new UnsupportedOperationException("Not implemented");

diff --git a/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java b/src/test/java/org/fcrepo/migration/pidlist/HeadOnlyIT.java
@@ -10,6 +10,7 @@
 
 import io.ocfl.api.OcflRepository;
 import io.ocfl.api.model.DigestAlgorithm;
+import io.ocfl.api.DigestAlgorithmRegistry;
 import io.ocfl.api.model.FileDetails;
 import io.ocfl.api.model.ObjectDetails;
 import io.ocfl.core.OcflRepositoryBuilder;
@@ -43,7 +44,7 @@ public class HeadOnlyIT {
     private final boolean disableChecksum = false;
     private final boolean disableDc = false;
 
-    private final DigestAlgorithm digestAlgorithm = DigestAlgorithm.sha512;
+    private final DigestAlgorithm digestAlgorithm = DigestAlgorithmRegistry.sha512;
     private final MigrationType migrationType = MigrationType.FEDORA_OCFL;
 
     private LegacyFSIDResolver idResolver;