Clean up netconf-{common,client}-mdsal constants

[netconf.git] / plugins / netconf-client-mdsal / src / main / java / org / opendaylight / netconf / client / mdsal / MonitoringSchemaSourceProvider.java

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java
index d6d6898356af48e0473ae44688f0ece4212b1b4b..18f82fbd4fb0660ed45d2ab6508ccdaf12ba6104 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java
@@ -9,8 +9,6 @@ package org.opendaylight.netconf.client.mdsal;
 
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
-import static org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil.GET_SCHEMA_QNAME;
-import static org.opendaylight.netconf.common.mdsal.NormalizedDataUtil.NETCONF_DATA_QNAME;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -20,8 +18,9 @@ import javax.xml.transform.dom.DOMSource;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
-import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.GetSchema;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.get.schema.output.Data;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -46,18 +45,15 @@ import org.w3c.dom.Element;
 public final class MonitoringSchemaSourceProvider implements SchemaSourceProvider<YangTextSchemaSource> {
     private static final Logger LOG = LoggerFactory.getLogger(MonitoringSchemaSourceProvider.class);
     private static final NodeIdentifier FORMAT_PATHARG =
-            NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format").intern());
-    private static final NodeIdentifier GET_SCHEMA_PATHARG =
-            NodeIdentifier.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME);
+            NodeIdentifier.create(QName.create(GetSchema.QNAME, "format").intern());
+    private static final NodeIdentifier GET_SCHEMA_PATHARG = NodeIdentifier.create(GetSchema.QNAME);
     private static final NodeIdentifier IDENTIFIER_PATHARG =
-            NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "identifier").intern());
+            NodeIdentifier.create(QName.create(GetSchema.QNAME, "identifier").intern());
     private static final NodeIdentifier VERSION_PATHARG =
-            NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version").intern());
+            NodeIdentifier.create(QName.create(GetSchema.QNAME, "version").intern());
     private static final LeafNode<?> FORMAT_LEAF =
             Builders.leafBuilder().withNodeIdentifier(FORMAT_PATHARG).withValue(Yang.QNAME).build();
-    private static final QName NETCONF_DATA =
-            QName.create(GET_SCHEMA_QNAME, NETCONF_DATA_QNAME.getLocalName()).intern();
-    private static final NodeIdentifier NETCONF_DATA_PATHARG = NodeIdentifier.create(NETCONF_DATA);
+    private static final NodeIdentifier NETCONF_DATA_PATHARG = NodeIdentifier.create(Data.QNAME);
 
     private final DOMRpcService rpc;
     private final RemoteDeviceId id;
@@ -85,7 +81,7 @@ public final class MonitoringSchemaSourceProvider implements SchemaSourceProvide
         final DataContainerChild child = result.childByArg(NETCONF_DATA_PATHARG);
         checkState(child instanceof DOMSourceAnyxmlNode,
                 "%s Unexpected response to get-schema, expected response with one child %s, but was %s", id,
-                NETCONF_DATA, result);
+                Data.QNAME, result);
 
         final DOMSource wrappedNode = ((DOMSourceAnyxmlNode) child).body();
         final Element dataNode = (Element) requireNonNull(wrappedNode.getNode());
@@ -101,10 +97,10 @@ public final class MonitoringSchemaSourceProvider implements SchemaSourceProvide
         final ContainerNode getSchemaRequest = createGetSchemaRequest(moduleName, revision);
         LOG.trace("{}: Loading YANG schema source for {}:{}", id, moduleName, revision);
         return Futures.transform(
-            rpc.invokeRpc(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, getSchemaRequest), input -> {
+            rpc.invokeRpc(GetSchema.QNAME, getSchemaRequest), result -> {
                 // Transform composite node to string schema representation and then to ASTSchemaSource.
-                if (input.errors().isEmpty()) {
-                    final String schemaString = getSchemaFromRpc(id, input.value())
+                if (result.errors().isEmpty()) {
+                    final String schemaString = getSchemaFromRpc(id, result.value())
                         .orElseThrow(() -> new IllegalStateException(
                             id + ": Unexpected response to get-schema, schema not present in message for: "
                                 + sourceIdentifier));
@@ -113,10 +109,10 @@ public final class MonitoringSchemaSourceProvider implements SchemaSourceProvide
                 }
 
                 LOG.warn("{}: YANG schema was not successfully retrieved for {}. Errors: {}", id, sourceIdentifier,
-                    input.errors());
+                    result.errors());
                 throw new IllegalStateException(String.format(
                     "%s: YANG schema was not successfully retrieved for %s. Errors: %s", id, sourceIdentifier,
-                    input.errors()));
+                    result.errors()));
             }, MoreExecutors.directExecutor());
     }
 }