svn commit: r1860341 - in /jackrabbit/oak/branches/1.10: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java

[reschke]

Author: reschke
Date: Wed May 29 12:45:19 2019
New Revision: 1860341

URL: http://svn.apache.org/viewvc?rev=1860341&view=rev
Log:
OAK-8368: RDBDocumentNodeStoreBuilder: refactor setRDBConnection for 
consistency (ported to 1.10)

Modified:
    jackrabbit/oak/branches/1.10/   (props changed)
    
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java

Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 29 12:45:19 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857589,1857592,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859619,1859716,1859776,1859780,1859843,1859854,1859881,1860202,1860278
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857589,1857592,1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859619,1859716,1859776,1859780,1859843,1859854,1859881,1860202,1860278,1860328
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java?rev=1860341&r1=1860340&r2=1860341&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentNodeStoreBuilder.java
 Wed May 29 12:45:19 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();