Bump MRI upstreams

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / MdsalOperationProvider.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
index 49eb3558f110c5ba23bd4dbf31e0dc426820ec02..78ad231ec224f8f9edbbe6d8d73153b580a7ffc5 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.netconf.test.tool;
 
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collections;
@@ -22,7 +20,6 @@ import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
 import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory;
@@ -57,11 +54,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider;
 import org.slf4j.Logger;
@@ -73,12 +70,12 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
             .getLogger(MdsalOperationProvider.class);
 
     private final Set<Capability> caps;
-    private final SchemaContext schemaContext;
+    private final EffectiveModelContext schemaContext;
     private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
 
     MdsalOperationProvider(final SessionIdProvider idProvider,
                            final Set<Capability> caps,
-                           final SchemaContext schemaContext,
+                           final EffectiveModelContext schemaContext,
                            final SchemaSourceProvider<YangTextSchemaSource> sourceProvider) {
         this.caps = caps;
         this.schemaContext = schemaContext;
@@ -106,14 +103,14 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
 
     static class MdsalOperationService implements NetconfOperationService {
         private final long currentSessionId;
-        private final SchemaContext schemaContext;
+        private final EffectiveModelContext schemaContext;
         private final Set<Capability> caps;
         private final DOMSchemaService schemaService;
         private final DOMDataBroker dataBroker;
         private final SchemaSourceProvider<YangTextSchemaSource> sourceProvider;
 
         MdsalOperationService(final long currentSessionId,
-                              final SchemaContext schemaContext,
+                              final EffectiveModelContext schemaContext,
                               final Set<Capability> caps,
                               final SchemaSourceProvider<YangTextSchemaSource> sourceProvider) {
             this.currentSessionId = currentSessionId;
@@ -176,13 +173,13 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
             final QName location = QName.create(Schema.QNAME, "location");
             final QName namespace = QName.create(Schema.QNAME, "namespace");
 
-            CollectionNodeBuilder<MapEntryNode, MapNode> schemaMapEntryNodeMapNodeCollectionNodeBuilder = Builders
-                    .mapBuilder().withNodeIdentifier(new NodeIdentifier(Schema.QNAME));
+            CollectionNodeBuilder<MapEntryNode, SystemMapNode> schemaMapEntryNodeMapNodeCollectionNodeBuilder =
+                Builders.mapBuilder().withNodeIdentifier(new NodeIdentifier(Schema.QNAME));
             LeafSetEntryNode locationLeafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier(
                             new NodeWithValue<>(location, "NETCONF")).withValue("NETCONF").build();
 
             Map<QName, Object> keyValues = new HashMap<>();
-            for (final Schema schema : monitor.getSchemas().getSchema()) {
+            for (final Schema schema : monitor.getSchemas().nonnullSchema().values()) {
                 keyValues.put(identifier, schema.getIdentifier());
                 keyValues.put(version, schema.getVersion());
                 keyValues.put(format, Yang.QNAME);
@@ -197,7 +194,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
                             .withValue(Yang.QNAME).build())
                         .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(namespace))
                             .withValue(schema.getNamespace().getValue()).build())
-                        .withChild((DataContainerChild<?, ?>) Builders.leafSetBuilder().withNodeIdentifier(
+                        .withChild((DataContainerChild) Builders.leafSetBuilder().withNodeIdentifier(
                                         new NodeIdentifier(location))
                                 .withChild(locationLeafSetEntryNode).build())
                         .build();
@@ -205,7 +202,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
                 schemaMapEntryNodeMapNodeCollectionNodeBuilder.withChild(schemaMapEntryNode);
             }
 
-            DataContainerChild<?, ?> schemaList = schemaMapEntryNodeMapNodeCollectionNodeBuilder.build();
+            DataContainerChild schemaList = schemaMapEntryNodeMapNodeCollectionNodeBuilder.build();
 
             ContainerNode schemasContainer = Builders.containerBuilder().withNodeIdentifier(
                     new NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build();
@@ -230,34 +227,22 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory {
 
         private DOMSchemaService createSchemaService() {
             return new DOMSchemaService() {
-
-                @Override
-                public SchemaContext getSessionContext() {
-                    return schemaContext;
-                }
-
                 @Override
-                public SchemaContext getGlobalContext() {
+                public EffectiveModelContext getGlobalContext() {
                     return schemaContext;
                 }
 
                 @Override
-                public ListenerRegistration<SchemaContextListener> registerSchemaContextListener(
-                        final SchemaContextListener listener) {
-                    listener.onGlobalContextUpdated(getGlobalContext());
-                    return new AbstractListenerRegistration<SchemaContextListener>(listener) {
-
+                public ListenerRegistration<EffectiveModelContextListener> registerSchemaContextListener(
+                        final EffectiveModelContextListener listener) {
+                    listener.onModelContextUpdated(getGlobalContext());
+                    return new AbstractListenerRegistration<>(listener) {
                         @Override
                         protected void removeRegistration() {
                             // No-op
                         }
                     };
                 }
-
-                @Override
-                public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
-                    return ImmutableClassToInstanceMap.of();
-                }
             };
         }
     }