Mass conversion to static methods

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

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
index 88eb368b9bb0a3a3a754f9e679f89b87c8876ec9..755959b64f0320e5532db2e1afd3be21f31e7a2c 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
@@ -23,6 +23,8 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.NonModuleCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.NonModuleCapabilitiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.YangModuleCapabilities;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.YangModuleCapabilitiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
@@ -42,8 +44,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * Instead of using loopback (controller-config mount point) to create your netconf-connector, you should use the network-topology capability.
+ * <p>
+ * Follow instructions provided in this <a href="https://wiki.opendaylight.org/view/OpenDaylight_Controller:Config:Examples:Netconf#Spawning_netconf_connectors_via_topology_configuration">wiki</a>.
+ * <p>
+ * Deprecation notice in Carbon, removal planned for Nitrogen.
  */
+@Deprecated
 public final class NetconfConnectorModule extends org.opendaylight.controller.config.yang.md.sal.connector.netconf.AbstractNetconfConnectorModule implements BindingAwareConsumer {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfConnectorModule.class);
 
@@ -85,9 +92,9 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
         }
     }
 
-    private boolean isHostAddressPresent(final Host address) {
+    private static boolean isHostAddressPresent(final Host address) {
         return address.getDomainName() != null ||
-               address.getIpAddress() != null && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null);
+                address.getIpAddress() != null && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null);
     }
 
     @Override
@@ -144,15 +151,23 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
                 .setUsername(getUsername())
                 .setPassword(getPassword())
                 .build();
-        final YangModuleCapabilities capabilities;
+
+        YangModuleCapabilities moduleCapabilities = null;
         if (getYangModuleCapabilities() != null) {
-            capabilities = new YangModuleCapabilitiesBuilder()
+            moduleCapabilities = new YangModuleCapabilitiesBuilder()
                     .setOverride(getYangModuleCapabilities().getOverride())
                     .setCapability(getYangModuleCapabilities().getCapability())
                     .build();
-        } else {
-            capabilities = null;
         }
+
+        NonModuleCapabilities nonModuleCapabilities = null;
+        if(getNonModuleCapabilities() != null) {
+            nonModuleCapabilities = new NonModuleCapabilitiesBuilder()
+                    .setOverride(getNonModuleCapabilities().getOverride())
+                    .setCapability(getNonModuleCapabilities().getCapability())
+                    .build();
+        }
+
         final YangLibrary yangLibrary;
         if (getYangLibrary() != null) {
             yangLibrary = new YangLibraryBuilder()
@@ -177,7 +192,8 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
                 .setSchemaCacheDirectory(getSchemaCacheDirectory())
                 .setSleepFactor(getSleepFactor())
                 .setTcpOnly(getTcpOnly())
-                .setYangModuleCapabilities(capabilities)
+                .setYangModuleCapabilities(moduleCapabilities)
+                .setNonModuleCapabilities(nonModuleCapabilities)
                 .setYangLibrary(yangLibrary)
                 .build();
         return new NodeBuilder()