You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ro...@apache.org on 2017/07/21 15:04:41 UTC
svn commit: r1802605 - in /jackrabbit/oak/trunk:
oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/
Author: rombert
Date: Fri Jul 21 15:04:40 2017
New Revision: 1802605
URL: http://svn.apache.org/viewvc?rev=1802605&view=rev
Log:
OAK-6265 - Remove Mounts.defaultMount methods
These methods break the abstraction of constructing a composite setup
and should not be used. For backwards compatibility reasons they are
only deprecated, but no Oak code calls them anymore.
Modified:
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java
jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/SimpleMountInfoProvider.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiplexersTest.java
Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java?rev=1802605&r1=1802604&r2=1802605&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java (original)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java Fri Jul 21 15:04:40 2017
@@ -157,25 +157,6 @@ public final class Mounts {
}
/**
- * Returns the default {@link Mount}
- *
- * @return the default mount
- */
- public static Mount defaultMount() {
- return DEFAULT_MOUNT;
- }
-
- /**
- * Creates a new default (root) mount with the specified non-default mounts
- *
- * @param mounts the mounts to configure
- * @return the created mount
- */
- public static Mount defaultMount(Collection<Mount> mounts) {
- return new DefaultMount(mounts);
- }
-
- /**
* Creates a new Builder instance for configuring more complex mount setups
*
* @return a new builder instance
Modified: jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/SimpleMountInfoProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/SimpleMountInfoProvider.java?rev=1802605&r1=1802604&r2=1802605&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/SimpleMountInfoProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/SimpleMountInfoProvider.java Fri Jul 21 15:04:40 2017
@@ -111,7 +111,7 @@ final class SimpleMountInfoProvider impl
}
private static Mount defaultMount(Map<String, Mount> mounts) {
- return Mounts.defaultMount(mounts.values());
+ return new Mounts.DefaultMount(mounts.values());
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiplexersTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiplexersTest.java?rev=1802605&r1=1802604&r2=1802605&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiplexersTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiplexersTest.java Fri Jul 21 15:04:40 2017
@@ -27,18 +27,26 @@ import static org.junit.Assert.assertEqu
import org.apache.jackrabbit.oak.spi.mount.Mount;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
+import org.junit.Before;
import org.junit.Test;
public class MultiplexersTest {
+ private MountInfoProvider mip;
+
+ @Before
+ public void setUp() {
+ mip = Mounts.defaultMountInfoProvider();
+ }
+
@Test
public void defaultSetup() throws Exception {
- assertEquals(
+ assertEquals(
INDEX_CONTENT_NODE_NAME,
- getIndexNodeName(Mounts.defaultMountInfoProvider(), "/foo",
+ getIndexNodeName(mip, "/foo",
INDEX_CONTENT_NODE_NAME));
assertEquals(INDEX_CONTENT_NODE_NAME,
- getNodeForMount(Mounts.defaultMount(), INDEX_CONTENT_NODE_NAME));
+ getNodeForMount(mip.getDefaultMount(), INDEX_CONTENT_NODE_NAME));
}
@Test