From e6baef6d6763a3d80e99daf2e85c2675eb481496 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 30 May 2023 22:40:52 +0200 Subject: [PATCH] Promote rfc6536-model-api The interfaces here are stable, not @Beta. Change-Id: I877dc8bfe328989034512522eb77217ae7e31499 Signed-off-by: Robert Varga --- .../model/api/DefaultDenyAllEffectiveStatement.java | 2 -- .../rfc6536/model/api/DefaultDenyAllSchemaNode.java | 2 -- .../rfc6536/model/api/DefaultDenyAllStatement.java | 2 -- .../model/api/DefaultDenyWriteEffectiveStatement.java | 2 -- .../rfc6536/model/api/DefaultDenyWriteSchemaNode.java | 8 ++++---- .../rfc6536/model/api/DefaultDenyWriteStatement.java | 2 -- .../yangtools/rfc6536/model/api/NACMConstants.java | 2 -- .../yangtools/rfc6536/model/api/NACMStatements.java | 2 -- .../yangtools/rfc6536/model/api/package-info.java | 2 -- 9 files changed, 4 insertions(+), 20 deletions(-) diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java index ef494ec388..37b5928675 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllEffectiveStatement.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownEffectiveStatement; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnknownEffectiveStatement; * Effective statement representation of 'default-deny-all' extension defined in * RFC6536. */ -@Beta public interface DefaultDenyAllEffectiveStatement extends UnknownEffectiveStatement { @Override default StatementDefinition statementDefinition() { diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java index 3ec709fd55..6ac84a6925 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllSchemaNode.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import java.util.Optional; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; * Represents the effect of 'default-deny-all' extension, as defined in * RFC6536, being attached to a SchemaNode. */ -@Beta public interface DefaultDenyAllSchemaNode extends UnknownSchemaNode { /** * Attempt to find a {@link DefaultDenyAllSchemaNode} in a parent {@link DataSchemaNode}. diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java index 346c6249d5..65743b54bf 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyAllStatement.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; * Declared statement representation of 'default-deny-all' extension defined in * RFC6536. */ -@Beta public interface DefaultDenyAllStatement extends UnknownStatement { @Override default StatementDefinition statementDefinition() { diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java index 1f1f91aef2..6639f7a495 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteEffectiveStatement.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownEffectiveStatement; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnknownEffectiveStatement; * Effective statement representation of 'default-deny-write' extension defined in * RFC6536. */ -@Beta public interface DefaultDenyWriteEffectiveStatement extends UnknownEffectiveStatement { @Override diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java index a2cd1831a1..7b8522dc15 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteSchemaNode.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import java.util.Optional; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; * Represents the effect of 'default-deny-write' extension, as defined in * RFC6536, being attached to a SchemaNode. */ -@Beta public interface DefaultDenyWriteSchemaNode extends UnknownSchemaNode { /** * Attempt to find a {@link DefaultDenyWriteSchemaNode} in a parent {@link DataSchemaNode}. @@ -25,8 +23,10 @@ public interface DefaultDenyWriteSchemaNode extends UnknownSchemaNode { * @return {@link DefaultDenyWriteSchemaNode} child, if present. */ static Optional findIn(final DataSchemaNode parent) { - return parent.getUnknownSchemaNodes().stream().filter(DefaultDenyWriteSchemaNode.class::isInstance).findAny() - .map(DefaultDenyWriteSchemaNode.class::cast); + return parent.getUnknownSchemaNodes().stream() + .filter(DefaultDenyWriteSchemaNode.class::isInstance) + .findAny() + .map(DefaultDenyWriteSchemaNode.class::cast); } @Override diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java index d81320072e..4bb632b159 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/DefaultDenyWriteStatement.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.rfc6536.model.api; -import com.google.common.annotations.Beta; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; @@ -16,7 +15,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement; * Declared statement representation of 'default-deny-write' extension defined in * RFC6536. */ -@Beta public interface DefaultDenyWriteStatement extends UnknownStatement { @Override default StatementDefinition statementDefinition() { diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java index 6f30fd480b..79e8f31298 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMConstants.java @@ -18,8 +18,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; /** * Constants associated with RFC6536. - * - * @author Robert Varga */ @NonNullByDefault public final class NACMConstants { diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java index 6f34f33605..de524e94cb 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/NACMStatements.java @@ -19,8 +19,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; /** * {@link StatementDefinition}s for statements defined by RFC6536. - * - * @author Robert Varga */ @NonNullByDefault public enum NACMStatements implements StatementDefinition { diff --git a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java index d961016784..67ad063c29 100644 --- a/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java +++ b/model/rfc6536-model-api/src/main/java/org/opendaylight/yangtools/rfc6536/model/api/package-info.java @@ -7,7 +7,5 @@ */ /** * YANG metamodel extensions to support NACM, as defined in RFC6536. - * - * @author Robert Varga */ package org.opendaylight.yangtools.rfc6536.model.api; -- 2.36.6