svn commit: r1566789 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/itemsave/ItemSaveValidatorProvider.java spi/commit/ValidatorProvider.java

[ju...@apache.org]

Author: jukka
Date: Mon Feb 10 22:50:01 2014
New Revision: 1566789

URL: http://svn.apache.org/r1566789
Log:
OAK-1387: Pass CommitInfo to commit hooks, editors and validators

Fix the incorrect nullability annotation on ValidatorProvider

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java?rev=1566789&r1=1566788&r2=1566789&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/itemsave/ItemSaveValidatorProvider.java Mon Feb 10 22:50:01 2014
@@ -18,6 +18,8 @@
  */
 package org.apache.jackrabbit.oak.plugins.itemsave;
 
+import javax.annotation.CheckForNull;
+
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -35,7 +37,7 @@ import org.apache.jackrabbit.oak.spi.sta
 @Service(EditorProvider.class)
 public class ItemSaveValidatorProvider extends ValidatorProvider {
 
-    @Override
+    @Override  @CheckForNull
     protected Validator getRootValidator(
             NodeState before, NodeState after, CommitInfo info) {
         String path = info.getPath();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java?rev=1566789&r1=1566788&r2=1566789&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ValidatorProvider.java Mon Feb 10 22:50:01 2014
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.spi.co
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 
-import javax.annotation.Nonnull;
+import javax.annotation.CheckForNull;
 
 /**
  * Extension point for plugging in different kinds of validation rules
@@ -37,15 +37,16 @@ public abstract class ValidatorProvider 
      * @param before original root state
      * @param after  modified root state
      * @param info   metadata about this commit
-     * @return validator for checking the modifications
+     * @return validator for checking the modifications,
+     *         or {@code null} if this validator is not needed for this commit
      */
-    @Nonnull
+    @CheckForNull
     protected abstract Validator getRootValidator(
             NodeState before, NodeState after, CommitInfo info);
 
     //----------------------------------------------------< EditorProvider >--
 
-    @Override @Nonnull
+    @Override @CheckForNull
     public final Editor getRootEditor(
             NodeState before, NodeState after,
             NodeBuilder builder, CommitInfo info) {