From 79d19691a33d50d277b589a804bbc905879ed486 Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Mon, 11 Jul 2016 14:02:12 -0500 Subject: [PATCH] Checkstyle: fix issues and enforce on dsbackend Change-Id: Ida32a6d552b7ea8d86b902089c9d4184d8cb5eee Signed-off-by: Lorand Jakab --- mappingservice/dsbackend/pom.xml | 26 +++---------------- .../dsbackend/DataStoreBackEnd.java | 20 +++++++------- .../dsbackend/InstanceIdentifierUtil.java | 5 ++-- .../dsbackend/DataStoreBackEndTest.java | 12 ++++----- 4 files changed, 21 insertions(+), 42 deletions(-) diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 34789a5aa..af94f6b6e 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -18,7 +18,7 @@ mappingservice.dsbackend bundle - Mapping Service datastore backend + Mapping Service DataStore BackEnd @@ -50,31 +50,13 @@ - + + org.apache.maven.plugins maven-checkstyle-plugin - checkstyle/java_rules.xml true - org/opendaylight/yang/gen/**,**/config/yang/** - true - true + checkstyle.violationSeverity=error - - - org.opendaylight.lispflowmapping - common.build.tools - ${project.version} - - - - - - check - - process-sources - - 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 9d2d2a351..a499b71b1 100644 --- 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 9192d682a..30a781efe 100644 --- 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 a7aefb2cb..1eda0a2e9 100644 --- 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.immediateCheckedFuture(null)); + Mockito.when(wTxMock.submit()) + .thenReturn(Futures.immediateCheckedFuture(null)); } /** -- 2.36.6