Mass-promote EffectiveStatement captures

The hierarchy and capabilities of EffectiveStatements are well-defined
and quite safe for use. Drop their @Beta annotations and add javadocs
where those were missing.

Change-Id: I7b0469aca9d527a81d59cad513707c424c978294
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java
index 95b04213f977dcd1b822e9aa6f113822b29e7d43..83394130e8dfa25e311fe280f2741dbfce4a71a4 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code action} statement.
+ */
 public interface ActionEffectiveStatement extends SchemaTreeEffectiveStatement<ActionStatement>,
         DataTreeAwareEffectiveStatement<QName, ActionStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java
index 69ac8bf18a80a9fbb25c74a80f59a6d82eca5df3..c95447fccdd0b053f82d2499f80315c17896c6dc 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnydataEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code anydata} statement.
+ */
 public interface AnydataEffectiveStatement extends DataTreeEffectiveStatement<AnydataStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java
index e3144917c0112addeaaf07c2dcafff346df4da24..698846b30daeeb0b19dee2bd66e0021e3aefeccb 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AnyxmlEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code anyxml} statement.
+ */
 public interface AnyxmlEffectiveStatement extends DataTreeEffectiveStatement<AnyxmlStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java
index df443a4a04565e7b387f3affc956fb0768e32fb6..dfd7fb0f400fa2d770cc9589b45a04859bf07a13 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ArgumentEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code argument} statement.
+ */
 public interface ArgumentEffectiveStatement extends EffectiveStatement<QName, ArgumentStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java
index 9902139fffeaae3448a325afe3d8014a09cc089e..2c9dca31dd370c51b89d78d20bc7ef33795d1266 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/AugmentEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
  * {@link EffectiveStatement} representation of a {@code augment} statement as defined by
  * <a href="https://datatracker.ietf.org/doc/html/rfc7950#section-7.17">RFC7950</a>.
  */
-@Beta
 public interface AugmentEffectiveStatement
         extends SchemaTreeAwareEffectiveStatement<SchemaNodeIdentifier, AugmentStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java
index c2c7ac59061088995b0f3ef9b74375e79764e3f1..321fabdb2c1711bbb931a723ea0702045c970cf0 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BaseEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code base} statement.
+ */
 public interface BaseEffectiveStatement extends EffectiveStatement<QName, BaseStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java
index 2d8b5fca6b9977ed8df6300f46905c8889571313..96d32cec0ffecc28abfaa3b07a1cfed196a7fb7e 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BelongsToEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code belongs-to} statement.
+ */
 public interface BelongsToEffectiveStatement extends EffectiveStatement<Unqualified, BelongsToStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java
index bcb6004c67eca992509e4d6ed117830901fcf6f5..f6ecf811b2c4d87246b7dca32b66afa9622eaf50 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/BitEffectiveStatement.java
@@ -7,21 +7,22 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code bit} statement.
+ */
 public interface BitEffectiveStatement extends EffectiveStatement<String, BitStatement> {
     @Override
     default StatementDefinition statementDefinition() {
         return YangStmtMapping.BIT;
     }
 
-    default Optional<Uint32> getDeclaredPosition() {
+    default Optional<Uint32> findDeclaredPosition() {
         return findFirstEffectiveSubstatementArgument(PositionEffectiveStatement.class);
     }
 }

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java
index fe8a98fed353b7d101162531a72d4de919c78943..36cc22e6099b74f53eee47ebe65c6ac3c80faee9 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/CaseEffectiveStatement.java
@@ -7,14 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
-public interface CaseEffectiveStatement extends SchemaTreeEffectiveStatement<CaseStatement>,
-        DataTreeAwareEffectiveStatement<QName, CaseStatement> {
+/**
+ * Effective representation of a {@code case} statement.
+ */
+public interface CaseEffectiveStatement
+        extends SchemaTreeEffectiveStatement<CaseStatement>, DataTreeAwareEffectiveStatement<QName, CaseStatement> {
     @Override
     default StatementDefinition statementDefinition() {
         return YangStmtMapping.CASE;

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java
index 56dcb14e788e18685abae7d91f9d0831e466cc9b..1db43b9b65d84efcbc0b795297e133a0fe71094b 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ChoiceEffectiveStatement.java
@@ -7,14 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
-public interface ChoiceEffectiveStatement extends SchemaTreeEffectiveStatement<ChoiceStatement>,
-        DataTreeAwareEffectiveStatement<QName, ChoiceStatement> {
+/**
+ * Effective representation of a {@code choice} statement.
+ */
+public interface ChoiceEffectiveStatement
+        extends SchemaTreeEffectiveStatement<ChoiceStatement>, DataTreeAwareEffectiveStatement<QName, ChoiceStatement> {
     @Override
     default StatementDefinition statementDefinition() {
         return YangStmtMapping.CHOICE;

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java
index 7a79433c6b2f2c9fe45c093aea02735010af6171..ca3ccc4e6609dddbc38503319512797d99233f7f 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ConfigEffectiveStatement.java
@@ -11,6 +11,9 @@ import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
+/**
+ * Effective representation of a {@code config} statement.
+ */
 public interface ConfigEffectiveStatement extends EffectiveStatement<Boolean, ConfigStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java
index e8b684ec51fa7648409bfe54ce6e7a5481524bb4..1665d2628719d12a002e4090d59e4541a60da003 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContactEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code contact} statement.
+ */
 public interface ContactEffectiveStatement extends EffectiveStatement<String, ContactStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java
index 82bd87e1d6a5bea580df1c36a91005d4fc94fdb6..5ea5ee80f10c11957f08db4f45bcc5560732acfd 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ContainerEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code container} statement.
+ */
 public interface ContainerEffectiveStatement extends DataTreeEffectiveStatement<ContainerStatement>,
         DataTreeAwareEffectiveStatement<QName, ContainerStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
index 1788a89afe408c2478f8085312e42b96cae02d8a..36812e324853bdadb3868f4cbb66eb6341b06406 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeAwareEffectiveStatement.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 import static java.util.Objects.requireNonNull;
 import static org.opendaylight.yangtools.yang.model.api.stmt.DefaultMethodHelpers.filterOptional;
 
-import com.google.common.annotations.Beta;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -23,7 +22,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
  * @param <A> Argument type
  * @param <D> Class representing declared version of this statement.
  */
-@Beta
 public interface DataTreeAwareEffectiveStatement<A, D extends DeclaredStatement<A>>
         extends SchemaTreeAwareEffectiveStatement<A, D> {
     /**
@@ -47,7 +45,7 @@ public interface DataTreeAwareEffectiveStatement<A, D extends DeclaredStatement<
      *
      * @param qname Child identifier
      * @return Data tree child, or empty
-     * @throws NullPointerException if {@code qname} is null
+     * @throws NullPointerException if {@code qname} is {@code null}
      */
     default @NonNull Optional<DataTreeEffectiveStatement<?>> findDataTreeNode(final @NonNull QName qname) {
         return get(DataTreeNamespace.class, requireNonNull(qname));
@@ -60,7 +58,7 @@ public interface DataTreeAwareEffectiveStatement<A, D extends DeclaredStatement<
      * @param type Effective substatement class
      * @param qname Child identifier
      * @return Data tree child, or empty
-     * @throws NullPointerException if any argument is null
+     * @throws NullPointerException if any argument is {@code null}
      */
     default <E> @NonNull Optional<E> findDataTreeNode(final Class<E> type, final @NonNull QName qname) {
         return filterOptional(type, findDataTreeNode(qname));

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java
index c10e649556bbeac00e7ed610c732dc36fb91b02b..711efab749f468c2fa805872f91c2b325690f0c0 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DataTreeEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
@@ -25,7 +24,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
  *
  * @param <D> Declared statement type
  */
-@Beta
 public interface DataTreeEffectiveStatement<D extends DeclaredStatement<QName>>
     extends SchemaTreeEffectiveStatement<D> {
 

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java
index 1de26422da231af851964c9874b9502ef74e94ce..1a25c54bfd656e2cf631f5474f502f799643350c 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DefaultEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code default} statement.
+ */
 public interface DefaultEffectiveStatement extends EffectiveStatement<String, DefaultStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java
index 1228e6a4b18c485b80843de8574ffe5e9931adbf..1e8e99b106adfa4b87c156893b42b03ce0afb7f4 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DescriptionEffectiveStatement.java
@@ -7,15 +7,16 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code description} statement.
+ */
 public interface DescriptionEffectiveStatement extends EffectiveStatement<String, DescriptionStatement> {
     @Override
-    default  StatementDefinition statementDefinition() {
+    default StatementDefinition statementDefinition() {
         return YangStmtMapping.DESCRIPTION;
     }
 }

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java
index 7c9796e92aa836289fe667f0975c42455d06014e..a61c525cc9656de9e6459b0ef7a9dfb6e39246ca 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviateEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.DeviateKind;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code deviate} statement.
+ */
 public interface DeviateEffectiveStatement extends EffectiveStatement<DeviateKind, DeviateStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java
index c043ac47daf564d05940afdc8d9d02e16830db57..b4de98a413b74ea594275a225adebbd0d26a81d6 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/DeviationEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
-@Beta
+/**
+ * Effective representation of a {@code deviation} statement.
+ */
 public interface DeviationEffectiveStatement extends EffectiveStatement<Absolute, DeviationStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java
index 841bd674d1d3a1b81db4db42b9eee290fc92e304..53248826fdbd1096bd18046373bed08f9889a1b1 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/EnumEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code enum} statement.
+ */
 public interface EnumEffectiveStatement extends EffectiveStatement<String, EnumStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java
index 0a1911318512146161e7f807bd908c5245426a1e..a58b716ee52dddfd9b8f04c8999a7a0930a35949 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorAppTagEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code error-app-tag} statement.
+ */
 public interface ErrorAppTagEffectiveStatement extends EffectiveStatement<String, ErrorAppTagStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java
index 8aabdab2595979738f72d812bd2629f60a9cb4d1..fc1ba267ff6c17d68798593971cf554f760d4132 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ErrorMessageEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code error-message} statement.
+ */
 public interface ErrorMessageEffectiveStatement extends EffectiveStatement<String, ErrorMessageStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java
index 346c332d491e88ec8784456b89038a523a94851d..857db00aa404d62df393e6d001b05d6b1c53450a 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ExtensionEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of an {@code extension} statement.
+ */
 public interface ExtensionEffectiveStatement extends NamespacedEffectiveStatement<ExtensionStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java
index 09115476a110fbc2385d96e0120ee713d8e365eb..95f3ab28d750ad0becfcd9dd5c2fadfe873a6ca6 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FeatureEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code feature} statement.
+ */
 public interface FeatureEffectiveStatement extends NamespacedEffectiveStatement<FeatureStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java
index c340bb046e02f621dc43bb5e97a57c63f0e1e8b2..ece02da348d264128d26a5bdca2915fd6c6bf1d6 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/FractionDigitsEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code fraction-digits} statement.
+ */
 public interface FractionDigitsEffectiveStatement extends EffectiveStatement<Integer, FractionDigitsStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java
index a2f58b3bc12225d7e3986bec4a4fe3f455216f58..7ae0d9fe0b4bf4cb11840f9ca670ee7c0f8d322f 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/GroupingEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code grouping} statement.
+ */
 public interface GroupingEffectiveStatement extends DataTreeAwareEffectiveStatement<QName, GroupingStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java
index 14868327f7ad9f22527f3f181a03d6ab38f401ad..e9b9e4b753ec98bfdddba66b486d23573950c334 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IdentityEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code identity} statement.
+ */
 public interface IdentityEffectiveStatement extends NamespacedEffectiveStatement<IdentityStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java
index 9560ae4aac95e15828d871a3df458b69d3c16bff..39e9f8e810791467dc79da8ceab420b15d76c59d 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code if-feature} statement.
+ */
 public interface IfFeatureEffectiveStatement extends EffectiveStatement<IfFeatureExpr, IfFeatureStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java
index 916b43e6a4443e6314b1c7e9e962b9d3cf1eeb41..c5db16987a860f25f4bbe8548c6f987c0d8eab2b 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ImportEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code import} statement.
+ */
 public interface ImportEffectiveStatement extends EffectiveStatement<Unqualified, ImportStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java
index bc20d1e90905c76ca8eff3abc9376e05b8a37fb4..bf29ead0b39f33df1754dd0cac9d8b4a9163e96e 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IncludeEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code include} statement.
+ */
 public interface IncludeEffectiveStatement extends EffectiveStatement<Unqualified, IncludeStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java
index 27b3eb8921d105061fcf8f8e0283176eb3681dd3..0f2cee943ae21a90c49604dca9818fb2457c35c5 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/InputEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code input} statement.
+ */
 public interface InputEffectiveStatement
         extends DataTreeEffectiveStatement<InputStatement>, DataTreeAwareEffectiveStatement<QName, InputStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java
index b39c878deca403fa8998ac0f40b67256a869c79a..1feb71b6d4a74b0a60b69387809cc832b1bf3a98 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/KeyEffectiveStatement.java
@@ -7,14 +7,15 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code key} statement.
+ */
 public interface KeyEffectiveStatement extends EffectiveStatement<Set<QName>, KeyStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java
index 6245b41154ac4f80713ba6e8f57e6e4ec4fa8d89..ea144fd35c3fe8ef692e99d6832f2255302c826d 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafEffectiveStatement.java
@@ -7,11 +7,12 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code leaf} statement.
+ */
 public interface LeafEffectiveStatement extends DataTreeEffectiveStatement<LeafStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java
index 4d67fe35fc7f4981570053522b2ac8499ecce0be..07cd72a6898747308980c6535c62c2dfa586d02c 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LeafListEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -17,7 +16,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
  * {@link EffectiveStatement} representation of a {@code leaf-list} statement as defined by
  * <a href="https://datatracker.ietf.org/doc/html/rfc7950#section-7.7">RFC7950</a>.
  */
-@Beta
 public interface LeafListEffectiveStatement extends DataTreeEffectiveStatement<LeafListStatement>,
         OrderedByAwareEffectiveStatement<QName, LeafListStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
index ad81de8b8867cc0a6c4dd01ed97fb72ca125e9ad..857fbaa64dfa4dde03dea1f87affc7c8dcd35575 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/LengthEffectiveStatement.java
@@ -7,17 +7,18 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.List;
 import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code length} statement.
+ */
 public interface LengthEffectiveStatement extends EffectiveStatement<List<ValueRange>, LengthStatement>,
-        // FIXME: 7.0.0: reconsider this interface extension
-        // FIXME: 7.0.0: if we are keeping it, consider a default implementation (shared with others effective
+        // FIXME: 11.0.0: reconsider this interface extension
+        // FIXME: 11.0.0: if we are keeping it, consider a default implementation (shared with others effective
         //               statements)
         ConstraintMetaDefinition {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java
index 157a44888e7503b0d8876e08cbe27f06c86f1b87..deca1eb1f897d670b9889e6ad2a141d6e1d3e467 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ListEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -17,7 +16,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
  * {@link EffectiveStatement} representation of a {@code list} statement as defined by
  * <a href="https://datatracker.ietf.org/doc/html/rfc7950#section-7.8">RFC7950</a>.
  */
-@Beta
 public interface ListEffectiveStatement extends DataTreeEffectiveStatement<ListStatement>,
         DataTreeAwareEffectiveStatement<QName, ListStatement>, OrderedByAwareEffectiveStatement<QName, ListStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java
index fe7770a178cb5270fb61b7e6ec1335940ba742cb..b700e5308cb5c76431f27becef6f341ac35e56c5 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MandatoryEffectiveStatement.java
@@ -11,6 +11,9 @@ import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
+/**
+ * Effective representation of a {@code mandatory} statement.
+ */
 public interface MandatoryEffectiveStatement extends EffectiveStatement<Boolean, MandatoryStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java
index 6dfd961be0252f62f12bde873c20c705acf7a253..03da619e22d1b16c486733c3db5ecbe1c201b0f7 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MaxElementsEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code max-elements} statement.
+ */
 public interface MaxElementsEffectiveStatement extends EffectiveStatement<String, MaxElementsStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java
index 6da990db03a7bf0ae3101eb1c15706f0ec63aa95..01f47d8ab7240cc4263a790b074bfe48d2de4484 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MinElementsEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code min-elements} statement.
+ */
 public interface MinElementsEffectiveStatement extends EffectiveStatement<Integer, MinElementsStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java
index 5895abddeb2c8741cca8713361dc2a294a152668..5ac99e9f9d1b79c628b219a68b92bf204acaa831 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModifierEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
 
-@Beta
+/**
+ * Effective representation of a {@code modifier} statement.
+ */
 public interface ModifierEffectiveStatement extends EffectiveStatement<ModifierKind, ModifierStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java
index d8f59039e72be280d7affaa082501ad0d06ea275..18cccb5e323f5bc1759a406027ff50f1188a3a0b 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ModuleEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -17,9 +16,8 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
 /**
- * Effective view of a {@link ModuleStatement}.
+ * Effective view of a {@code module} statement.
  */
-@Beta
 public interface ModuleEffectiveStatement
         extends DataTreeAwareEffectiveStatement<Unqualified, ModuleStatement>, SchemaTreeRoot {
     /**

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java
index 3addb828ef5afab797ec215069fe567a32e67dd9..f76dd1f4dea517e2749cc955f02b70c1c45d7b9f 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/MustEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
-@Beta
+/**
+ * Effective representation of a {@code must} statement.
+ */
 public interface MustEffectiveStatement extends EffectiveStatement<QualifiedBound, MustStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java
index 080856d0d3aabc67376db169ae1ac35b77cf982b..62a6f662ad156c95c7fde43db3a202e71d9cbfa2 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespaceEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code namespace} statement.
+ */
 public interface NamespaceEffectiveStatement extends EffectiveStatement<XMLNamespace, NamespaceStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java
index c3df735c0fafc6fed49fb65cfeefdb1cdf582cca..f805e554aa1491ee1d90d3e437e897c23e0af9f4 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NamespacedEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
@@ -17,13 +16,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
  * Common super-interface for all statements which can be held in one of the {@link EffectiveStatementNamespace}s.
  *
  * @param <D> Declared statement type
- *
- * @author Robert Varga
  */
-@Beta
 public interface NamespacedEffectiveStatement<D extends DeclaredStatement<QName>>
-    extends EffectiveStatement<QName, D>, Identifiable<QName> {
-
+        extends EffectiveStatement<QName, D>, Identifiable<QName> {
     @Override
     default QName getIdentifier() {
         return argument();

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java
index 4b967f67db327a80e6d39b0768ee070fe2a0dd52..bcff0c1954f562145187e29ba8eca668322d5826 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/NotificationEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code notification} statement.
+ */
 public interface NotificationEffectiveStatement extends SchemaTreeEffectiveStatement<NotificationStatement>,
     DataTreeAwareEffectiveStatement<QName, NotificationStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByAwareEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByAwareEffectiveStatement.java
index 2784004a4633f592469af4b9f705739b2acb89a4..faab947c8fe6a9d3ad3dfb7574f70f7206e03b14 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByAwareEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByAwareEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.common.Ordering;
@@ -22,7 +21,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
  * @param <A> Argument type ({@link Empty} if statement does not have argument.)
  * @param <D> Class representing declared version of this statement.
  */
-@Beta
 public interface OrderedByAwareEffectiveStatement<A, D extends DeclaredStatement<A>> extends EffectiveStatement<A, D> {
     /**
      * Return the effective {@link Ordering} of this statement.

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java
index b4ccd2eac544cc3abea6b83dae37524c2948b7f5..11b92362c19bbaa4534ea68d322700e41f9f1157 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrderedByEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.Ordering;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code ordered-by} statement.
+ */
 public interface OrderedByEffectiveStatement extends EffectiveStatement<Ordering, OrderedByStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java
index a5c892967222eec3233a9e9119ccbe9cb5b40d8c..689cad590c11d49c1becb22a8531da9233c37391 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OrganizationEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code organization} statement.
+ */
 public interface OrganizationEffectiveStatement extends EffectiveStatement<String, OrganizationStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java
index b9826b8e6f0b1f69699d1497d07b6fe322a9dad6..9d1dd0b692f5fa4adda706fcea2307a196068208 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/OutputEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code output} statement.
+ */
 public interface OutputEffectiveStatement
         extends DataTreeEffectiveStatement<OutputStatement>, DataTreeAwareEffectiveStatement<QName, OutputStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java
index 269ee561722bd362d95bb4f9061d9169bf1fadcc..b6d06d210b6b62da21347bef28e0dcfdda7f1958 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PathEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.PathExpression;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code path} statement.
+ */
 public interface PathEffectiveStatement extends EffectiveStatement<PathExpression, PathStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java
index 32e3cce4b31deacd628928d6c6c5f0449a8aa47b..9aaaf41b492259eabd085c6ca6c76359bf345f82 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PatternEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -15,7 +14,9 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.ModifierKind;
 import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 
-@Beta
+/**
+ * Effective representation of a {@code pattern} statement.
+ */
 public interface PatternEffectiveStatement
         extends EffectiveStatement<PatternExpression, PatternStatement>, PatternConstraint {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java
index ded312ad9d78790c472b887d8a37e1bc0c7c8f99..d9d60d47a14e528f55dd2b56e4566a18467b363d 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PositionEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code position} statement.
+ */
 public interface PositionEffectiveStatement extends EffectiveStatement<Uint32, PositionStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java
index b67acf76684912b84c9dec85124734117ed23a0d..a562d30232bd21707186cdda8da636907a0cd38e 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PrefixEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code prefix} statement.
+ */
 public interface PrefixEffectiveStatement extends EffectiveStatement<String, PrefixStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java
index 101a445f25d11c576d046d73521c9d8bbd9ab235..4ba5f772fb5576696edc3b4daf3ea924d87ac621 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/PresenceEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code presence} statement.
+ */
 public interface PresenceEffectiveStatement extends EffectiveStatement<String, PresenceStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
index bba2793be4af664b60f23215d3d2481812895207..1a20a89cb529d0a049566af7f2d8fc99d7816214 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RangeEffectiveStatement.java
@@ -7,18 +7,19 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.List;
 import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code range} statement.
+ */
 public interface RangeEffectiveStatement extends EffectiveStatement<List<ValueRange>, RangeStatement>,
-        // FIXME: 7.0.0: reconsider this interface extension
-        // FIXME: 7.0.0: if we are keeping it, consider a default implementation (shared with others effective
-        //               statements)
+        // FIXME: 11.0.0: reconsider this interface extension
+        // FIXME: 11.0.0: if we are keeping it, consider a default implementation (shared with others effective
+        //                statements)
         ConstraintMetaDefinition {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java
index 87c4346ed3a9c935185d563b47f560cd1e04307d..b5652682d821753e4f96df613391035e92c7caf9 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ReferenceEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code reference} statement.
+ */
 public interface ReferenceEffectiveStatement extends EffectiveStatement<String, ReferenceStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java
index 14a8da0fcf488c0b1896c160003eb676b03ac7c1..46868639380482c4a63b431911bf25d7d0ca93b7 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RefineEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant;
 
-@Beta
+/**
+ * Effective representation of a {@code refine} statement.
+ */
 public interface RefineEffectiveStatement extends EffectiveStatement<Descendant, RefineStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java
index fb79167ca5b1a168494a5bef32feecc0ea2189fa..7eeb20521ccd966774692493a3ef7e653ed5520f 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RequireInstanceEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code require-instance} statement.
+ */
 public interface RequireInstanceEffectiveStatement extends EffectiveStatement<Boolean, RequireInstanceStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java
index c17c16d60783c2da1bcd9705703d47461285419e..f36ac45f6951eda7bf2706009a8598f07955104a 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionDateEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code revision-date} statement.
+ */
 public interface RevisionDateEffectiveStatement extends EffectiveStatement<Revision, RevisionDateStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java
index 9115379346dfde5c174013678417a71e1c075055..ef6c89b05ee5b5c1bdfe00ce971e5fbfea2c4102 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RevisionEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code revision} statement.
+ */
 public interface RevisionEffectiveStatement extends EffectiveStatement<Revision, RevisionStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java
index a45bc5cd05a9761847232d60d2f96721899717e1..f92969e3822c39e117839c40585017588e343f1f 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/RpcEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code rpc} statement.
+ */
 public interface RpcEffectiveStatement
         extends SchemaTreeEffectiveStatement<RpcStatement>, DataTreeAwareEffectiveStatement<QName, RpcStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
index 1dbdf05cd34c9e1e72973edad1872072dced5ce5..bffb423488e0db83699851278031a7b18f00f339 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeAwareEffectiveStatement.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.model.api.stmt;
 import static java.util.Objects.requireNonNull;
 import static org.opendaylight.yangtools.yang.model.api.stmt.DefaultMethodHelpers.filterOptional;
 
-import com.google.common.annotations.Beta;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -31,7 +30,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Desce
  * @param <A> Argument type
  * @param <D> Class representing declared version of this statement.
  */
-@Beta
 public interface SchemaTreeAwareEffectiveStatement<A, D extends DeclaredStatement<A>> extends EffectiveStatement<A, D> {
     /**
      * Namespace of {@code schema node}s defined within this node.
@@ -105,13 +103,13 @@ public interface SchemaTreeAwareEffectiveStatement<A, D extends DeclaredStatemen
         final Iterator<QName> it = qnames.iterator();
         SchemaTreeAwareEffectiveStatement<?, ?> parent = this;
         while (true) {
-            final Optional<SchemaTreeEffectiveStatement<?>> found = parent.findSchemaTreeNode(it.next());
+            final var found = parent.findSchemaTreeNode(it.next());
             if (!it.hasNext() || found.isEmpty()) {
                 return found;
             }
             final SchemaTreeEffectiveStatement<?> node = found.orElseThrow();
-            if (node instanceof SchemaTreeAwareEffectiveStatement) {
-                parent = (SchemaTreeAwareEffectiveStatement<?, ?>) node;
+            if (node instanceof SchemaTreeAwareEffectiveStatement<?, ?> aware) {
+                parent = aware;
             } else {
                 return Optional.empty();
             }

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java
index fb3a28c93ebc58ca8a9168b5e079591a3d540b04..138a76975ff4a8e8d8f1374c977dcbdebdc6346c 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaTreeEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
@@ -26,7 +25,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
  *
  * @param <D> Declared statement type
  */
-@Beta
 public interface SchemaTreeEffectiveStatement<D extends DeclaredStatement<QName>>
     extends NamespacedEffectiveStatement<D> {
 

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java
index c5ce5f1d6918f0aba9129049a7b70d66794ab69e..6d86e9607ba685e17dbf5e6c52c50c05873ce71e 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/StatusEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code status} statement.
+ */
 public interface StatusEffectiveStatement extends EffectiveStatement<Status, StatusStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java
index 67410d92d02bf7c247b5e3914f07cf0be096aa9c..896285acbdf19f606189a4d4f6b3213519225908 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SubmoduleEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@@ -17,7 +16,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
  * {@link ModuleEffectiveStatement.PrefixToEffectiveModuleNamespace} and
  * {@link ModuleEffectiveStatement.QNameModuleToPrefixNamespace} namespaces.
  */
-@Beta
 public interface SubmoduleEffectiveStatement
         extends DataTreeAwareEffectiveStatement<Unqualified, SubmoduleStatement> {
     @Override

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java
index 9cb7fb23b40fff2bac11d9691225b069f29dc6ea..e17291121b4e7f8bb8433e112cbe39b75f7101ca 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UniqueEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -15,14 +14,13 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Descendant;
 
 /**
- * Interface describing YANG 'unique' constraint.
+ * Interface describing YANG {@code unique} statement.
  *
  * <p>
  * The 'unique' constraint specifies that the combined values of all the leaf instances specified in the argument
  * string, including leafs with default values, MUST be unique within all list entry instances in which all referenced
  * leafs exist (for more information see RFC-6020 section 7.8.3.).
  */
-@Beta
 public interface UniqueEffectiveStatement extends EffectiveStatement<Set<Descendant>, UniqueStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java
index 2d088ffa939c0e42899c8f43e663a6d151e616ad..bc68fc39fddd2523a2680dbbeacb98ce0c93a7db 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnitsEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code units} statement.
+ */
 public interface UnitsEffectiveStatement extends EffectiveStatement<String, UnitsStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java
index 7325f42f50dbe1f45bad1550a631811b1af96f7f..88ec5c09292d256ab4a2580699964090eb9d99be 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnknownEffectiveStatement.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
@@ -19,7 +18,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
  * @param <A> Argument type ({@link Empty} if statement does not have argument.)
  * @param <D> Class representing declared version of this statement.
  */
-@Beta
 // FIXME: remove this interface once UnknownSchemaNode is gone
 public interface UnknownEffectiveStatement<A, D extends UnknownStatement<A>> extends EffectiveStatement<A, D> {
 

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java
index d0a495015674744ec7c14a18b2e1a5019b20e45b..3e6c531894657f64ae57c79928b2d245742f21a8 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UsesEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code uses} statement.
+ */
 public interface UsesEffectiveStatement extends EffectiveStatement<QName, UsesStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java
index 00640f29dc2a36814d93f3b63bf951392b25cdfa..e627eb98d758a2e79fd8e8694df8a6a5de655eea 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/ValueEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code value} statement.
+ */
 public interface ValueEffectiveStatement extends EffectiveStatement<Integer, ValueStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java
index 58b394e31c3596a747ea0650f4d4e729bbe05db6..9827d0a8eceb1ec95b0aa6b5f3990b45fafa0dbb 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/WhenEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound;
 
-@Beta
+/**
+ * Effective representation of a {@code when} statement.
+ */
 public interface WhenEffectiveStatement extends EffectiveStatement<QualifiedBound, WhenStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java
index 428a93b6ce475c540e4ceb4b73e07208ea22309f..ea534ab3c6d815643188ac36c76b625a1769d6f1 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YangVersionEffectiveStatement.java
@@ -7,13 +7,14 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code yang-version} statement.
+ */
 public interface YangVersionEffectiveStatement extends EffectiveStatement<YangVersion, YangVersionStatement> {
     @Override
     default StatementDefinition statementDefinition() {

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java
index c91c92d58cb393dee55010b3801493884a1e1930..c455b578a7ff186f0f9b51c4e4567d53d6dd5f88 100644 (file)
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/YinElementEffectiveStatement.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.model.api.stmt;
 
-import com.google.common.annotations.Beta;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
 
-@Beta
+/**
+ * Effective representation of a {@code yin-element} statement.
+ */
 public interface YinElementEffectiveStatement extends EffectiveStatement<Boolean, YinElementStatement> {
     @Override
     default  StatementDefinition statementDefinition() {

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
index d550a366d9403c8992a6a7b024f10a3b6f815d8d..0c60ae89c0178f35547fdd26b836cc4aa4b2dd64 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/BitsSpecificationSupport.java
@@ -64,7 +64,7 @@ final class BitsSpecificationSupport extends AbstractTypeSupport<BitsSpecificati
             if (subStmt instanceof BitEffectiveStatement) {
                 final BitEffectiveStatement bitSubStmt = (BitEffectiveStatement) subStmt;
 
-                final Optional<Uint32> declaredPosition = bitSubStmt.getDeclaredPosition();
+                final Optional<Uint32> declaredPosition = bitSubStmt.findDeclaredPosition();
                 final Uint32 effectivePos;
                 if (declaredPosition.isEmpty()) {
                     if (highestPosition != null) {

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java
index a3e5c0d62241cebaa476a2a0c75c1771d91b7841..8b458671f51ef9d15ecbcaf3b9e1bf71e32ddbb1 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/type/TypeStatementRFC7950Support.java
@@ -52,7 +52,7 @@ public final class TypeStatementRFC7950Support extends AbstractTypeStatementSupp
     @Override
     Bit addRestrictedBit(final EffectiveStmtCtx stmt, final BitsTypeDefinition base, final BitEffectiveStatement bit) {
         // FIXME: this looks like a duplicate of BitsSpecificationEffectiveStatement
-        final Optional<Uint32> declaredPosition = bit.getDeclaredPosition();
+        final Optional<Uint32> declaredPosition = bit.findDeclaredPosition();
         final Uint32 effectivePos;
         if (declaredPosition.isEmpty()) {
             effectivePos = getBaseTypeBitPosition(bit.argument(), base, stmt);