From 7095f2e0de2b1a3837da773cbc460d4563c62a06 Mon Sep 17 00:00:00 2001 From: "matus.kubica" Date: Wed, 19 Apr 2017 13:26:40 +0200 Subject: [PATCH] Bug 8153: Enforce check-style rules for netconf - mdsal-netconf-monitoring Organize Imports for Checkstyle compliance. Checkstyle compliance: line length. Checkstyle compliance: various types of small changes. Checkstyle compliant Exception handling. Checkstyle final clean up & enforcement. Change-Id: I9535f6b09ea4d3916f3f378a433565f8cbe97d19 Signed-off-by: matus.kubica --- netconf/mdsal-netconf-monitoring/pom.xml | 12 ++++++++ .../MdsalMonitoringMapperFactory.java | 15 +++++----- .../monitoring/MonitoringToMdsalWriter.java | 14 +++++---- .../MonitoringToMdsalWriterTest.java | 29 ++++++++++++++----- 4 files changed, 50 insertions(+), 20 deletions(-) diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index 1fe1a025f2..5bc776a946 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -75,4 +75,16 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + + 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 0fe866d847..a163dd7540 100644 --- 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 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 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 3e487b4db6..30e2655924 100644 --- 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 10256b86f9..05b6bd15f9 100644 --- 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 INSTANCE_IDENTIFIER = InstanceIdentifier.create(NetconfState.class); + private static final InstanceIdentifier 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 capabilitiesId = InstanceIdentifier.create(NetconfState.class).child(Capabilities.class); + final InstanceIdentifier 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 schemasId = InstanceIdentifier.create(NetconfState.class).child(Schemas.class); + final InstanceIdentifier 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 id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey()); + final InstanceIdentifier 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 id = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session.getKey()); + final InstanceIdentifier 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 sessions = new ArrayList<>(); sessions.add(session1); sessions.add(session2); - final InstanceIdentifier id1 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session1.getKey()); - final InstanceIdentifier id2 = InstanceIdentifier.create(NetconfState.class).child(Sessions.class).child(Session.class, session2.getKey()); + final InstanceIdentifier id1 = + InstanceIdentifier.create(NetconfState.class) + .child(Sessions.class) + .child(Session.class, session1.getKey()); + final InstanceIdentifier id2 = + InstanceIdentifier.create(NetconfState.class) + .child(Sessions.class) + .child(Session.class, session2.getKey()); writer.start(); writer.onSessionsUpdated(sessions); InOrder inOrder = inOrder(writeTransaction); -- 2.36.6