svn commit: r1818751 - in /jackrabbit/oak/trunk/oak-run-commons/src: main/java/org/apache/jackrabbit/oak/run/cli/ test/java/org/apache/jackrabbit/oak/run/cli/

[ch...@apache.org]

Author: chetanm
Date: Wed Dec 20 08:53:42 2017
New Revision: 1818751

URL: http://svn.apache.org/viewvc?rev=1818751&view=rev
Log:
OAK-7095 - NodeStoreFixtureProvider should use BlobStore from DocumentNodeStore if no DataStore configured

Modified:
    jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
    jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
    jackrabbit/oak/trunk/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureTest.java

Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java?rev=1818751&r1=1818750&r2=1818751&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java Wed Dec 20 08:53:42 2017
@@ -35,7 +35,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore;
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 
@@ -46,7 +45,7 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getService;
 
 class DocumentFixtureProvider {
-    static NodeStore configureDocumentMk(Options options,
+    static DocumentNodeStore configureDocumentMk(Options options,
                                          BlobStore blobStore,
                                          Whiteboard wb,
                                          Closer closer,

Modified: jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java?rev=1818751&r1=1818750&r2=1818751&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java Wed Dec 20 08:53:42 2017
@@ -30,6 +30,7 @@ import com.codahale.metrics.Counting;
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.io.Closer;
 import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.metric.MetricStatisticsProvider;
 import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -63,7 +64,11 @@ public class NodeStoreFixtureProvider {
 
         NodeStore store;
         if (commonOpts.isMongo() || commonOpts.isRDB()) {
-            store = DocumentFixtureProvider.configureDocumentMk(options, blobStore, wb, closer, readOnly);
+            DocumentNodeStore dns = DocumentFixtureProvider.configureDocumentMk(options, blobStore, wb, closer, readOnly);
+            store = dns;
+            if (blobStore == null) {
+                blobStore = dns.getBlobStore();
+            }
         } else if (commonOpts.isOldSegment()) {
             store = SegmentFixtureProvider.create(options, blobStore, wb, closer, readOnly);
         } else {

Modified: jackrabbit/oak/trunk/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureTest.java?rev=1818751&r1=1818750&r2=1818751&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureTest.java (original)
+++ jackrabbit/oak/trunk/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureTest.java Wed Dec 20 08:53:42 2017
@@ -33,6 +33,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static java.util.Collections.emptyMap;
+import static org.junit.Assert.assertNotNull;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -52,6 +53,7 @@ public class DocumentFixtureTest {
             NodeBuilder builder = store.getRoot().builder();
             builder.setChildNode("foo");
             store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+            assertNotNull(fixture.getBlobStore());
         }
     }