Fix RIB SPI checkstyle complains

Change-Id: Ia1862f8db58413ca284f4d76f1d24c0a2d818ac9
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/GlobalUtil.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/GlobalUtil.java
index 287ca3db5fa98f9a4921919b55907cfb92bf6aa9..bc8cecabdeb5fa70a74f4e30fa3de68449c25bdb 100644 (file)
--- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/GlobalUtil.java
+++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/GlobalUtil.java
@@ -13,7 +13,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafiBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.afi.safi.State;
@@ -39,7 +39,7 @@ public final class GlobalUtil {
      * @return Global containing state
      */
     @Nonnull
-    public static Global buildGlobal(final BGPRIBState ribState,
+    public static Global buildGlobal(final BGPRibState ribState,
             final BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         return new GlobalBuilder().setState(buildState(ribState))
                 .setAfiSafis(new AfiSafisBuilder().setAfiSafi(buildAfisSafis(ribState, bgpTableTypeRegistry)).build())
@@ -53,7 +53,7 @@ public final class GlobalUtil {
      * @param bgpTableTypeRegistry BGP TableType Registry
      * @return List containing per afi/safi operational state
      */
-    public static List<AfiSafi> buildAfisSafis(final BGPRIBState ribState,
+    public static List<AfiSafi> buildAfisSafis(final BGPRibState ribState,
             final BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         return ribState.getPathsCount().keySet().stream()
                 .map(tk -> buildAfiSafi(ribState, tk, bgpTableTypeRegistry))
@@ -67,7 +67,7 @@ public final class GlobalUtil {
      * @return Openconfig Global State
      */
     public static org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base
-            .State buildState(final BGPRIBState ribState) {
+            .State buildState(final BGPRibState ribState) {
         return new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.StateBuilder()
                 .setAs(ribState.getAs())
                 .setRouterId(ribState.getRouteId())
@@ -84,7 +84,7 @@ public final class GlobalUtil {
      * @param bgpTableTypeRegistry BGP TableType Registry
      * @return Afi Safi Operational State
      */
-    public static AfiSafi buildAfiSafi(final BGPRIBState ribState, final TablesKey tablesKey,
+    public static AfiSafi buildAfiSafi(final BGPRibState ribState, final TablesKey tablesKey,
             final BGPTableTypeRegistryConsumer bgpTableTypeRegistry) {
         final Optional<Class<? extends AfiSafiType>> optAfiSafi = bgpTableTypeRegistry.getAfiSafiType(tablesKey);
         if (!optAfiSafi.isPresent()) {

diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java
index cf4cb0723a2902ff94cba815bbf364c7c2984de6..dc63b738909c7f2042a7284171e990b68433d8f0 100644 (file)
--- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java
+++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java
@@ -32,7 +32,7 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionChain;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPStateConsumer;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.BgpBuilder;
@@ -106,7 +106,7 @@ public final class StateProviderImpl implements TransactionChainListener, AutoCl
 
     private synchronized void updateBGPStats(final WriteTransaction wtx) {
         final Set<String> oldStats = new HashSet<>(this.instanceIdentifiersCache.keySet());
-        this.stateCollector.getRibStats().stream().filter(BGPRIBState::isActive).forEach(bgpStateConsumer -> {
+        this.stateCollector.getRibStats().stream().filter(BGPRibState::isActive).forEach(bgpStateConsumer -> {
             final KeyedInstanceIdentifier<Rib, RibKey> ribId = bgpStateConsumer.getInstanceIdentifier();
             final List<BGPPeerState> peerStats = this.stateCollector.getPeerStats().stream()
                     .filter(BGPPeerState::isActive).filter(peerState -> ribId.equals(peerState.getInstanceIdentifier()))
@@ -122,7 +122,7 @@ public final class StateProviderImpl implements TransactionChainListener, AutoCl
         wtx.delete(LogicalDatastoreType.OPERATIONAL, bgpIID);
     }
 
-    private synchronized void storeOperationalState(final BGPRIBState bgpStateConsumer,
+    private synchronized void storeOperationalState(final BGPRibState bgpStateConsumer,
             final List<BGPPeerState> peerStats, final String ribId, final WriteTransaction wtx) {
         final Global global = GlobalUtil.buildGlobal(bgpStateConsumer, this.bgpTableTypeRegistry);
         final PeerGroups peerGroups = PeerGroupUtil.buildPeerGroups(peerStats);

diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java
index c92d5d61ef0249ed604638c8839d793a39323217..10d0e9631ef51ef473608a6f54e8fdf647568972 100644 (file)
--- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java
+++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java
@@ -19,11 +19,11 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 
 public class GlobalUtilTest {
     @Mock
-    private BGPRIBState ribState;
+    private BGPRibState ribState;
     @Mock
     private BGPTableTypeRegistryConsumer tableRegistry;
 

diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
index 474550c002c482e2099dc3bffe5ca62160ae9a41..a27b82bb17c9da69ee82690389fe6cb691e90277 100644 (file)
--- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
+++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java
@@ -37,7 +37,7 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPErrorHandlingState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPGracelfulRestartState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerMessagesState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPStateConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
@@ -139,7 +139,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest {
     @Mock
     private BGPTableTypeRegistryConsumer tableTypeRegistry;
     @Mock
-    private BGPRIBState bgpRibState;
+    private BGPRibState bgpRibState;
     @Mock
     private BGPPeerState bgpPeerState;
     @Mock
@@ -158,7 +158,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest {
     private BGPAfiSafiState bgpAfiSafiState;
 
     private final List<BGPPeerState> bgpPeerStates = new ArrayList<>();
-    private final List<BGPRIBState> bgpRibStates = new ArrayList<>();
+    private final List<BGPRibState> bgpRibStates = new ArrayList<>();
 
     @Before
     public void setUp() throws Exception {
@@ -185,7 +185,7 @@ public class StateProviderImplTest extends AbstractConcurrentDataBrokerTest {
         doAnswer(invocation -> this.totalPrefixesCounter.longValue())
                 .when(this.bgpRibState).getPrefixesCount(eq(TABLES_KEY));
         doAnswer(invocation -> Collections.singletonMap(TABLES_KEY,
-            this.totalPrefixesCounter.longValue())).when(this.bgpRibState).getPrefixesCount();
+            this.totalPrefixesCounter.longValue())).when(this.bgpRibState).getTablesPrefixesCount();
         doAnswer(invocation -> Collections.singletonMap(TABLES_KEY,
             this.totalPathsCounter.longValue())).when(this.bgpRibState).getPathsCount();
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
index 85eaa1301cd6eb24c6618f14249f27f617908ff7..e750ad3a652bbc70996eaef63b4655eed4235b71 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java
@@ -40,8 +40,8 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry;
 import org.opendaylight.protocol.bgp.rib.spi.BGPPeerTracker;
 import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
 import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.Config;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
@@ -62,7 +62,7 @@ import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class RibImpl implements RIB, BGPRIBStateConsumer, AutoCloseable {
+public final class RibImpl implements RIB, BGPRibStateConsumer, AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(RibImpl.class);
 
@@ -281,7 +281,7 @@ public final class RibImpl implements RIB, BGPRIBStateConsumer, AutoCloseable {
     }
 
     @Override
-    public BGPRIBState getRIBState() {
+    public BGPRibState getRIBState() {
         return this.ribImpl.getRIBState();
     }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/InstanceType.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/InstanceType.java
index 5192d0bcce941219ebf88d6da02977c0dbcf3a88..97c391240abea2e28bfad623af3b767267d01f54 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/InstanceType.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/InstanceType.java
@@ -14,11 +14,11 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.opendaylight.protocol.bgp.rib.RibReference;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer;
 
 public enum InstanceType {
 
-    RIB("ribImpl", ImmutableList.of(RIB.class, RibReference.class, BGPRIBStateConsumer.class)),
+    RIB("ribImpl", ImmutableList.of(RIB.class, RibReference.class, BGPRibStateConsumer.class)),
 
     PEER("bgpPeer", ImmutableList.of(BGPPeerStateConsumer.class)),
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java
index e8a5b92f65493278b2044660a696871f684ba906..2370a38b8e85f91a52717edf9ac11193136f06ee 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java
@@ -19,8 +19,8 @@ import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.protocol.bgp.rib.DefaultRibReference;
 import org.opendaylight.protocol.bgp.rib.impl.state.rib.TotalPathsCounter;
 import org.opendaylight.protocol.bgp.rib.impl.state.rib.TotalPrefixesCounter;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.Rib;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.bgp.rib.RibKey;
@@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 
-public class BGPRIBStateImpl extends DefaultRibReference implements BGPRIBState, BGPRIBStateConsumer {
+public class BGPRIBStateImpl extends DefaultRibReference implements BGPRibState, BGPRibStateConsumer {
     private final BgpId routeId;
     private final AsNumber localAs;
     @GuardedBy("this")
@@ -46,7 +46,7 @@ public class BGPRIBStateImpl extends DefaultRibReference implements BGPRIBState,
     }
 
     @Override
-    public final synchronized Map<TablesKey, Long> getPrefixesCount() {
+    public final synchronized Map<TablesKey, Long> getTablesPrefixesCount() {
         return this.totalPrefixes.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
             (entry) -> entry.getValue().getPrefixesCount()));
     }
@@ -107,7 +107,7 @@ public class BGPRIBStateImpl extends DefaultRibReference implements BGPRIBState,
     }
 
     @Override
-    public final BGPRIBState getRIBState() {
+    public final BGPRibState getRIBState() {
         return this;
     }
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
index c865a08eb42cf6cbf7b4ae6b20babcaee17d4552..c06eb4d80f8496b2a5483c2c5941d6b7a4a5f215 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImpl.java
@@ -16,24 +16,24 @@ import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPStateConsumer;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPStateProvider;
 
 @ThreadSafe
 public class BGPStateCollectorImpl implements BGPStateProvider, BGPStateConsumer {
     @GuardedBy("this")
-    private final List<BGPRIBStateConsumer> bgpRibStates = new ArrayList<>();
+    private final List<BGPRibStateConsumer> bgpRibStates = new ArrayList<>();
     @GuardedBy("this")
     private final List<BGPPeerStateConsumer> bgpPeerStates = new ArrayList<>();
 
     @Override
-    public List<BGPRIBState> getRibStats() {
+    public List<BGPRibState> getRibStats() {
         synchronized (this.bgpRibStates) {
             return ImmutableList.copyOf(this.bgpRibStates
                     .stream()
-                    .map(BGPRIBStateConsumer::getRIBState)
+                    .map(BGPRibStateConsumer::getRIBState)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList()));
         }
@@ -51,7 +51,7 @@ public class BGPStateCollectorImpl implements BGPStateProvider, BGPStateConsumer
     }
 
     @Override
-    public void bind(final BGPRIBStateConsumer bgpState) {
+    public void bind(final BGPRibStateConsumer bgpState) {
         if (bgpState == null) {
             return;
         }
@@ -61,7 +61,7 @@ public class BGPStateCollectorImpl implements BGPStateProvider, BGPStateConsumer
     }
 
     @Override
-    public void unbind(final BGPRIBStateConsumer bgpState) {
+    public void unbind(final BGPRibStateConsumer bgpState) {
         if (bgpState == null) {
             return;
         }

diff --git a/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml b/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
index 8563c7c8bc80cfc4ebf44923718a23c6c42d56ee..a74d4b41f22d7ce1ecf6efa67c38e5aef9ad41f8 100644 (file)
--- a/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
+++ b/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
@@ -70,7 +70,7 @@
   <bean id="bgpStateCollector" class="org.opendaylight.protocol.bgp.rib.impl.state.BGPStateCollectorImpl"/>
   <service ref="bgpStateCollector" interface="org.opendaylight.protocol.bgp.rib.spi.state.BGPStateConsumer"/>
 
-  <reference-list id="ribStatsListener" interface="org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer"
+  <reference-list id="ribStatsListener" interface="org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer"
     availability="optional">
       <reference-listener bind-method="bind" unbind-method="unbind">
           <ref component-id="bgpStateCollector"/>

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
index 16f0aad31d0ccc12916e805b9fe7768c84619495..6ea2eb5002591bd49ce30056b90132442ea1e67c 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AddPathAllPathsTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.protocol.bgp.rib.spi.state.BGPErrorHandlingState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPGracelfulRestartState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerMessagesState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
@@ -180,9 +180,9 @@ public class AddPathAllPathsTest extends AbstractAddPathTest {
         assertFalse(afiSafiStatePeer1.isPeerRestarting());
         assertTrue(afiSafiStatePeer1.isAfiSafiSupported(TABLES_KEY));
 
-        final BGPRIBState ribState = this.ribImpl.getRIBState();
+        final BGPRibState ribState = this.ribImpl.getRIBState();
         assertEquals(1, ribState.getPathsCount().size());
-        assertEquals(1L,  ribState.getPrefixesCount().size());
+        assertEquals(1L,  ribState.getTablesPrefixesCount().size());
         assertEquals(BGP_ID, ribState.getRouteId());
         assertEquals(AS_NUMBER, ribState.getAs());
         assertEquals(1L, ribState.getPathCount(TABLES_KEY));

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImplTest.java
index dc5f3584fb6f38f9123a19d017fb7b9e2a78b350..50af403923597de2fc30646cfb14cd876dea08c8 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImplTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPStateCollectorImplTest.java
@@ -19,12 +19,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
 import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerStateConsumer;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBStateConsumer;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibStateConsumer;
 
 public class BGPStateCollectorImplTest {
     @Mock
-    private BGPRIBStateConsumer bgpribStateConsumer;
+    private BGPRibStateConsumer bgpribStateConsumer;
     @Mock
     private BGPPeerStateConsumer bgpPeerStateConsumer;
 
@@ -36,9 +36,9 @@ public class BGPStateCollectorImplTest {
     @Test
     public void getRibStatsTest() throws Exception {
         doReturn(mock(BGPPeerState.class)).when(this.bgpPeerStateConsumer).getPeerState();
-        doReturn(mock(BGPRIBState.class)).when(this.bgpribStateConsumer).getRIBState();
+        doReturn(mock(BGPRibState.class)).when(this.bgpribStateConsumer).getRIBState();
         final BGPStateCollectorImpl collector = new BGPStateCollectorImpl();
-        final BGPRIBStateConsumer ribStateConsumerNull = null;
+        final BGPRibStateConsumer ribStateConsumerNull = null;
         collector.bind(ribStateConsumerNull);
         assertTrue(collector.getRibStats().isEmpty());
 
@@ -59,10 +59,10 @@ public class BGPStateCollectorImplTest {
 
     @Test
     public void getRibStatsEmptyPeerTest() throws Exception {
-        doReturn(mock(BGPRIBState.class)).when(this.bgpribStateConsumer).getRIBState();
+        doReturn(mock(BGPRibState.class)).when(this.bgpribStateConsumer).getRIBState();
         doReturn(null).when(this.bgpPeerStateConsumer).getPeerState();
         final BGPStateCollectorImpl collector = new BGPStateCollectorImpl();
-        final BGPRIBStateConsumer ribStateConsumerNull = null;
+        final BGPRibStateConsumer ribStateConsumerNull = null;
         collector.bind(ribStateConsumerNull);
         assertTrue(collector.getRibStats().isEmpty());
 
@@ -81,7 +81,7 @@ public class BGPStateCollectorImplTest {
         doReturn(null).when(this.bgpribStateConsumer).getRIBState();
         doReturn(null).when(this.bgpPeerStateConsumer).getPeerState();
         final BGPStateCollectorImpl collector = new BGPStateCollectorImpl();
-        final BGPRIBStateConsumer ribStateConsumerNull = null;
+        final BGPRibStateConsumer ribStateConsumerNull = null;
         collector.bind(ribStateConsumerNull);
         assertTrue(collector.getRibStats().isEmpty());
 

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index d7e1ab329cd0d125e43ac41638ace32e2b110ecd..b2598c1dc680276654733172b5bdfe7336fe7a6b 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -147,13 +147,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <propertyExpansion>checkstyle.violationSeverity=warning</propertyExpansion>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
index 8ff1ab55686c24dbccca286706ebdf9f7fd63da1..fcce1a994f4d8459d882994be2a7d25a68959b5c 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
@@ -114,9 +114,10 @@ public abstract class AbstractRIBSupport<R extends Route, N extends Identifier>
         this.listClass = requireNonNull(listClass);
         this.routeQname = QName.create(qname, BindingReflections.findQName(listClass).intern().getLocalName());
         this.routesListIdentifier = new NodeIdentifier(this.routeQname);
-        this.emptyRoutes = Builders.choiceBuilder().withNodeIdentifier(ROUTES).addChild(Builders.containerBuilder()
-                .withNodeIdentifier(routesContainerIdentifier()).withChild(ImmutableNodes.mapNodeBuilder(this.routeQname)
-                        .build()).build()).build();
+        this.emptyRoutes = Builders.choiceBuilder().withNodeIdentifier(ROUTES)
+                .addChild(Builders.containerBuilder()
+                .withNodeIdentifier(routesContainerIdentifier())
+                .withChild(ImmutableNodes.mapNodeBuilder(this.routeQname).build()).build()).build();
         this.afiClass = afiClass;
         this.safiClass = safiClass;
         this.destinationNid = new NodeIdentifier(destinationQname);
@@ -222,7 +223,7 @@ public abstract class AbstractRIBSupport<R extends Route, N extends Identifier>
     /**
      * Given the destination as ContainerNode, implementation needs to parse the DOM model
      * from this point onward:
-     * <p>
+     *
      * {@code /bgp-mp:mp-unreach-nlri/bgp-mp:withdrawn-routes/bgp-mp:destination-type}
      * and delete the routes from its RIBs.
      *
@@ -239,7 +240,7 @@ public abstract class AbstractRIBSupport<R extends Route, N extends Identifier>
     /**
      * Given the destination as ContainerNode, implementation needs to parse the DOM model
      * from this point onward:
-     * <p>
+     *
      * {@code /bgp-mp:mp-reach-nlri/bgp-mp:advertized-routes/bgp-mp:destination-type}
      * and put the routes to its RIBs.
      *

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPPeerTracker.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPPeerTracker.java
index 06391b3614f12a845b137f59bb5e328f7a1cf960..44991270e69ca1f4a3ecf8f3da539150d86aae81 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPPeerTracker.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPPeerTracker.java
@@ -9,13 +9,10 @@
 package org.opendaylight.protocol.bgp.rib.spi;
 
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.protocol.concepts.AbstractRegistration;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerRole;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.rib.TablesKey;
 
 /**
  * Tracks Peers under RIB.
@@ -30,7 +27,7 @@ public interface BGPPeerTracker {
     AbstractRegistration registerPeer(@Nonnull Peer peer);
 
     /**
-     * Returns Peer
+     * Returns Peer.
      *
      * @param peerId peer ID
      * @return Peer

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java
index bff89dd6817a99acabb27e803b732c4387bcae71..256c84624f9c537cbe65d8787ff6bce03a0e7413 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java
@@ -28,9 +28,9 @@ public final class BGPTerminationReason {
     }
 
     @Override
-    public boolean equals(final Object o) {
-        return (o instanceof BGPTerminationReason) &&
-                Objects.equals(this.error, ((BGPTerminationReason) o).error);
+    public boolean equals(final Object terminationReason) {
+        return (terminationReason instanceof BGPTerminationReason)
+                && Objects.equals(this.error, ((BGPTerminationReason) terminationReason).error);
     }
 
     @Override

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerTrackerInformation.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerTrackerInformation.java
index 5b87d07868fcca4b0a9c781475b84cc543765d20..33adfda959fbe67ef10bf9b789bae29118d9adbd 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerTrackerInformation.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerTrackerInformation.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 public interface PeerTrackerInformation {
 
     /**
-     * Returns PeerID
+     * Returns Peer id.
      *
      * @return PeerID
      */

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java
index d9eda9eb3f0f7499775a9fc2ed6d4d7116204d6e..aac6c6b6de02597bf46d6ef682d14d2f264b70d5 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java
@@ -250,8 +250,8 @@ public interface RIBSupport<R extends Route, N extends Identifier> {
      * @param routeKey routeKey Path Argument
      * @return new route Key
      */
-    default @Nonnull
-    NodeIdentifierWithPredicates createRouteKeyPathArgument(@Nonnull NodeIdentifierWithPredicates routeKey) {
+    @Nonnull
+    default NodeIdentifierWithPredicates createRouteKeyPathArgument(@Nonnull NodeIdentifierWithPredicates routeKey) {
         return routeKey;
     }
 }

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryInfo.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryInfo.java
index 4c24fda33ae62fd0aa8b01c2b25fbe40a9f03cbe..cf41c89fc7a2f20177552ef5a455d6ccb0f5dfd2 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryInfo.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/entry/RouteEntryInfo.java
@@ -9,9 +9,7 @@ package org.opendaylight.protocol.bgp.rib.spi.entry;
 
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.bgp.rib.spi.Peer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerId;
 import org.opendaylight.yangtools.yang.binding.Identifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 /**
  * RouteEntryInfo wrapper contains all related information from new best path.

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/policy/BGPRouteEntryImportParameters.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/policy/BGPRouteEntryImportParameters.java
index 932d640cfa1cbe4fcceb1d8b9a16eaab371c93c7..a7cf420ab0e64677c6c6e6781bd7f9458dac89f1 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/policy/BGPRouteEntryImportParameters.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/policy/BGPRouteEntryImportParameters.java
@@ -8,11 +8,8 @@
 package org.opendaylight.protocol.bgp.rib.spi.policy;
 
 import javax.annotation.Nonnull;
-import org.opendaylight.protocol.bgp.rib.spi.Peer;
-import org.opendaylight.protocol.bgp.rib.spi.entry.RouteEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev171207.PeerRole;
-import org.opendaylight.yangtools.yang.binding.Identifier;
 
 /**
  * Contains Peer destiny information for import route entry.

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBState.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibState.java
similarity index 79%
rename from bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBState.java
rename to bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibState.java
index 4dccb9bd8cc5a6171ea0ba061845051fe9e4d4db..e5236351bb3e341f9c647992f1d54b3f30edfda6 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBState.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibState.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.protocol.bgp.rib.spi.state;
 
-
 import java.util.Map;
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.bgp.rib.RibReference;
@@ -17,28 +16,28 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
 
 /**
- * Representing RIB Operational State information
+ * Representing RIB Operational State information.
  * -PeerGroup States.
  * Total Paths / Total Prefixes counters, representing the paths / prefixes installed on Loc-rib
  */
-public interface BGPRIBState extends RibReference {
+public interface BGPRibState extends RibReference {
     /**
-     * Indicates whether this instance is being actively managed and updated
+     * Indicates whether this instance is being actively managed and updated.
      *
      * @return active
      */
     boolean isActive();
 
     /**
-     * Prefixes count per tablesKey Type
+     * Prefixes count per tablesKey Type.
      *
      * @return Prefixes count
      */
     @Nonnull
-    Map<TablesKey, Long> getPrefixesCount();
+    Map<TablesKey, Long> getTablesPrefixesCount();
 
     /**
-     * Mapped Total Paths Count per TableKey
+     * Mapped Total Paths Count per TableKey.
      *
      * @return Prefixes count
      */
@@ -46,21 +45,21 @@ public interface BGPRIBState extends RibReference {
     Map<TablesKey, Long> getPathsCount();
 
     /**
-     * Total Paths Installed
+     * Total Paths Installed.
      *
      * @return count
      */
     long getTotalPathsCount();
 
     /**
-     * Total Prefixes Installed
+     * Total Prefixes Installed.
      *
      * @return count
      */
     long getTotalPrefixesCount();
 
     /**
-     * Total Path Installed per specific TableKey
+     * Total Path Installed per specific TableKey.
      *
      * @param tablesKey table key
      * @return count
@@ -68,7 +67,7 @@ public interface BGPRIBState extends RibReference {
     long getPathCount(TablesKey tablesKey);
 
     /**
-     * Total Prefixes Installed per specific TableKey
+     * Total Prefixes Installed per specific TableKey.
      *
      * @param tablesKey table key
      * @return count
@@ -76,7 +75,7 @@ public interface BGPRIBState extends RibReference {
     long getPrefixesCount(TablesKey tablesKey);
 
     /**
-     * AS
+     * AS.
      *
      * @return as
      */
@@ -84,7 +83,8 @@ public interface BGPRIBState extends RibReference {
     AsNumber getAs();
 
     /**
-     * BGP identifier
+     * BGP identifier.
+     *
      * @return BGP identifier
      */
     @Nonnull

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBStateConsumer.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibStateConsumer.java
similarity index 74%
rename from bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBStateConsumer.java
rename to bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibStateConsumer.java
index 10d0864d3a36dd07f9c37849efcc8a4d8aacad99..855229b3b586d03dd9e002e78b81d8bad45ec38c 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRIBStateConsumer.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPRibStateConsumer.java
@@ -11,13 +11,14 @@ package org.opendaylight.protocol.bgp.rib.spi.state;
 import javax.annotation.Nonnull;
 
 /**
- *  Interface for acquiring BGP RIB State
+ * Interface for acquiring BGP RIB State.
  */
-public interface BGPRIBStateConsumer {
+public interface BGPRibStateConsumer {
     /**
-     * Returns RIB Operational State
+     * Returns RIB Operational State.
+     *
      * @return BGP RIB State
      */
     @Nonnull
-    BGPRIBState getRIBState();
+    BGPRibState getRIBState();
 }

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateConsumer.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateConsumer.java
index 5dd42b00b7174f2e72922e2c147dec389a53eaf4..aa10e3dc20a7e1df63c4e6c81a6b0440b8213137 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateConsumer.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateConsumer.java
@@ -21,7 +21,7 @@ public interface BGPStateConsumer {
      * @return ribs stats
      */
     @Nonnull
-    List<BGPRIBState> getRibStats();
+    List<BGPRibState> getRibStats();
 
     /**
      * List of Registered BGP Peer State.

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateProvider.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateProvider.java
index 6f3a0db4c127b97670fb45a30306a6f3659052ce..2875954ad1581928526a2720c6ded04e873b9d4f 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateProvider.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/state/BGPStateProvider.java
@@ -19,14 +19,14 @@ public interface BGPStateProvider {
      *
      * @param bgpState rib State
      */
-    void bind(@Nonnull BGPRIBStateConsumer bgpState);
+    void bind(@Nonnull BGPRibStateConsumer bgpState);
 
     /**
      * Unregister Rib state.
      *
      * @param bgpState Rib/Peer State
      */
-    void unbind(@Nonnull BGPRIBStateConsumer bgpState);
+    void unbind(@Nonnull BGPRibStateConsumer bgpState);
 
     /**
      * registerRib/Peer state.

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
index dcf624a8c6165ef62a02498ac40416d2caba7877..0bca8e236d6f139ba8b971d6639539f1f4c8e18d 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/MultiPathAbstractRIBSupportTest.java
@@ -93,13 +93,13 @@ public class MultiPathAbstractRIBSupportTest {
     private DataTreeCandidateNode subTree;
     private DOMDataWriteTransaction tx;
     private ContainerNode nlri;
-    private Map<YangInstanceIdentifier, NormalizedNode<?, ?>> routes;
+    private Map<YangInstanceIdentifier, NormalizedNode<?, ?>> routesMap;
     private ContainerNode attributes;
     private MapEntryNode mapEntryNode;
 
     @Before
     public void setUp() {
-        this.routes = new HashMap<>();
+        this.routesMap = new HashMap<>();
         MockitoAnnotations.initMocks(this);
         this.emptyTree = Mockito.mock(DataTreeCandidateNode.class);
         this.emptySubTree = Mockito.mock(DataTreeCandidateNode.class);
@@ -136,13 +136,13 @@ public class MultiPathAbstractRIBSupportTest {
 
         doAnswer(invocation -> {
             final Object[] args = invocation.getArguments();
-            MultiPathAbstractRIBSupportTest.this.routes.remove(args[1]);
+            MultiPathAbstractRIBSupportTest.this.routesMap.remove(args[1]);
             return args[1];
         }).when(this.tx).delete(Mockito.eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class));
         doAnswer(invocation -> {
             final Object[] args = invocation.getArguments();
             final NormalizedNode<?, ?> node1 = (NormalizedNode<?, ?>) args[2];
-            MultiPathAbstractRIBSupportTest.this.routes.put((YangInstanceIdentifier) args[1], node1);
+            MultiPathAbstractRIBSupportTest.this.routesMap.put((YangInstanceIdentifier) args[1], node1);
             return args[1];
         }).when(this.tx).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class),
                 any(NormalizedNode.class));
@@ -233,13 +233,13 @@ public class MultiPathAbstractRIBSupportTest {
     @Test
     public void putRoutes() {
         MULTI_PATH_ABSTRACT_TEST.putRoutes(this.tx, LOC_RIB_TARGET, this.nlri, this.attributes);
-        assertFalse(this.routes.isEmpty());
+        assertFalse(this.routesMap.isEmpty());
     }
 
     @Test
     public void deleteRoutes() {
         MULTI_PATH_ABSTRACT_TEST.deleteRoutes(this.tx, LOC_RIB_TARGET, this.nlri);
-        assertTrue(this.routes.isEmpty());
+        assertTrue(this.routesMap.isEmpty());
     }
 
 

diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml
index 7ed2e309f920863907922b75f912e28d8050596a..6189c13419dc6a1e32dd52a4b9a1b1f4669f4787 100644 (file)
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -8,7 +8,8 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
@@ -44,11 +45,11 @@
                 <configuration>
                      <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                  </configuration> -->
-                 <dependencies>
-                     <dependency>
-                         <groupId>org.opendaylight.yangtools</groupId>
-                         <artifactId>checkstyle-logging</artifactId>
-                         <version>2.0.2</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>checkstyle-logging</artifactId>
+                        <version>2.0.2</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/parent/pom.xml b/parent/pom.xml
index 45eae1adad952c348d9f1ad7e0191cd6e952ae4d..f6f8d1cd11ca915316ead13afa476fbdd732b22d 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -170,6 +170,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>checkstyle-logging</artifactId>
+                        <!-- FIXME: remove this declaration when bumping to 2.0.2 -->
+                        <version>2.0.1</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                 </configuration>