Use SchemaPath->Absolute bridge methods
[netconf.git] / netconf / messagebus-netconf / src / main / java / org / opendaylight / netconf / messagebus / eventsources / netconf / NetconfEventSourceMount.java
index cad403e5ad70e68d30b5eff7c030b98d9a9c128c..33f49ebb64534102a757ea76864687994fb2acfc 100644 (file)
@@ -7,22 +7,19 @@
  */
 package org.opendaylight.netconf.messagebus.eventsources.netconf;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import javassist.ClassPool;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator;
-import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
-import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
@@ -31,6 +28,7 @@ import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
 import org.opendaylight.mdsal.dom.api.DOMNotificationService;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInputBuilder;
@@ -44,46 +42,34 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 /**
  * Facade of mounted netconf device.
  */
 class NetconfEventSourceMount {
-
-    private static final BindingNormalizedNodeCodecRegistry CODEC_REGISTRY;
     private static final YangInstanceIdentifier STREAMS_PATH = YangInstanceIdentifier.builder().node(Netconf.QNAME)
             .node(Streams.QNAME).build();
-    private static final SchemaPath CREATE_SUBSCRIPTION = SchemaPath
-            .create(true, QName.create(CreateSubscriptionInput.QNAME, "create-subscription"));
-
-    static {
-        final ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();
-        moduleInfoBackedContext.addModuleInfos(Collections.singletonList(org.opendaylight.yang.gen.v1.urn.ietf.params
-                .xml.ns.netmod.notification.rev080714.$YangModuleInfoImpl.getInstance()));
-        SchemaContext notificationsSchemaCtx = moduleInfoBackedContext.tryToCreateSchemaContext().get();
+    private static final QName CREATE_SUBSCRIPTION = QName.create(CreateSubscriptionInput.QNAME, "create-subscription");
 
-        final JavassistUtils javassist = JavassistUtils.forClassPool(ClassPool.getDefault());
-        CODEC_REGISTRY = new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(javassist));
-        CODEC_REGISTRY.onBindingRuntimeContextUpdated(BindingRuntimeContext.create(moduleInfoBackedContext,
-                notificationsSchemaCtx));
-    }
-
-    private final DOMMountPoint mountPoint;
     private final DOMRpcService rpcService;
     private final DOMNotificationService notificationService;
     private final DOMDataBroker dataBroker;
     private final Node node;
     private final String nodeId;
+    private final BindingNormalizedNodeSerializer serializer;
+    private final DOMSchemaService schemaService;
 
-    NetconfEventSourceMount(final Node node, final DOMMountPoint mountPoint) {
-        this.mountPoint = mountPoint;
+    NetconfEventSourceMount(final BindingNormalizedNodeSerializer serializer, final Node node,
+            final DOMMountPoint mountPoint) {
+        this.serializer = requireNonNull(serializer);
         this.node = node;
         this.nodeId = node.getNodeId().getValue();
         this.rpcService = getService(mountPoint, DOMRpcService.class);
         this.notificationService = getService(mountPoint, DOMNotificationService.class);
         this.dataBroker = getService(mountPoint, DOMDataBroker.class);
+        this.schemaService = getService(mountPoint, DOMSchemaService.class);
     }
 
     private static <T extends DOMService> T getService(final DOMMountPoint mountPoint, final Class<T> service) {
@@ -109,7 +95,8 @@ class NetconfEventSourceMount {
      * @param lastEventTime last event time
      * @return rpc result
      */
-    FluentFuture<DOMRpcResult> invokeCreateSubscription(final Stream stream, final Optional<Instant> lastEventTime) {
+    ListenableFuture<? extends DOMRpcResult> invokeCreateSubscription(final Stream stream,
+            final Optional<Instant> lastEventTime) {
         final CreateSubscriptionInputBuilder inputBuilder = new CreateSubscriptionInputBuilder()
                 .setStream(stream.getName());
         if (lastEventTime.isPresent() && stream.isReplaySupport()) {
@@ -118,7 +105,7 @@ class NetconfEventSourceMount {
             inputBuilder.setStartTime(new DateAndTime(formattedDate));
         }
         final CreateSubscriptionInput input = inputBuilder.build();
-        final ContainerNode nnInput = CODEC_REGISTRY.toNormalizedNodeRpcData(input);
+        final ContainerNode nnInput = serializer.toNormalizedNodeRpcData(input);
         return rpcService.invokeRpc(CREATE_SUBSCRIPTION, nnInput);
     }
 
@@ -128,7 +115,7 @@ class NetconfEventSourceMount {
      * @param stream stream
      * @return rpc result
      */
-    FluentFuture<DOMRpcResult> invokeCreateSubscription(final Stream stream) {
+    ListenableFuture<? extends DOMRpcResult> invokeCreateSubscription(final Stream stream) {
         return invokeCreateSubscription(stream, Optional.empty());
     }
 
@@ -139,20 +126,20 @@ class NetconfEventSourceMount {
      * @throws ExecutionException if data read fails
      * @throws InterruptedException if data read fails
      */
-    List<Stream> getAvailableStreams() throws InterruptedException, ExecutionException {
-        DOMDataTreeReadTransaction tx = dataBroker.newReadOnlyTransaction();
-        FluentFuture<Optional<NormalizedNode<?, ?>>> checkFeature = tx.read(LogicalDatastoreType.OPERATIONAL,
-            STREAMS_PATH);
-        Optional<NormalizedNode<?, ?>> streams = checkFeature.get();
+    Collection<Stream> getAvailableStreams() throws InterruptedException, ExecutionException {
+        final Optional<NormalizedNode<?, ?>> streams;
+        try (DOMDataTreeReadTransaction tx = dataBroker.newReadOnlyTransaction()) {
+            streams = tx.read(LogicalDatastoreType.OPERATIONAL, STREAMS_PATH).get();
+        }
         if (streams.isPresent()) {
-            Streams streams1 = (Streams) CODEC_REGISTRY.fromNormalizedNode(STREAMS_PATH, streams.get()).getValue();
-            return streams1.getStream();
+            Streams streams1 = (Streams) serializer.fromNormalizedNode(STREAMS_PATH, streams.get()).getValue();
+            return streams1.nonnullStream().values();
         }
         return Collections.emptyList();
     }
 
-    SchemaContext getSchemaContext() {
-        return mountPoint.getSchemaContext();
+    EffectiveModelContext getSchemaContext() {
+        return schemaService.getGlobalContext();
     }
 
     /**
@@ -165,7 +152,7 @@ class NetconfEventSourceMount {
      */
     ListenerRegistration<DOMNotificationListener> registerNotificationListener(final DOMNotificationListener listener,
                                                                                final SchemaPath notificationPath) {
-        return notificationService.registerNotificationListener(listener, notificationPath);
+        return notificationService.registerNotificationListener(listener, notificationPath.asAbsolute());
     }
 
 }