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 md...@apache.org on 2012/05/24 13:56:33 UTC

svn commit: r1342209 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java

Author: mduerig
Date: Thu May 24 11:56:32 2012
New Revision: 1342209

URL: http://svn.apache.org/viewvc?rev=1342209&view=rev
Log:
OAK-37: Use nullability annotation to enforce/document API contract
- add nullability annotations to NodeStoreBranch

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java?rev=1342209&r1=1342208&r2=1342209&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeStoreBranch.java Thu May 24 11:56:32 2012
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.spi.st
 
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 
+import javax.annotation.Nonnull;
+
 public interface NodeStoreBranch {
 
     /**
@@ -25,6 +27,7 @@ public interface NodeStoreBranch {
      *
      * @return root node state
      */
+    @Nonnull
     NodeState getRoot();
 
     /**
@@ -32,6 +35,7 @@ public interface NodeStoreBranch {
      *
      * @return base node state
      */
+    @Nonnull
     NodeState getBase();
 
     /**
@@ -65,6 +69,7 @@ public interface NodeStoreBranch {
      *
      * @throws CommitFailedException if the merge failed
      */
+    @Nonnull
     NodeState merge() throws CommitFailedException;
 
 }