svn commit: r1796618 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java

[to...@apache.org]

Author: tomekr
Date: Mon May 29 12:25:14 2017
New Revision: 1796618

URL: http://svn.apache.org/viewvc?rev=1796618&view=rev
Log:
OAK-6256: Prevent creating the across-mounts references

Read the failOnDetection from OSGi configuration. Require configuration
for the component to start.

Modified:
    jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java

Modified: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java?rev=1796618&r1=1796617&r2=1796618&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidatorProvider.java Mon May 29 12:25:14 2017
@@ -16,10 +16,13 @@
  */
 package org.apache.jackrabbit.oak.composite;
 
+import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.jackrabbit.oak.commons.PropertiesUtil;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
 import org.apache.jackrabbit.oak.spi.commit.Validator;
@@ -27,11 +30,14 @@ import org.apache.jackrabbit.oak.spi.com
 import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
 import org.apache.jackrabbit.oak.spi.mount.Mounts;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.osgi.framework.BundleContext;
+
+import java.util.Map;
 
 /**
  * {@link Validator} which detects references crossing the mount boundaries
  */
-@Component(label = "Apache Jackrabbit Oak CrossMountReferenceValidatorProvider")
+@Component(label = "Apache Jackrabbit Oak CrossMountReferenceValidatorProvider", policy = ConfigurationPolicy.REQUIRE)
 @Property(name = "type", value = "crossMountRefValidator", propertyPrivate = true)
 @Service({ValidatorProvider.class, EditorProvider.class})
 public class CrossMountReferenceValidatorProvider extends ValidatorProvider {
@@ -47,6 +53,11 @@ public class CrossMountReferenceValidato
     @Reference
     private MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider();
 
+    @Activate
+    private void activate(BundleContext bundleContext, Map<String, ?> config) {
+        failOnDetection = PropertiesUtil.toBoolean(config.get(PROP_FAIL_ON_DETECTION), false);
+    }
+
     @Override
     protected Validator getRootValidator(NodeState before, NodeState after, CommitInfo info) {
         return new CrossMountReferenceValidator(after, mountInfoProvider, failOnDetection);