Bug 8153: Enforce check-style rules for netconf - sal-netconf-connector

[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 990b54e43dfc966fc3f08b4aa521c83783983e41..34f2cbed1ff6304710b904f447a809044d911523 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,14 +44,20 @@ 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.
+ * 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>.
+ * 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 {
+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);
 
     private static final InstanceIdentifier<Topology> TOPOLOGY_PATH = InstanceIdentifier.create(NetworkTopology.class)
@@ -58,12 +66,15 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
     private InstanceIdentifier<Node> nodePath;
     private DataBroker dataBroker;
 
-    public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+    public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                                  final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
         instanceName = identifier.getInstanceName();
     }
 
-    public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final NetconfConnectorModule oldModule, final java.lang.AutoCloseable oldInstance) {
+    public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                                  final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+                                  final NetconfConnectorModule oldModule, final java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
         instanceName = identifier.getInstanceName();
     }
@@ -71,7 +82,8 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
     @Override
     protected void customValidation() {
         checkNotNull(getAddress(), addressJmxAttribute);
-        checkCondition(isHostAddressPresent(getAddress()), "Host address not present in " + getAddress(), addressJmxAttribute);
+        checkCondition(isHostAddressPresent(getAddress()), "Host address not present in " + getAddress(),
+                addressJmxAttribute);
         checkNotNull(getPort(), portJmxAttribute);
 
         checkNotNull(getConnectionTimeoutMillis(), connectionTimeoutMillisJmxAttribute);
@@ -90,9 +102,9 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
         }
     }
 
-    private boolean isHostAddressPresent(final Host address) {
-        return address.getDomainName() != null ||
-                address.getIpAddress() != null && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null);
+    private static boolean isHostAddressPresent(final Host address) {
+        return address.getDomainName() != null || address.getIpAddress() != null
+                && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null);
     }
 
     @Override
@@ -118,8 +130,8 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
             }
 
             @Override
-            public void onFailure(final Throwable t) {
-                LOG.error("Node {} creation failed: {}", instanceName, t);
+            public void onFailure(final Throwable throwable) {
+                LOG.error("Node {} creation failed: {}", instanceName, throwable);
             }
         });
     }
@@ -136,8 +148,8 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
                 }
 
                 @Override
-                public void onFailure(final Throwable t) {
-                    LOG.error("Node {} deletion failed: {}", instanceName, t);
+                public void onFailure(final Throwable throwable) {
+                    LOG.error("Node {} deletion failed: {}", instanceName, throwable);
                 }
             });
 
@@ -149,15 +161,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()
@@ -182,7 +202,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()