Merge "Bug 8153: Enforce check-style rules for netconf - mdsal-netconf-monitoring...

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 1fe1a025f2994beb535343b082f6652b6754a4ff..5bc776a9468097f7fb393d0deb528dc0577a86c4 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -75,4 +75,16 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

diff --git a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java
index 0fe866d847e993942e566cafacfe8d207d685017..a163dd7540abf65659985e541ee594da24b3f83e 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java
+++ b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java
@@ -27,9 +27,10 @@ public class MdsalMonitoringMapperFactory implements NetconfOperationServiceFact
 
     private static final Set<Capability> CAPABILITIES = Collections.emptySet();
 
-    public MdsalMonitoringMapperFactory(final NetconfOperationServiceFactoryListener netconfOperationServiceFactoryListener,
-                                        final NetconfMonitoringService netconfMonitoringService,
-                                        final MonitoringToMdsalWriter monitoringToMdsalWriter) {
+    public MdsalMonitoringMapperFactory(
+            final NetconfOperationServiceFactoryListener netconfOperationServiceFactoryListener,
+            final NetconfMonitoringService netconfMonitoringService,
+            final MonitoringToMdsalWriter monitoringToMdsalWriter) {
 
         this.netconfOperationServiceFactoryListener = netconfOperationServiceFactoryListener;
         this.monitoringToMdsalWriter = monitoringToMdsalWriter;
@@ -56,9 +57,9 @@ public class MdsalMonitoringMapperFactory implements NetconfOperationServiceFact
 
     @Override
     public Set<Capability> getCapabilities() {
-        // TODO
-        // No capabilities exposed to prevent clashes with schemas from mdsal-netconf-connector (it exposes all the schemas)
-        // If the schemas exposed by mdsal-netconf-connector are filtered, this class would expose monitoring related models
+        // TODO No capabilities exposed to prevent clashes with schemas from mdsal-netconf-connector (it exposes
+        // all the schemas). If the schemas exposed by mdsal-netconf-connector are filtered, this class would expose
+        // monitoring related models.
         return CAPABILITIES;
     }
 
@@ -68,7 +69,7 @@ public class MdsalMonitoringMapperFactory implements NetconfOperationServiceFact
     }
 
     /**
-     * Invoke using blueprint
+     * Invoked using blueprint.
      */
     @Override
     public void close() {

diff --git a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java
index 3e487b4db6045c248891122be3a8336c6fe826f9..30e2655924086de8b934c3e1833a77effffbbbed 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java
+++ b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java
@@ -52,11 +52,12 @@ public final class MonitoringToMdsalWriter implements AutoCloseable, NetconfMoni
     }
 
     /**
-     * Invoke using blueprint
+     * Invoked using blueprint.
      */
     @Override
     public void close() {
-        runTransaction((tx) -> tx.delete(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(NetconfState.class)));
+        runTransaction((tx) -> tx.delete(LogicalDatastoreType.OPERATIONAL,
+                InstanceIdentifier.create(NetconfState.class)));
     }
 
     @Override
@@ -80,7 +81,8 @@ public final class MonitoringToMdsalWriter implements AutoCloseable, NetconfMoni
 
     @Override
     public void onCapabilitiesChanged(Capabilities capabilities) {
-        runTransaction((tx) -> tx.put(LogicalDatastoreType.OPERATIONAL, CAPABILITIES_INSTANCE_IDENTIFIER, capabilities));
+        runTransaction((tx) -> tx.put(LogicalDatastoreType.OPERATIONAL, CAPABILITIES_INSTANCE_IDENTIFIER,
+                capabilities));
     }
 
     @Override
@@ -89,7 +91,7 @@ public final class MonitoringToMdsalWriter implements AutoCloseable, NetconfMoni
     }
 
     /**
-     * Invoke using blueprint
+     * Invoked using blueprint.
      */
     public void start() {
         serverMonitoringDependency.registerCapabilitiesListener(this);
@@ -107,8 +109,8 @@ public final class MonitoringToMdsalWriter implements AutoCloseable, NetconfMoni
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                LOG.warn("Unable to update netconf state", t);
+            public void onFailure(Throwable throwable) {
+                LOG.warn("Unable to update netconf state", throwable);
             }
         });
     }

diff --git a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
index 10256b86f92c774651433ba1c2a6a087ebc95d93..05b6bd15f9054aeee639fb7fd62c090014bbbb81 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java
@@ -39,7 +39,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class MonitoringToMdsalWriterTest {
 
-    private static final InstanceIdentifier<NetconfState> INSTANCE_IDENTIFIER = InstanceIdentifier.create(NetconfState.class);
+    private static final InstanceIdentifier<NetconfState> INSTANCE_IDENTIFIER =
+            InstanceIdentifier.create(NetconfState.class);
 
     @Mock
     private NetconfMonitoringService monitoring;
@@ -77,7 +78,8 @@ public class MonitoringToMdsalWriterTest {
 
     @Test
     public void testOnCapabilityChanged() throws Exception {
-        final InstanceIdentifier<Capabilities> capabilitiesId = InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
+        final InstanceIdentifier<Capabilities> capabilitiesId =
+                InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
         writer.start();
         final Capabilities capabilities = new CapabilitiesBuilder().build();
         writer.onCapabilitiesChanged(capabilities);
@@ -88,7 +90,8 @@ public class MonitoringToMdsalWriterTest {
 
     @Test
     public void testOnSchemasChanged() throws Exception {
-        final InstanceIdentifier<Schemas> schemasId = InstanceIdentifier.create(NetconfState.class).child(Schemas.class);
+        final InstanceIdentifier<Schemas> schemasId =
+                InstanceIdentifier.create(NetconfState.class).child(Schemas.class);
         writer.start();
         final Schemas schemas = new SchemasBuilder().build();
         writer.onSchemasChanged(schemas);
@@ -102,7 +105,10 @@ public class MonitoringToMdsalWriterTest {
         Session session = new SessionBuilder()
                 .setSessionId(1L)
                 .build();
-        final InstanceIdentifier<Session> id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey());
+        final InstanceIdentifier<Session> id =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session.getKey());
         writer.start();
         writer.onSessionStarted(session);
         InOrder inOrder = inOrder(writeTransaction);
@@ -115,7 +121,10 @@ public class MonitoringToMdsalWriterTest {
         Session session = new SessionBuilder()
                 .setSessionId(1L)
                 .build();
-        final InstanceIdentifier<Session> id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey());
+        final InstanceIdentifier<Session> id =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session.getKey());
         writer.start();
         writer.onSessionEnded(session);
         InOrder inOrder = inOrder(writeTransaction);
@@ -134,8 +143,14 @@ public class MonitoringToMdsalWriterTest {
         List<Session> sessions = new ArrayList<>();
         sessions.add(session1);
         sessions.add(session2);
-        final InstanceIdentifier<Session> id1 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session1.getKey());
-        final InstanceIdentifier<Session> id2 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session2.getKey());
+        final InstanceIdentifier<Session> id1 =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session1.getKey());
+        final InstanceIdentifier<Session> id2 =
+                InstanceIdentifier.create(NetconfState.class)
+                        .child(Sessions.class)
+                        .child(Session.class, session2.getKey());
         writer.start();
         writer.onSessionsUpdated(sessions);
         InOrder inOrder = inOrder(writeTransaction);