svn commit: r1751313 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/multiplex/ main/java/org/apache/jackrabbit/oak/spi/mount/ test/java/org/apache/jackrabbit/oak/plugins/multiplex/

[chetanm]

Author: chetanm
Date: Mon Jul  4 15:26:23 2016
New Revision: 1751313

URL: http://svn.apache.org/viewvc?rev=1751313&view=rev
Log:
OAK-3404 - [multiplex]  Path to logical store mapping

Add method to quickly determine if any mount points are configured

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProvider.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProviderTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProvider.java?rev=1751313&r1=1751312&r2=1751313&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProvider.java
 Mon Jul  4 15:26:23 2016
@@ -38,10 +38,12 @@ import static java.util.Arrays.asList;
 public class SimpleMountInfoProvider implements MountInfoProvider {
     private final List<MountInfo> mountInfos;
     private final Map<String, Mount> mounts;
+    private final boolean hasMounts;
 
     public SimpleMountInfoProvider(List<MountInfo> mountInfos){
         this.mountInfos = ImmutableList.copyOf(mountInfos);
         this.mounts = getMounts(mountInfos);
+        this.hasMounts = !mountInfos.isEmpty();
         //TODO add validation of mountpoints
     }
 
@@ -65,6 +67,11 @@ public class SimpleMountInfoProvider imp
         return mounts.get(name);
     }
 
+    @Override
+    public boolean hasNonDefaultMounts() {
+        return hasMounts;
+    }
+
     //~----------------------------------------< builder >
 
     public static Builder newBuilder(){

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java?rev=1751313&r1=1751312&r2=1751313&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
 Mon Jul  4 15:26:23 2016
@@ -40,6 +40,11 @@ public interface MountInfoProvider {
         public Mount getMount(String name) {
             return null;
         }
+
+        @Override
+        public boolean hasNonDefaultMounts() {
+            return false;
+        }
     };
 
     /**
@@ -65,4 +70,9 @@ public interface MountInfoProvider {
      */
     @CheckForNull
     Mount getMount(String name);
+
+    /**
+     * Return true if there are explicit mounts configured
+     */
+    boolean hasNonDefaultMounts();
 }

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProviderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProviderTest.java?rev=1751313&r1=1751312&r2=1751313&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProviderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/SimpleMountInfoProviderTest.java
 Mon Jul  4 15:26:23 2016
@@ -42,6 +42,7 @@ public class SimpleMountInfoProviderTest
 
         assertNotNull(mip.getMountInfo("/a"));
         assertTrue(mip.getMountInfo("/a").isDefault());
+        assertFalse(mip.hasNonDefaultMounts());
     }
 
     @Test
@@ -55,6 +56,7 @@ public class SimpleMountInfoProviderTest
         assertEquals("foo", mip.getMountInfo("/a/x").getName());
         assertEquals("bar", mip.getMountInfo("/x").getName());
         assertTrue(mip.getMountInfo("/z").isDefault());
+        assertTrue(mip.hasNonDefaultMounts());
     }
 
     @Test