BUG-7098: Fix Sonar complains

Fix duplicate code
Naming conventions

Change-Id: I2425fc111b5890100cda942913b0d617b4029f2c
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>

diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java
index e9a89b11e5b84e3305a7a0d666f9937ef4b5d98b..f74da66854bc89daaf23e1bcc07039339a422978 100644 (file)
--- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java
+++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java
@@ -20,20 +20,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 
 public final class RIBActivator extends AbstractRIBExtensionProviderActivator {
 
-    private final SimpleFlowspecExtensionProviderContext fs_context;
+    private final SimpleFlowspecExtensionProviderContext fsContext;
 
     public RIBActivator(SimpleFlowspecExtensionProviderContext context) {
         super();
-        this.fs_context = context;
+        this.fsContext = context;
     }
 
     @Override
     protected List<AutoCloseable> startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) {
         final List<AutoCloseable> regs = new ArrayList<>();
-        regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv4RIBSupport.getInstance(fs_context)));
-        regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv6RIBSupport.getInstance(fs_context)));
-        regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv4RIBSupport.getInstance(fs_context)));
-        regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv6RIBSupport.getInstance(fs_context)));
+        regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv4RIBSupport.getInstance(fsContext)));
+        regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv6RIBSupport.getInstance(fsContext)));
+        regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv4RIBSupport.getInstance(fsContext)));
+        regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv6RIBSupport.getInstance(fsContext)));
         return regs;
     }
 }

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/ActivatorTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/ActivatorTest.java
index 3ed0796e45c50e42e575233cbd95634f8038f1d3..93cbe939d3954bc1590cff3eb4d072fbcb40da4e 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/ActivatorTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/ActivatorTest.java
@@ -21,8 +21,8 @@ public class ActivatorTest {
 
     @Test
     public void testActivator() throws Exception {
-        final SimpleFlowspecExtensionProviderContext fs_context = new SimpleFlowspecExtensionProviderContext();
-        final FlowspecActivator activator = new FlowspecActivator(fs_context);
+        final SimpleFlowspecExtensionProviderContext fsContext = new SimpleFlowspecExtensionProviderContext();
+        final FlowspecActivator activator = new FlowspecActivator(fsContext);
         final BGPActivator act = new BGPActivator(activator);
         final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
         assertNull(context.getSubsequentAddressFamilyRegistry().classForFamily(FLOWSPEC_SAFI));

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
index 763e3fb91d14bc3db532668d33a60869289e5aee..ce77ff3eb6cc8b45f393dd62bec9d8e4d4dee3ac 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv4RIBSupportTest.java
@@ -69,15 +69,15 @@ public class FlowspecIpv4RIBSupportTest extends AbstractRIBSupportTest {
         .attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecCaseBuilder().setDestinationFlowspec(DEST_FLOW).build();
 
     static {
-        final SimpleFlowspecExtensionProviderContext fs_context = new SimpleFlowspecExtensionProviderContext();
-        final FlowspecActivator activator = new FlowspecActivator(fs_context);
+        final SimpleFlowspecExtensionProviderContext fsContext = new SimpleFlowspecExtensionProviderContext();
+        final FlowspecActivator activator = new FlowspecActivator(fsContext);
         final BGPActivator act = new BGPActivator(activator);
         final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
         act.start(context);
-        RIB_SUPPORT = FlowspecIpv4RIBSupport.getInstance(fs_context);
+        RIB_SUPPORT = FlowspecIpv4RIBSupport.getInstance(fsContext);
 
         final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(
-            fs_context.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC));
+            fsContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC));
 
         ROUTE_KEY = new FlowspecRouteKey(PATH_ID, parser.stringNlri(FLOW_LIST));
         ROUTE = new FlowspecRouteBuilder().setKey(ROUTE_KEY).setPathId(PATH_ID).setFlowspec(FLOW_LIST)

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
index 41e44c76c68bd18d2b3e78ac6c2699a371da3448..e02e959dfb4e3d6ca10c944a2c5dea0d444683c8 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecIpv6RIBSupportTest.java
@@ -68,15 +68,15 @@ public class FlowspecIpv6RIBSupportTest extends AbstractRIBSupportTest {
         .attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6CaseBuilder().setDestinationFlowspec(DEST_FLOW).build();
     private static final FlowspecIpv6Routes ROUTES;
     static {
-        final SimpleFlowspecExtensionProviderContext fs_context = new SimpleFlowspecExtensionProviderContext();
-        final FlowspecActivator activator = new FlowspecActivator(fs_context);
+        final SimpleFlowspecExtensionProviderContext fsContext = new SimpleFlowspecExtensionProviderContext();
+        final FlowspecActivator activator = new FlowspecActivator(fsContext);
         final BGPActivator act = new BGPActivator(activator);
         final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
         act.start(context);
-        RIB_SUPPORT = FlowspecIpv6RIBSupport.getInstance(fs_context);
+        RIB_SUPPORT = FlowspecIpv6RIBSupport.getInstance(fsContext);
 
         final SimpleFlowspecIpv6NlriParser parser = new SimpleFlowspecIpv6NlriParser(
-            fs_context.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC));
+            fsContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC));
 
         ROUTE_KEY = new FlowspecRouteKey(PATH_ID, parser.stringNlri(FLOW_LIST));
         ROUTE = new FlowspecRouteBuilder().setKey(ROUTE_KEY).setPathId(PATH_ID).setFlowspec(FLOW_LIST)

diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
index ab9a33b9b4e4e542579580a0fc887057c9d2ef40..2ee64174d38f5b8a443992ea68ca7f4e6357a76d 100644 (file)
--- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
+++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
@@ -82,8 +82,8 @@ public class FSExtendedCommunitiesTest {
 
     @Before
     public void setUp() throws Exception {
-        final SimpleFlowspecExtensionProviderContext fs_context = new SimpleFlowspecExtensionProviderContext();
-        final FlowspecActivator activator = new FlowspecActivator(fs_context);
+        final SimpleFlowspecExtensionProviderContext fsContext = new SimpleFlowspecExtensionProviderContext();
+        final FlowspecActivator activator = new FlowspecActivator(fsContext);
 
         this.act= new BGPActivator(activator);
         final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java
index b16feb38a0c9afc0c2071c88da1923ed1b2a1f85..497175d1abc600c7d3998bb801fcd95936f45c82 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathAbstractRouteEntry.java
@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.concurrent.NotThreadSafe;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.protocol.bgp.mode.api.BestPath;
 import org.opendaylight.protocol.bgp.mode.spi.AbstractRouteEntry;
@@ -199,8 +198,8 @@ public abstract class AddPathAbstractRouteEntry extends AbstractRouteEntry {
                 for (final Map.Entry<PeerId, PeerExporTuple> pid : peerGroup.getPeers()) {
                     final PeerId destPeer = pid.getKey();
                     final boolean destPeerSupAddPath = peerPT.isAddPathSupportedByPeer(destPeer);
-                    if (filterRoutes(routePeerId, destPeer, peerPT, localTK, getRoutePeerIdRole(peerPT, destPeer))
-                        && peersSupportsAddPathOrIsFirstBestPath(destPeerSupAddPath, isFirstBestPath)) {
+                    if (filterRoutes(routePeerId, destPeer, peerPT, localTK, role) &&
+                        peersSupportsAddPathOrIsFirstBestPath(destPeerSupAddPath, isFirstBestPath)) {
                         if (destPeerSupAddPath) {
                             update(destPeer, getAdjRibOutYII(ribSup, pid.getValue().getYii(), routeIdAddPath, localTK), effectiveAttributes,
                                 addPathValue, ribSup, tx);
@@ -213,13 +212,6 @@ public abstract class AddPathAbstractRouteEntry extends AbstractRouteEntry {
         }
     }
 
-    private void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttr, final NormalizedNode<?, ?> value,
-        final RIBSupport ribSup, final DOMDataWriteTransaction tx) {
-        if (!writeRoute(destPeer, routeTarget, effAttr, value, ribSup, tx)) {
-            LOG.trace("Removing {} from transaction for peer {}", routeTarget, destPeer);
-            tx.delete(LogicalDatastoreType.OPERATIONAL, routeTarget);
-        }
-    }
 
     protected final OffsetMap getOffsets() {
         return this.offsets;

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java
index 62a02f3db43ea6903558051727184c11750f8e39..395e51cb4854781044c90d951e8338eb59893577 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseAbstractRouteEntry.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.mode.impl.base;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedInteger;
 import javax.annotation.concurrent.NotThreadSafe;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.protocol.bgp.mode.api.BestPath;
 import org.opendaylight.protocol.bgp.mode.spi.AbstractRouteEntry;
@@ -185,12 +184,4 @@ abstract class BaseAbstractRouteEntry extends AbstractRouteEntry {
             }
         }
     }
-
-    private void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttrib,
-        final NormalizedNode<?, ?> value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) {
-        if (!writeRoute(destPeer, routeTarget, effAttrib, value, ribSup, tx)) {
-            LOG.trace("Removing {} from transaction for peer {}", routeTarget, destPeer);
-            tx.delete(LogicalDatastoreType.OPERATIONAL, routeTarget);
-        }
-    }
 }
\ No newline at end of file

diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java
index 4add989b692b5264826313c2b810f39ea2637c1f..41533b217b5e8f1f44a1d9bbe0c3c237ce2e0767 100644 (file)
--- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java
+++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractRouteEntry.java
@@ -43,6 +43,14 @@ public abstract class AbstractRouteEntry implements RouteEntry {
         }
     }
 
+
+    protected final void update(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttr,
+        final NormalizedNode<?, ?> value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) {
+        if (!writeRoute(destPeer, routeTarget, effAttr, value, ribSup, tx)) {
+            deleteRoute(destPeer, routeTarget, tx);
+        }
+    }
+
     protected final boolean writeRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final ContainerNode effAttrib,
         final NormalizedNode<?, ?> value, final RIBSupport ribSup, final DOMDataWriteTransaction tx) {
         if (effAttrib != null && value != null) {
@@ -54,6 +62,11 @@ public abstract class AbstractRouteEntry implements RouteEntry {
         return false;
     }
 
+    private void deleteRoute(final PeerId destPeer, final YangInstanceIdentifier routeTarget, final DOMDataWriteTransaction tx) {
+        LOG.trace("Removing {} from transaction for peer {}", routeTarget, destPeer);
+        tx.delete(LogicalDatastoreType.OPERATIONAL, routeTarget);
+    }
+
     protected final boolean filterRoutes(final PeerId rootPeer, final PeerId destPeer, final ExportPolicyPeerTracker peerPT,        final TablesKey localTK, final PeerRole destPeerRole) {
         return !rootPeer.equals(destPeer) && isTableSupported(destPeer, peerPT, localTK) && !PeerRole.Internal.equals(destPeerRole);
     }

diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
index 117500dd8e6e8bcabdfc59f5c189c39eac0928f8..12dca52ac7746029195d92dcca8bb2a9ad5505cc 100644 (file)
--- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
+++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
@@ -85,8 +85,8 @@ final class BGPTestTool {
         final org.opendaylight.protocol.bgp.evpn.impl.BGPActivator evpnActivator = new org.opendaylight.protocol.bgp.evpn.impl.BGPActivator();
         evpnActivator.start(ctx);
 
-        final SimpleFlowspecExtensionProviderContext fs_context = new SimpleFlowspecExtensionProviderContext();
-        final FlowspecActivator flowspecActivator = new FlowspecActivator(fs_context);
+        final SimpleFlowspecExtensionProviderContext fsContext = new SimpleFlowspecExtensionProviderContext();
+        final FlowspecActivator flowspecActivator = new FlowspecActivator(fsContext);
         final org.opendaylight.protocol.bgp.flowspec.BGPActivator flowspecBGPActivator = new org.opendaylight.protocol.bgp.flowspec.BGPActivator(flowspecActivator);
         flowspecBGPActivator.start(ctx);