Decouple config and netconf subsystems.

[controller.git] / opendaylight / netconf / sal-netconf-connector / src / main / java / org / opendaylight / controller / config / yang / md / sal / connector / netconf / NetconfConnectorModule.java

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
similarity index 97%
rename from opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
rename to opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
index 2c13166f50c01d2b9b89ee06c2d17c4708ce623f..b7c518ebfef3d290e063ec06608e56b023631517 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
+++ b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  */
 public final class NetconfConnectorModule extends org.opendaylight.controller.config.yang.md.sal.connector.netconf.AbstractNetconfConnectorModule
 {
-    private static final Logger logger = LoggerFactory.getLogger(NetconfConnectorModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfConnectorModule.class);
 
     private BundleContext bundleContext;
     private Optional<NetconfSessionPreferences> userCapabilities;
@@ -96,7 +96,7 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
         userCapabilities = getUserCapabilities();
 
         if(getKeepaliveExecutor() == null) {
-            logger.warn("Keepalive executor missing. Using default instance for now, the configuration needs to be updated");
+            LOG.warn("Keepalive executor missing. Using default instance for now, the configuration needs to be updated");
 
             // Instantiate the default executor, now we know its necessary
             if(DEFAULT_KEEPALIVE_EXECUTOR == null) {
@@ -234,7 +234,7 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
             if (maxConnectionAttempts != null && maxConnectionAttempts > 0) {
                 connectionAttempts = maxConnectionAttempts;
             } else {
-                logger.trace("Setting {} on {} to infinity", maxConnectionAttemptsJmxAttribute, this);
+                LOG.trace("Setting {} on {} to infinity", maxConnectionAttemptsJmxAttribute, this);
                 connectionAttempts = null;
             }