From 655343960ef1849c9ce50c210a964cf3a211b97c Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 16 May 2017 14:14:27 +0200 Subject: [PATCH] Bug 8153: enforce check-style rules for netconf - enforce checkstyle in all modules + cleanup Change-Id: I64b003c8f8f554445423e54642ef46bb95bc90b1 Signed-off-by: Ivan Hrasko --- netconf/netconf-auth/pom.xml | 12 +++++++++++ netconf/netconf-mapping-api/pom.xml | 12 +++++++++++ .../netconf/sal/connect/api/package-info.java | 2 +- .../sal/connect/netconf/package-info.java | 2 +- .../sal/connect/util/package-info.java | 2 +- .../netconf/sal/KeepaliveSalFacadeTest.java | 21 ++++++------------- netconf/yanglib/pom.xml | 7 +++++++ 7 files changed, 40 insertions(+), 18 deletions(-) diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml index 7733900f63..9134e57235 100644 --- a/netconf/netconf-auth/pom.xml +++ b/netconf/netconf-auth/pom.xml @@ -21,4 +21,16 @@ 1.3.0-SNAPSHOT ${project.artifactId} bundle + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml index ba7bdb18c1..387d8e139b 100644 --- a/netconf/netconf-mapping-api/pom.xml +++ b/netconf/netconf-mapping-api/pom.xml @@ -48,4 +48,16 @@ guava + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java index 399cdf0f3b..7fce9bea4e 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/package-info.java @@ -7,6 +7,6 @@ */ /** - * API for netconf connector + * API for netconf connector. */ package org.opendaylight.netconf.sal.connect.api; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java index 60b3ee0d76..44171369ac 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/package-info.java @@ -7,6 +7,6 @@ */ /** - * Implementation of netconf southbound connector + * Implementation of netconf southbound connector. */ package org.opendaylight.netconf.sal.connect.netconf; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java index 9b12a4166e..7942c87971 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/package-info.java @@ -7,6 +7,6 @@ */ /** - * Utility classes for netconf connector + * Utility classes for netconf connector. */ package org.opendaylight.netconf.sal.connect.util; diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java index 654c6ab66c..f0b791a3b3 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java @@ -21,7 +21,6 @@ import java.net.InetSocketAddress; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,8 +28,6 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; @@ -79,15 +76,11 @@ public class KeepaliveSalFacadeTest { ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1); executorServiceSpy = Mockito.spy(executorService); - doAnswer(new Answer() { - @Override - public ScheduledFuture answer(InvocationOnMock invocationOnMock) - throws Throwable { + doAnswer( + invocationOnMock -> { invocationOnMock.callRealMethod(); return currentKeepalive; - } - }).when(executorServiceSpy).schedule(Mockito.any(), - Mockito.anyLong(), Matchers.any()); + }).when(executorServiceSpy).schedule(Mockito.any(), Mockito.anyLong(), Matchers.any()); Mockito.when(currentKeepalive.isDone()).thenReturn(true); } @@ -178,13 +171,11 @@ public class KeepaliveSalFacadeTest { @Test public void testNonKeepaliveRpcFailure() throws Exception { - doAnswer(new Answer() { - @Override - public Object answer(final InvocationOnMock invocationOnMock) throws Throwable { + doAnswer( + invocationOnMock -> { proxyRpc = (DOMRpcService) invocationOnMock.getArguments()[2]; return null; - } - }).when(underlyingSalFacade).onDeviceConnected( + }).when(underlyingSalFacade).onDeviceConnected( any(SchemaContext.class), any(NetconfSessionPreferences.class), any(DOMRpcService.class)); doReturn(Futures.immediateFailedCheckedFuture(new IllegalStateException("illegal-state"))) diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml index 33e21b07f0..74011a592b 100644 --- a/netconf/yanglib/pom.xml +++ b/netconf/yanglib/pom.xml @@ -37,6 +37,13 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + -- 2.36.6