Decouple config and netconf subsystems.

[controller.git] / opendaylight / netconf / sal-netconf-connector / src / main / java / org / opendaylight / controller / sal / connect / netconf / schema / NetconfRemoteSchemaYangSourceProvider.java

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
similarity index 94%
rename from opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
rename to opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
index ad82c716ce86ac44b4bab8d486cd09e8a14acc95..4a7af8277ec7a2d9e89ce7a8dc21a058a05e4ce2 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
+++ b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
@@ -48,7 +48,7 @@ import org.w3c.dom.Element;
 
 public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSourceProvider<YangTextSchemaSource> {
 
-    private static final Logger logger = LoggerFactory.getLogger(NetconfRemoteSchemaYangSourceProvider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfRemoteSchemaYangSourceProvider.class);
 
     private static final ExceptionMapper<SchemaSourceException> MAPPER = new ExceptionMapper<SchemaSourceException>(
             "schemaDownload", SchemaSourceException.class) {
@@ -78,8 +78,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
         final DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> builder = Builders.containerBuilder();
 
         builder.withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NetconfMessageTransformUtil.GET_SCHEMA_QNAME))
-        .withChild(identifier)
-        .withChild(format);
+                .withChild(identifier).withChild(format);
 
         if(revision.isPresent()) {
             final QName revisionQName = QName.cachedReference(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version"));
@@ -120,7 +119,8 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
         final Optional<String> revision = Optional.fromNullable(formattedRevision);
         final NormalizedNode<?, ?> getSchemaRequest = createGetSchemaRequest(moduleName, revision);
 
-        logger.trace("{}: Loading YANG schema source for {}:{}", id, moduleName, revision);
+        LOG.trace("{}: Loading YANG schema source for {}:{}", id, moduleName,
+                revision);
 
         final ListenableFuture<YangTextSchemaSource> transformed = Futures.transform(
                 rpc.invokeRpc(SchemaPath.create(true, NetconfMessageTransformUtil.GET_SCHEMA_QNAME), getSchemaRequest),
@@ -132,7 +132,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
         // (goal is to limit concurrent schema download, since NetconfDevice listener does not handle concurrent messages properly)
         // TODO retest this
         try {
-            logger.trace("{}: Blocking for {}", id, sourceIdentifier);
+            LOG.trace("{}: Blocking for {}", id, sourceIdentifier);
             checked.checkedGet();
         } catch (final SchemaSourceException e) {
             return Futures.immediateFailedCheckedFuture(e);
@@ -170,12 +170,14 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
                 Preconditions.checkState(schemaString.isPresent(),
                         "%s: Unexpected response to get-schema, schema not present in message for: %s", id, sourceIdentifier);
 
-                logger.debug("{}: YANG Schema successfully retrieved for {}:{}", id, moduleName, revision);
+                LOG.debug("{}: YANG Schema successfully retrieved for {}:{}",
+                        id, moduleName, revision);
                 return new NetconfYangTextSchemaSource(id, sourceIdentifier, schemaString);
             }
 
-            logger.warn("{}: YANG schema was not successfully retrieved for {}. Errors: {}", id, sourceIdentifier,
-                    input.getErrors());
+            LOG.warn(
+                    "{}: YANG schema was not successfully retrieved for {}. Errors: {}",
+                    id, sourceIdentifier, input.getErrors());
 
             throw new IllegalStateException(String.format(
                     "%s: YANG schema was not successfully retrieved for %s. Errors: %s", id, sourceIdentifier,