From: Robert Varga Date: Tue, 26 Mar 2019 10:52:18 +0000 (+0100) Subject: Make TreeNode @NonNullByDefault X-Git-Tag: v3.0.0~46 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0f58c8c72db4eec8542517dbd87fff3f72e1abf8;p=yangtools.git Make TreeNode @NonNullByDefault This reflects our intent, so make sure we declare it. Change-Id: I8023e161207aff6f230a651cf6e06dde8f478279 Signed-off-by: Robert Varga --- diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java index 36849f07cf..4d463c5306 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java @@ -11,12 +11,14 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** * A very basic data tree node. Contains some versioned data. */ +@NonNullByDefault abstract class AbstractTreeNode implements TreeNode { private final NormalizedNode data; private final Version version; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java index 805c82d6f7..41711e5382 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -29,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode; */ // FIXME: BUG-2399: clarify that versioning rules are not enforced for non-presence containers, as they are not // considered to be data nodes. -// FIXME: 3.0.0: Use @NonNullByDefault +@NonNullByDefault public interface TreeNode extends Identifiable, StoreTreeNode { /** * Get the data node version. This version is updated whenever the data representation of this particular node