From 751b981438903be046183ecfcfc87b9fe6d91914 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 19 Mar 2024 16:28:45 -0400 Subject: Migrate bierman API to Argon Update Biermann API code to work correctly with OpenDaylight Argon release Issue-ID: CCSDK-4001 Change-Id: Ia9b45b05744908b806a22793e7870c613942dfb4 Signed-off-by: Dan Timoney --- .../common/util/AbstractOperationsModule.java | 19 ----- .../common/util/OperationsImportedModule.java | 89 ++++++++++++++++++++++ .../common/util/OperationsRestconfModule.java | 88 +++++++++++++++++++++ 3 files changed, 177 insertions(+), 19 deletions(-) (limited to 'netconf/restconf/restconf-common/src') diff --git a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/AbstractOperationsModule.java b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/AbstractOperationsModule.java index 68b7fe5..615badb 100644 --- a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/AbstractOperationsModule.java +++ b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/AbstractOperationsModule.java @@ -9,13 +9,10 @@ package org.opendaylight.restconf.common.util; import java.util.Collection; import java.util.Collections; -import java.util.Map; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.common.UnresolvedQName; -import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.Deviation; @@ -31,7 +28,6 @@ import org.opendaylight.yangtools.yang.model.api.Submodule; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; -import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; @@ -53,21 +49,6 @@ abstract class AbstractOperationsModule implements Module, ModuleEffectiveStatem return StatementOrigin.CONTEXT; } - @Override - public final > Optional get(final Class namespace, - final K identifier) { - return Optional.empty(); - } - - @Override - public final > Map getAll(final Class namespace) { - return Map.of(); - } - - @Override - public final Unqualified argument() { - return UnresolvedQName.unqualified(getName()); - } @Override public final QNameModule localQNameModule() { diff --git a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsImportedModule.java b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsImportedModule.java index 5551326..6f4c3c2 100644 --- a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsImportedModule.java +++ b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsImportedModule.java @@ -11,11 +11,22 @@ import static java.util.Objects.requireNonNull; import java.util.Collection; import java.util.List; +import java.util.Map.Entry; +import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.FeatureEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleEffectiveStatement; final class OperationsImportedModule extends AbstractOperationsModule { private final Module original; @@ -53,4 +64,82 @@ final class OperationsImportedModule extends AbstractOperationsModule { public List> effectiveSubstatements() { return List.of(); } + + @Override + public @NonNull Optional findExtension(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findExtension'"); + } + + @Override + public @NonNull Optional findFeature(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findFeature'"); + } + + @Override + public @NonNull Optional findIdentity(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findIdentity'"); + } + + @Override + public @NonNull Optional findSubmodule(@NonNull Unqualified arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findSubmodule'"); + } + + @Override + public @NonNull Collection> dataTreeNodes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'dataTreeNodes'"); + } + + @Override + public @NonNull Optional> findDataTreeNode(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findDataTreeNode'"); + } + + @Override + public @NonNull Optional> findSchemaTreeNode(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findSchemaTreeNode'"); + } + + @Override + public @NonNull Collection> schemaTreeNodes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'schemaTreeNodes'"); + } + + @Override + public @NonNull Unqualified argument() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'argument'"); + } + + @Override + public @NonNull Optional findNamespacePrefix(@NonNull QNameModule arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findNamespacePrefix'"); + } + + @Override + public @NonNull Optional findReachableModule(@NonNull String arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findReachableModule'"); + } + + @Override + public Collection> namespacePrefixes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'namespacePrefixes'"); + } + + @Override + public @NonNull Collection> reachableModules() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'reachableModules'"); + } } diff --git a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java index 467db9b..9145598 100644 --- a/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java +++ b/netconf/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsRestconfModule.java @@ -11,12 +11,22 @@ import static java.util.Objects.requireNonNull; import java.util.Collection; import java.util.List; +import java.util.Map.Entry; +import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; +import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.DataTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.ExtensionEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.FeatureEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.IdentityEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleEffectiveStatement; final class OperationsRestconfModule extends AbstractOperationsModule { // There is no need to intern this nor add a revision, as we are providing the corresponding context anyway @@ -59,4 +69,82 @@ final class OperationsRestconfModule extends AbstractOperationsModule { // This is not accurate, but works for now return List.of(); } + + @Override + public @NonNull Optional findExtension(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findExtension'"); + } + + @Override + public @NonNull Optional findFeature(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findFeature'"); + } + + @Override + public @NonNull Optional findIdentity(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findIdentity'"); + } + + @Override + public @NonNull Optional findSubmodule(@NonNull Unqualified arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findSubmodule'"); + } + + @Override + public @NonNull Collection> dataTreeNodes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'dataTreeNodes'"); + } + + @Override + public @NonNull Optional> findDataTreeNode(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findDataTreeNode'"); + } + + @Override + public @NonNull Optional> findSchemaTreeNode(@NonNull QName arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findSchemaTreeNode'"); + } + + @Override + public @NonNull Collection> schemaTreeNodes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'schemaTreeNodes'"); + } + + @Override + public @NonNull Unqualified argument() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'argument'"); + } + + @Override + public @NonNull Optional findNamespacePrefix(@NonNull QNameModule arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findNamespacePrefix'"); + } + + @Override + public @NonNull Optional findReachableModule(@NonNull String arg0) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'findReachableModule'"); + } + + @Override + public Collection> namespacePrefixes() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'namespacePrefixes'"); + } + + @Override + public @NonNull Collection> reachableModules() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'reachableModules'"); + } } -- cgit 1.2.3-korg