Checkstyle: fix issues and enforce on dsbackend

Change-Id: Ida32a6d552b7ea8d86b902089c9d4184d8cb5eee
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 34789a5aa9e4fdb8845dbeb8b044cc0a69082617..af94f6b6ed02b953a5e847c7d7e045c62f590626 100644 (file)
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -18,7 +18,7 @@
 
   <artifactId>mappingservice.dsbackend</artifactId>
   <packaging>bundle</packaging>
-  <name>Mapping Service datastore backend</name>
+  <name>Mapping Service DataStore BackEnd</name>
 
   <dependencies>
     <dependency>
@@ -50,31 +50,13 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <configuration>
-            <configLocation>checkstyle/java_rules.xml</configLocation>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
-            <failsOnError>true</failsOnError>
-            <consoleOutput>true</consoleOutput>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>common.build.tools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
index 9d2d2a351f4255eb568d0c64269c15c16c30ff16..a499b71b1fe488fb068d65a5c9cf30dc131d104e 100644 (file)
--- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
+++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
@@ -7,9 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.dsbackend;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -31,12 +35,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-
 /**
  * Stores data coming from the mapping database RPCs into the MD-SAL datastore.
  *
@@ -228,8 +226,8 @@ public class DataStoreBackEnd implements TransactionChainListener {
             public void onSuccess(Void result) {
             }
 
-            public void onFailure(Throwable t) {
-                LOG.error("Transaction failed:", t);
+            public void onFailure(Throwable throwable) {
+                LOG.error("Transaction failed:", throwable);
             }
         });
     }
@@ -262,8 +260,8 @@ public class DataStoreBackEnd implements TransactionChainListener {
             public void onSuccess(Void result) {
             }
 
-            public void onFailure(Throwable t) {
-                LOG.error("Transaction failed:", t);
+            public void onFailure(Throwable throwable) {
+                LOG.error("Transaction failed:", throwable);
             }
         });
     }

diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
index 9192d682a0e9e3126e606016018742959577e798..30a781efee80ad0682bcd697540c77de335c9558 100644 (file)
--- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
+++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
@@ -7,15 +7,16 @@
  */
 package org.opendaylight.lispflowmapping.dsbackend;
 
+import com.google.common.base.Preconditions;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.InstanceId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.XtrIdUri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyKey;
@@ -27,8 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Utility class to create InstanceIdentifier path objects based on EID.
  * Used for storing RPC data to the config datastore.

diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
index a7aefb2cb3fb674cea4434056921db3a59d450cb..1eda0a2e963e198a4bfcc4997ce19b20beac7cf5 100644 (file)
--- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
+++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
@@ -89,19 +89,19 @@ public class DataStoreBackEndTest {
 
     @Before
     public void init() {
-        DataBroker brokerMock = Mockito.mock(DataBroker.class);
-        Logger logMock = Mockito.mock(Logger.class, "LOG");
+        final DataBroker brokerMock = Mockito.mock(DataBroker.class);
+        final Logger logMock = Mockito.mock(Logger.class, "LOG");
 
         PowerMockito.mockStatic(LoggerFactory.class);
-        PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class)).
-                thenReturn(logMock);
+        PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class))
+                .thenReturn(logMock);
         Mockito.when(logMock.isDebugEnabled()).thenReturn(true);
         Mockito.when(brokerMock.createTransactionChain(Mockito.any(DataStoreBackEnd.class))).thenReturn(txChainMock);
         dataStoreBackEnd = PowerMockito.spy(new DataStoreBackEnd(brokerMock));
 
         Mockito.when(txChainMock.newWriteOnlyTransaction()).thenReturn(wTxMock);
-        Mockito.when(wTxMock.submit()).
-                thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
+        Mockito.when(wTxMock.submit())
+                .thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
     }
 
     /**