From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 28 Jun 2018 10:51:24 +0000 (+0200)
Subject: Cleanup NetconfStateSchemasResolverImpl
X-Git-Tag: release/fluorine~50
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2e5dcf704ce2d56104f373f5b413a19760b13d4b;p=netconf.git

Cleanup NetconfStateSchemasResolverImpl

We are using a constant QName in lookups, use a constant for that.
Also mark a FIXME for netconf-monitoring/yang-library preference.

Change-Id: Ia30ece91868b55e811e734b817ffaa71d86da0a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java
index c2947d9860..765c6108da 100644
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfStateSchemasResolverImpl.java
@@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.common.QName;
  * Default implementation resolving schemas QNames from netconf-state or from modules-state.
  */
 public final class NetconfStateSchemasResolverImpl implements NetconfDeviceSchemasResolver {
+    private static final QName YANG_LIBRARY_CAPABILITY = QName.create(ModulesState.QNAME, "ietf-yang-library").intern();
 
     @Override
     public NetconfDeviceSchemas resolve(final NetconfDeviceRpc deviceRpc,
@@ -27,10 +28,10 @@ public final class NetconfStateSchemasResolverImpl implements NetconfDeviceSchem
                                         final RemoteDeviceId id) {
         if (remoteSessionCapabilities.isMonitoringSupported()) {
             return NetconfStateSchemas.create(deviceRpc, remoteSessionCapabilities, id);
-        } else if (remoteSessionCapabilities.containsModuleCapability(QName.create(ModulesState.QNAME,
-                "ietf-yang-library"))) {
-            return LibraryModulesSchemas.create(deviceRpc, id);
         }
-        return NetconfStateSchemas.EMPTY;
+
+        // FIXME: I think we should prefer YANG library here
+        return remoteSessionCapabilities.containsModuleCapability(YANG_LIBRARY_CAPABILITY)
+            ? LibraryModulesSchemas.create(deviceRpc, id) : NetconfStateSchemas.EMPTY;
     }
 }