Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 815BF908B for ; Wed, 30 May 2012 14:37:50 +0000 (UTC) Received: (qmail 19263 invoked by uid 500); 30 May 2012 14:37:50 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 19246 invoked by uid 500); 30 May 2012 14:37:50 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 19238 invoked by uid 99); 30 May 2012 14:37:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 14:37:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 14:37:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 186F623889BF; Wed, 30 May 2012 14:37:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1344277 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: NodeDelegate.java NodeImpl.java PropertyDelegate.java Date: Wed, 30 May 2012 14:37:25 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120530143726.186F623889BF@eris.apache.org> Author: mduerig Date: Wed May 30 14:37:25 2012 New Revision: 1344277 URL: http://svn.apache.org/viewvc?rev=1344277&view=rev Log: OAK-37: Use nullability annotation to enforce/document API contract Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java?rev=1344277&r1=1344276&r2=1344277&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java Wed May 30 14:37:25 2012 @@ -101,9 +101,7 @@ public class NodeDelegate extends ItemDe return getPath(); } else { - CoreValue value = pd.getValue(); - assert value != null; // since jcr:uuid is a single valued property - return value.toString(); + return pd.getValue().toString(); } } Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1344277&r1=1344276&r2=1344277&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Wed May 30 14:37:25 2012 @@ -755,9 +755,7 @@ public class NodeImpl extends ItemImpl i } else { List values = new ArrayList(); values.add(cv); - Iterable existingValues = mixins.getValues(); - assert existingValues != null; // since jcr:mixinTypes is a multi valued property - for (CoreValue existingValue : existingValues) { + for (CoreValue existingValue : mixins.getValues()) { if (!values.contains(existingValue)) { values.add(existingValue); } Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java?rev=1344277&r1=1344276&r2=1344277&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java Wed May 30 14:37:25 2012 @@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Tree.Status; import org.apache.jackrabbit.oak.commons.PathUtils; -import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.jcr.InvalidItemStateException; import javax.jcr.Value; @@ -98,22 +97,23 @@ public class PropertyDelegate extends It /** * Get the value of the property - * @return value or {@code null} if multi values + * @return the value of the property + * @throws IllegalStateException if {@code isMultivalue()} is {@code true}. + * */ - @CheckForNull + @Nonnull public CoreValue getValue() throws InvalidItemStateException { - PropertyState state = getPropertyState(); - return state.isArray() ? null : state.getValue(); + return getPropertyState().getValue(); } /** * Get the value of the property - * @return value or {@code null} if single valued + * @return the values of the property + * @throws IllegalStateException if {@code isMultivalue()} is {@code false}. */ - @CheckForNull + @Nonnull public Iterable getValues() throws InvalidItemStateException { - PropertyState state = getPropertyState(); - return state == null ? null : state.getValues(); + return getPropertyState().getValues(); } /** @@ -247,6 +247,7 @@ public class PropertyDelegate extends It //------------------------------------------------------------< private >--- + @Nonnull private PropertyState getPropertyState() throws InvalidItemStateException { resolve(); if (parent == null) { @@ -256,6 +257,7 @@ public class PropertyDelegate extends It return propertyState; } + @Nonnull private Tree getParentTree() throws InvalidItemStateException { resolve(); if (parent == null) {