svn commit: r1860328 - /jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java

[reschke]

Author: reschke
Date: Wed May 29 11:38:39 2019
New Revision: 1860328

URL: http://svn.apache.org/viewvc?rev=1860328&view=rev
Log:
OAK-8368: RDBDocumentNodeStoreBuilder: refactor setRDBConnection for consistency

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java?rev=1860328&r1=1860327&r2=1860328&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 Wed May 29 11:38:39 2019
@@ -59,11 +59,7 @@ public class RDBDocumentNodeStoreBuilder
      * @return this
      */
     public RDBDocumentNodeStoreBuilder setRDBConnection(DataSource ds, 
RDBOptions options) {
-        this.documentStoreSupplier = memoize(() -> new RDBDocumentStore(ds, 
this, options));
-        if (blobStore == null) {
-            GarbageCollectableBlobStore s = new RDBBlobStore(ds, options);
-            setGCBlobStore(s);
-        }
+        setRDBConnection(ds, ds, options);
         return thisBuilder();
     }
 
@@ -74,9 +70,20 @@ public class RDBDocumentNodeStoreBuilder
      * @return this
      */
     public RDBDocumentNodeStoreBuilder setRDBConnection(DataSource 
documentStoreDataSource, DataSource blobStoreDataSource) {
-        this.documentStoreSupplier = memoize(() -> new 
RDBDocumentStore(documentStoreDataSource, this));
+        setRDBConnection(documentStoreDataSource, blobStoreDataSource, new 
RDBOptions());
+        return thisBuilder();
+    }
+
+    /**
+     * Sets a {@link DataSource}s to use for the RDB document and blob
+     * stores, including {@link RDBOptions}.
+     *
+     * @return this
+     */
+    public RDBDocumentNodeStoreBuilder setRDBConnection(DataSource 
documentStoreDataSource, DataSource blobStoreDataSource, RDBOptions options) {
+        this.documentStoreSupplier = memoize(() -> new 
RDBDocumentStore(documentStoreDataSource, this, options));
         if (blobStore == null) {
-            GarbageCollectableBlobStore s = new 
RDBBlobStore(blobStoreDataSource);
+            GarbageCollectableBlobStore s = new 
RDBBlobStore(blobStoreDataSource, options);
             setGCBlobStore(s);
         }
         return thisBuilder();