Clean up ietf-netconf-monitoring-extension

[netconf.git] / restconf / restconf-common / src / main / java / org / opendaylight / restconf / common / util / OperationsResourceUtils.java

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java
index 4f706d0a605a75bbd1508c6c99f599a8a5f44f48..ada0442bc0710855c67a438ed8c72411935895f8 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java
@@ -10,37 +10,39 @@ package org.opendaylight.restconf.common.util;
 import com.google.common.collect.ImmutableSet;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
-import org.opendaylight.restconf.common.context.NormalizedNodeContext;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.util.SimpleSchemaContext;
+import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
 
 
+// FIXME: remove this class
 public final class OperationsResourceUtils {
     private OperationsResourceUtils() {
         // Hidden on purpose
     }
 
-    public static @NonNull NormalizedNodeContext contextForModelContext(final @NonNull SchemaContext context,
-            final @Nullable DOMMountPoint mountPoint) {
+    public static @NonNull Entry<InstanceIdentifierContext, ContainerNode>
+                contextForModelContext(final @NonNull SchemaContext context, final @Nullable DOMMountPoint mountPoint) {
         // Determine which modules we need and construct leaf schemas to correspond to all RPC definitions
         final Collection<Module> modules = new ArrayList<>();
         final ArrayList<OperationsLeafSchemaNode> rpcLeafSchemas = new ArrayList<>();
         for (final Module m : context.getModules()) {
             final Collection<? extends RpcDefinition> rpcs = m.getRpcs();
             if (!rpcs.isEmpty()) {
-                modules.add(m);
+                modules.add(new OperationsImportedModule(m));
                 rpcLeafSchemas.ensureCapacity(rpcLeafSchemas.size() + rpcs.size());
                 for (RpcDefinition rpc : rpcs) {
                     rpcLeafSchemas.add(new OperationsLeafSchemaNode(rpc));
@@ -53,13 +55,16 @@ public final class OperationsResourceUtils {
         modules.add(new OperationsRestconfModule(operatationsSchema));
 
         // Now build the operations container and combine it with the context
-        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> operationsBuilder =
-                Builders.containerBuilder(operatationsSchema);
+        final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> operationsBuilder = Builders.containerBuilder()
+                .withNodeIdentifier(new NodeIdentifier(OperationsContainerSchemaNode.QNAME));
         for (final OperationsLeafSchemaNode leaf : rpcLeafSchemas) {
-            operationsBuilder.withChild(ImmutableNodes.leafNode(leaf.getQName(), Empty.getInstance()));
+            operationsBuilder.withChild(ImmutableNodes.leafNode(leaf.getQName(), Empty.value()));
         }
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, operatationsSchema, mountPoint,
-                SimpleSchemaContext.forModules(ImmutableSet.copyOf(modules))), operationsBuilder.build());
+        final var opContext = new OperationsEffectiveModuleContext(ImmutableSet.copyOf(modules));
+        final var stack = SchemaInferenceStack.of(opContext);
+        stack.enterSchemaTree(operatationsSchema.getQName());
+
+        return Map.entry(InstanceIdentifierContext.ofStack(stack, mountPoint), operationsBuilder.build());
     }
 }