rewrite GetBinaryStore to reach into the Modeshape runningState to pu…

…ll out the BinaryStore instance
fcrepo · Apr 30, 2013 · 50f2a5b · 50f2a5b
1 parent 46bd4de
commit 50f2a5b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 44 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/LowLevelStorageService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/LowLevelStorageService.java
@@ -33,7 +33,7 @@
 
 import org.fcrepo.Datastream;
 import org.fcrepo.services.functions.GetBinaryKey;
-import org.fcrepo.services.functions.GetBinaryStore;
+import org.modeshape.jcr.GetBinaryStore;
 import org.fcrepo.services.functions.GetCacheStore;
 import org.fcrepo.services.functions.GetGoodFixityResults;
 import org.fcrepo.utils.FixityResult;
@@ -161,9 +161,6 @@ protected Set<LowLevelCacheEntry> getLowLevelCacheEntriesFromStore(final Composi
 
 		final ImmutableSet.Builder<LowLevelCacheEntry> blobs = builder();
 
-		//seems like we have to start it, not sure why.
-		compositeStore.start();
-
 		Iterator<Map.Entry<String,BinaryStore>> it = compositeStore.getNamedStoreIterator();
 
 		while(it.hasNext()) {
@@ -191,9 +188,6 @@ protected Set<LowLevelCacheEntry> getLowLevelCacheEntriesFromStore(final Infinis
 
 		final ImmutableSet.Builder<LowLevelCacheEntry> blobs = builder();
 
-		//seems like we have to start it, not sure why.
-		ispnStore.start();
-
 		for (final Cache<?, ?> c : ImmutableSet.copyOf(ispnStore.getCaches())) {
 
 			final CacheStore cacheStore = getCacheStore.apply(c);

diff --git a/...po/services/functions/GetBinaryStore.java → ...ava/org/modeshape/jcr/GetBinaryStore.java b/...po/services/functions/GetBinaryStore.java → ...ava/org/modeshape/jcr/GetBinaryStore.java
@@ -1,5 +1,5 @@
 
-package org.fcrepo.services.functions;
+package org.modeshape.jcr;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Throwables.propagate;
@@ -21,8 +21,10 @@ public class GetBinaryStore implements Function<Repository, BinaryStore> {
     public BinaryStore apply(final Repository input) {
         checkArgument(input != null, "null cannot have a BinaryStore!");
         try {
-            return ((JcrRepository) input).getConfiguration()
-                    .getBinaryStorage().getBinaryStore();
+			assert(input != null);
+			JcrRepository.RunningState runningState = ((JcrRepository)input).runningState();
+
+            return runningState.binaryStore();
         } catch (final Exception e) {
             throw propagate(e);
         }

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/AbstractIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/AbstractIT.java
@@ -8,6 +8,7 @@
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/LowLevelStorageServiceTest.java
@@ -32,7 +32,7 @@
 import org.fcrepo.Datastream;
 import org.fcrepo.FedoraObject;
 import org.fcrepo.services.functions.GetBinaryKey;
-import org.fcrepo.services.functions.GetBinaryStore;
+import org.modeshape.jcr.GetBinaryStore;
 import org.fcrepo.services.functions.GetCacheStore;
 import org.fcrepo.services.functions.GetGoodFixityResults;
 import org.fcrepo.utils.FixityResult;

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/functions/GetBinaryStoreTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/functions/GetBinaryStoreTest.java
diff --git a/fcrepo-kernel/src/test/java/org/modeshape/jcr/GetBinaryStoreIT.java b/fcrepo-kernel/src/test/java/org/modeshape/jcr/GetBinaryStoreIT.java
@@ -0,0 +1,35 @@
+
+package org.modeshape.jcr;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertThat;
+import javax.inject.Inject;
+import javax.jcr.RepositoryException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.modeshape.jcr.GetBinaryStore;
+import org.modeshape.jcr.value.binary.BinaryStore;
+import org.modeshape.jcr.value.binary.TransientBinaryStore;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration({"/spring-test/repo.xml"})
+public class GetBinaryStoreIT {
+
+	@Inject
+	javax.jcr.Repository repo;
+
+    @Test
+    public void testApply() throws RepositoryException {
+		final GetBinaryStore testObj = new GetBinaryStore();
+
+		final BinaryStore binaryStore = testObj.apply(repo);
+
+		assertThat(binaryStore, instanceOf(TransientBinaryStore.class));
+
+	}
+
+}