Fix checkstyle warnings for rpc package

See also: bug 8607

Change-Id: I2ad3e70aac83509f8af49369004633befba73df7
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
index 2c7238d1b2fd46de80afee1e339534b682f2d6f8..63ccdfb7afbce2391549816eedba07a0a98a93a0 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java
@@ -81,7 +81,8 @@ class RpcContextImpl implements RpcContext {
     public <S extends RpcService> void registerRpcServiceImplementation(final Class<S> serviceClass,
                                                                         final S serviceInstance) {
         if (!rpcRegistrations.containsKey(serviceClass)) {
-            final RoutedRpcRegistration<S> routedRpcReg = rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance);
+            final RoutedRpcRegistration<S> routedRpcReg =
+                    rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance);
             routedRpcReg.registerPath(NodeContext.class, nodeInstanceIdentifier);
             rpcRegistrations.put(serviceClass, routedRpcReg);
             if (LOG.isDebugEnabled()) {
@@ -112,7 +113,8 @@ class RpcContextImpl implements RpcContext {
             rpcRegistration.close();
 
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Closing RPC Registration of service {} for device {}.", rpcRegistration.getServiceType().getSimpleName(),
+                LOG.debug("Closing RPC Registration of service {} for device {}.",
+                        rpcRegistration.getServiceType().getSimpleName(),
                         nodeInstanceIdentifier.getKey().getId().getValue());
             }
         }
@@ -124,12 +126,14 @@ class RpcContextImpl implements RpcContext {
             LOG.trace("Device queue {} at capacity", this);
             return null;
         } else {
-            LOG.trace("Acquired semaphore for {}, available permits:{} ", nodeInstanceIdentifier.getKey().getId().getValue(), tracker.availablePermits());
+            LOG.trace("Acquired semaphore for {}, available permits:{} ",
+                    nodeInstanceIdentifier.getKey().getId().getValue(), tracker.availablePermits());
         }
 
         final Long xid = deviceInfo.reserveXidForDeviceMessage();
         if (xid == null) {
-            LOG.warn("Xid cannot be reserved for new RequestContext, node:{}", nodeInstanceIdentifier.getKey().getId().getValue());
+            LOG.warn("Xid cannot be reserved for new RequestContext, node:{}",
+                    nodeInstanceIdentifier.getKey().getId().getValue());
             tracker.release();
             return null;
         }
@@ -147,12 +151,14 @@ class RpcContextImpl implements RpcContext {
 
     @Override
     public <S extends RpcService> void unregisterRpcServiceImplementation(final Class<S> serviceClass) {
-        LOG.trace("Try to unregister serviceClass {} for Node {}", serviceClass, nodeInstanceIdentifier.getKey().getId());
+        LOG.trace("Try to unregister serviceClass {} for Node {}",
+                serviceClass, nodeInstanceIdentifier.getKey().getId());
         final RoutedRpcRegistration<?> rpcRegistration = rpcRegistrations.remove(serviceClass);
         if (rpcRegistration != null) {
             rpcRegistration.unregisterPath(NodeContext.class, nodeInstanceIdentifier);
             rpcRegistration.close();
-            LOG.debug("Un-registration serviceClass {} for Node {}", serviceClass.getSimpleName(), nodeInstanceIdentifier.getKey().getId().getValue());
+            LOG.debug("Un-registration serviceClass {} for Node {}", serviceClass.getSimpleName(),
+                    nodeInstanceIdentifier.getKey().getId().getValue());
         }
     }
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
index 7f9d72fe4a420809f0a3e7393c5595ec0230e427..d8cc351b329af4dbc55b94806cf410247a274db4 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
@@ -35,7 +35,6 @@ public class RpcManagerImpl implements RpcManager {
     private final ConvertorExecutor convertorExecutor;
     private final NotificationPublishService notificationPublishService;
 
-
     public RpcManagerImpl(final OpenflowProviderConfig config,
                           final RpcProviderRegistry rpcProviderRegistry,
                           final ExtensionConverterProvider extensionConverterProvider,
@@ -57,12 +56,12 @@ public class RpcManagerImpl implements RpcManager {
     }
 
     /**
-     * This method is only for testing
+     * This method is only for testing.
      */
     @VisibleForTesting
     void addRecordToContexts(DeviceInfo deviceInfo, RpcContext rpcContexts) {
-        if(!contexts.containsKey(deviceInfo)) {
-            this.contexts.put(deviceInfo,rpcContexts);
+        if (!contexts.containsKey(deviceInfo)) {
+            this.contexts.put(deviceInfo, rpcContexts);
         }
     }
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/listener/ItemLifecycleListenerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/listener/ItemLifecycleListenerImpl.java
index 773be3c3d2d5359f11460e43afc4ae56df926af7..8843ed2b4f4f172d6a3aeaae5a57600066749fc1 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/listener/ItemLifecycleListenerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/listener/ItemLifecycleListenerImpl.java
@@ -19,7 +19,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * General implementation of {@link ItemLifecycleListener} - keeping of DS/operational reflection up-to-date
+ * General implementation of {@link ItemLifecycleListener} - keeping of DS/operational reflection up-to-date.
  */
 public class ItemLifecycleListenerImpl implements ItemLifecycleListener {
 
@@ -33,7 +33,9 @@ public class ItemLifecycleListenerImpl implements ItemLifecycleListener {
     }
 
     @Override
-    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>> void onAdded(KeyedInstanceIdentifier<I, K> itemPath, I itemBody) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>>
+            void onAdded(KeyedInstanceIdentifier<I, K> itemPath, I itemBody) {
         try {
             txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL, itemPath, itemBody);
             txFacade.submitTransaction();
@@ -43,7 +45,9 @@ public class ItemLifecycleListenerImpl implements ItemLifecycleListener {
     }
 
     @Override
-    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>> void onRemoved(KeyedInstanceIdentifier<I, K> itemPath) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>>
+            void onRemoved(KeyedInstanceIdentifier<I, K> itemPath) {
         try {
             txFacade.addDeleteToTxChain(LogicalDatastoreType.OPERATIONAL, itemPath);
             txFacade.submitTransaction();
@@ -53,7 +57,9 @@ public class ItemLifecycleListenerImpl implements ItemLifecycleListener {
     }
 
     @Override
-    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>> void onUpdated(KeyedInstanceIdentifier<I, K> itemPath, I itemBody) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public <I extends Identifiable<K> & DataObject, K extends Identifier<I>>
+            void onUpdated(KeyedInstanceIdentifier<I, K> itemPath, I itemBody) {
         try {
             txFacade.addDeleteToTxChain(LogicalDatastoreType.OPERATIONAL, itemPath);
             txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL, itemPath, itemBody);

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/ItemLifecycleListenerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/ItemLifecycleListenerImplTest.java
index bf3a977815ab430758f97b128ed71aedfef73bf5..23b5063aabcdfea916c016ba266b4787dd15a49f 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/ItemLifecycleListenerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/ItemLifecycleListenerImplTest.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.openflowplugin.impl.rpc;
 
-
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -57,7 +56,8 @@ public class ItemLifecycleListenerImplTest {
     @Test
     public void testOnAdded() throws Exception {
         itemLifecycleListener.onAdded(nodeInstanceIdentifier, node);
-        verify(deviceContext).writeToTransaction(eq(LogicalDatastoreType.OPERATIONAL), eq(nodeInstanceIdentifier), eq(node));
+        verify(deviceContext)
+                .writeToTransaction(eq(LogicalDatastoreType.OPERATIONAL), eq(nodeInstanceIdentifier), eq(node));
         verify(deviceContext).submitTransaction();
     }
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
index 5fdaa36c2cbeb4a73215e3a48e8856d84f81a547..1c591d910fc00418de9c9be179c48fce3b6bf833 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
@@ -25,7 +25,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
-import org.opendaylight.openflowplugin.api.openflow.device.XidSequencer;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
 import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
@@ -51,8 +50,6 @@ public class RpcContextImplTest {
     @Mock
     private DeviceState deviceState;
     @Mock
-    private XidSequencer xidSequencer;
-    @Mock
     private MessageSpy messageSpy;
     @Mock
     private DeviceContext deviceContext;
@@ -92,19 +89,19 @@ public class RpcContextImplTest {
                 convertorExecutor,
                 notificationPublishService, true);
 
-        when(rpcProviderRegistry.addRoutedRpcImplementation(TestRpcService.class, serviceInstance)).thenReturn(routedRpcReg);
-
+        when(rpcProviderRegistry.addRoutedRpcImplementation(TestRpcService.class, serviceInstance))
+                .thenReturn(routedRpcReg);
     }
 
     @Test
     public void testStoreOrFail() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
                 100,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService, true)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNotNull(requestContext);
         }
@@ -112,13 +109,13 @@ public class RpcContextImplTest {
 
     @Test
     public void testStoreOrFailThatFails() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
                 0,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService, true)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNull(requestContext);
         }
@@ -126,13 +123,13 @@ public class RpcContextImplTest {
 
     @Test
     public void testStoreAndCloseOrFail() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
                 100,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService, true)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNotNull(requestContext);
             requestContext.close();
@@ -147,7 +144,6 @@ public class RpcContextImplTest {
         assertEquals(rpcContext.isEmptyRpcRegistrations(), false);
     }
 
-
     @Test
     public void testLookupRpcService() {
         when(routedRpcReg.getInstance()).thenReturn(serviceInstance);
@@ -166,8 +162,7 @@ public class RpcContextImplTest {
     }
 
     /**
-     * When deviceContext.reserveXidForDeviceMessage returns null, null should be returned
-     * @throws InterruptedException
+     * When deviceContext.reserveXidForDeviceMessage returns null, null should be returned.
      */
     @Test
     public void testCreateRequestContext1() throws InterruptedException {
@@ -176,8 +171,7 @@ public class RpcContextImplTest {
     }
 
     /**
-     * When deviceContext.reserveXidForDeviceMessage returns value, AbstractRequestContext should be returned
-     * @throws InterruptedException
+     * When deviceContext.reserveXidForDeviceMessage returns value, AbstractRequestContext should be returned.
      */
 
     @Test
@@ -195,6 +189,6 @@ public class RpcContextImplTest {
         assertEquals(rpcContext.isEmptyRpcRegistrations(), true);
     }
 
-    //Stub for RpcService class
+    //Stub for RpcService class.
     public class TestRpcService implements RpcService {}
 }