svn commit: r1749446 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java

[ch...@apache.org]

Author: chetanm
Date: Tue Jun 21 06:21:54 2016
New Revision: 1749446

URL: http://svn.apache.org/viewvc?rev=1749446&view=rev
Log:
OAK-4180 - Use another NodeStore as a local cache for a remote Document store

Replace usage of SecondaryNodeStore with targeted reference

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java?rev=1749446&r1=1749445&r2=1749446&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java Tue Jun 21 06:21:54 2016
@@ -48,7 +48,6 @@ import org.apache.jackrabbit.oak.spi.com
 import org.apache.jackrabbit.oak.spi.commit.Observer;
 import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.apache.jackrabbit.oak.spi.state.SecondaryNodeStoreProvider;
 import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
 import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
@@ -77,8 +76,8 @@ public class SecondaryStoreCacheService
     @Reference
     private BlobStore blobStore;
 
-    @Reference
-    private SecondaryNodeStoreProvider secondaryNodeStoreProvider;
+    @Reference(target = "(type=secondary)")
+    private NodeStore secondaryStore;
 
     @Reference
     private Executor executor;
@@ -145,9 +144,8 @@ public class SecondaryStoreCacheService
         String[] excludedPaths = toStringArray(config.get(PROP_EXCLUDES), new String[]{""});
 
         pathFilter = new PathFilter(asList(includedPaths), asList(excludedPaths));
-        NodeStore segStore = secondaryNodeStoreProvider.getSecondaryStore();
 
-        SecondaryStoreBuilder builder = new SecondaryStoreBuilder(segStore)
+        SecondaryStoreBuilder builder = new SecondaryStoreBuilder(secondaryStore)
                 .differ(differ)
                 .statisticsProvider(statisticsProvider)
                 .pathFilter(pathFilter);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java?rev=1749446&r1=1749445&r2=1749446&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheServiceTest.java Tue Jun 21 06:21:54 2016
@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.plugins.document.DocumentMKBuilderProvider;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStateCache;
 import org.apache.jackrabbit.oak.plugins.index.PathFilter;
@@ -33,7 +34,6 @@ import org.apache.jackrabbit.oak.spi.blo
 import org.apache.jackrabbit.oak.spi.commit.BackgroundObserverMBean;
 import org.apache.jackrabbit.oak.spi.commit.Observer;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.apache.jackrabbit.oak.spi.state.SecondaryNodeStoreProvider;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.apache.sling.testing.mock.osgi.MockOsgi;
 import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
@@ -58,12 +58,7 @@ public class SecondaryStoreCacheServiceT
     @Before
     public void configureDefaultServices(){
         context.registerService(BlobStore.class, new MemoryBlobStore());
-        context.registerService(SecondaryNodeStoreProvider.class, new SecondaryNodeStoreProvider() {
-            @Override
-            public NodeStore getSecondaryStore() {
-                return secondaryStore;
-            }
-        });
+        context.registerService(NodeStore.class, secondaryStore, ImmutableMap.<String, Object>of("type", "secondary"));
         context.registerService(Executor.class, Executors.newSingleThreadExecutor());
         context.registerService(StatisticsProvider.class, StatisticsProvider.NOOP);
         MockOsgi.injectServices(cacheService, context.bundleContext());