From 7e8e00ac7761c37dfcbb2ca6bcbb12f4e97115c1 Mon Sep 17 00:00:00 2001
From: dbernstein <dabylon@gmail.com>
Date: Tue, 25 Jan 2022 15:12:06 -0800
Subject: [PATCH] Upgrades ocfl-java to 1.4.3 Resolves:
 https://fedora-repository.atlassian.net/browse/FCREPO-3793

---
 pom.xml                                                       | 2 +-
 .../storage/ocfl/DefaultOcflObjectSessionFactoryTest.java     | 4 ++--
 .../org/fcrepo/storage/ocfl/DefaultOcflObjectSessionTest.java | 4 ++--
 .../fcrepo/storage/ocfl/validation/ObjectValidatorTest.java   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffebea0..a74d6dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version>
     <source.plugin.version>3.0.1</source.plugin.version>
     <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
-    <ocfl-java.version>1.3.1</ocfl-java.version>
+    <ocfl-java.version>1.4.3</ocfl-java.version>
     <sonatype.host>s01.oss.sonatype.org</sonatype.host>
   </properties>
 
diff --git a/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionFactoryTest.java b/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionFactoryTest.java
index 45e6e1b..604d3c4 100644
--- a/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionFactoryTest.java
+++ b/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionFactoryTest.java
@@ -13,7 +13,7 @@
 import edu.wisc.library.ocfl.core.OcflRepositoryBuilder;
 import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
 import edu.wisc.library.ocfl.core.path.mapper.LogicalPathMappers;
-import edu.wisc.library.ocfl.core.storage.filesystem.FileSystemOcflStorage;
+import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder;
 import org.apache.commons.lang3.SystemUtils;
 import org.fcrepo.storage.ocfl.cache.NoOpCache;
 import org.junit.Before;
@@ -57,7 +57,7 @@ public void setup() throws IOException {
         ocflRepo = new OcflRepositoryBuilder()
                 .defaultLayoutConfig(new HashedNTupleLayoutConfig())
                 .logicalPathMapper(logicalPathMapper)
-                .storage(FileSystemOcflStorage.builder().repositoryRoot(ocflRoot).build())
+                .storage(OcflStorageBuilder.builder().fileSystem(ocflRoot).build())
                 .workDir(ocflTemp)
                 .buildMutable();
 
diff --git a/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionTest.java b/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionTest.java
index 2acfd14..7871877 100644
--- a/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionTest.java
+++ b/src/test/java/org/fcrepo/storage/ocfl/DefaultOcflObjectSessionTest.java
@@ -17,7 +17,7 @@
 import edu.wisc.library.ocfl.core.OcflRepositoryBuilder;
 import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
 import edu.wisc.library.ocfl.core.path.mapper.LogicalPathMappers;
-import edu.wisc.library.ocfl.core.storage.filesystem.FileSystemOcflStorage;
+import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder;
 import org.apache.commons.lang3.SystemUtils;
 import org.fcrepo.storage.ocfl.cache.CaffeineCache;
 import org.fcrepo.storage.ocfl.cache.NoOpCache;
@@ -107,7 +107,7 @@ public void setup() throws IOException {
         ocflRepo = new OcflRepositoryBuilder()
                 .defaultLayoutConfig(new HashedNTupleLayoutConfig())
                 .logicalPathMapper(logicalPathMapper)
-                .storage(FileSystemOcflStorage.builder().repositoryRoot(ocflRoot).build())
+                .storage(OcflStorageBuilder.builder().fileSystem(ocflRoot).build())
                 .workDir(ocflTemp)
                 .buildMutable();
 
diff --git a/src/test/java/org/fcrepo/storage/ocfl/validation/ObjectValidatorTest.java b/src/test/java/org/fcrepo/storage/ocfl/validation/ObjectValidatorTest.java
index c3808c6..b7b761f 100644
--- a/src/test/java/org/fcrepo/storage/ocfl/validation/ObjectValidatorTest.java
+++ b/src/test/java/org/fcrepo/storage/ocfl/validation/ObjectValidatorTest.java
@@ -14,7 +14,7 @@
 import edu.wisc.library.ocfl.core.OcflRepositoryBuilder;
 import edu.wisc.library.ocfl.core.extension.storage.layout.config.HashedNTupleLayoutConfig;
 import edu.wisc.library.ocfl.core.path.mapper.LogicalPathMappers;
-import edu.wisc.library.ocfl.core.storage.filesystem.FileSystemOcflStorage;
+import edu.wisc.library.ocfl.core.storage.OcflStorageBuilder;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.fcrepo.storage.ocfl.CommitType;
@@ -90,7 +90,7 @@ public void setup() throws IOException {
         ocflRepo = new OcflRepositoryBuilder()
                 .defaultLayoutConfig(new HashedNTupleLayoutConfig())
                 .logicalPathMapper(logicalPathMapper)
-                .storage(FileSystemOcflStorage.builder().repositoryRoot(ocflRoot).build())
+                .storage(OcflStorageBuilder.builder().fileSystem(ocflRoot).build())
                 .workDir(ocflTemp)
                 .buildMutable();