Removed some sonar warnings.

Inlcuding order of modifiers, magic numbers, unused
variables etc.

Change-Id: I4b77c48d558bbf02a3e99bb520656f133132d4f4
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FlowspecRIBSupport.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FlowspecRIBSupport.java
index 9add31d36f2ad7bdc51ad52775173f5564cfb8e4..6d554a049ffc7ecd0bc6c822c01e359269d1f471 100644 (file)
--- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FlowspecRIBSupport.java
+++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/FlowspecRIBSupport.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
 
 final class FlowspecRIBSupport extends AbstractRIBSupport {
 
-    private static abstract class ApplyRoute {
+    private abstract static class ApplyRoute {
         abstract void apply(DOMDataWriteTransaction tx, YangInstanceIdentifier base, NodeIdentifierWithPredicates routeKey, DataContainerNode<?> route, final ContainerNode attributes);
     }
 

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupport.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupport.java
index 417b86c16fd97b59d261fca3dfea5b9ecc0e304d..e65109c8d74e12e4cb26b86a3136de8e1cc9019f 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupport.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupport.java
@@ -58,7 +58,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 final class LinkstateRIBSupport extends AbstractRIBSupport {
-    private static abstract class ApplyRoute {
+    private abstract static class ApplyRoute {
         abstract void apply(DOMDataWriteTransaction tx, YangInstanceIdentifier base, NodeIdentifierWithPredicates routeKey, DataContainerNode<?> route, final ContainerNode attributes);
     }
 

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/nlri/PrefixNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/nlri/PrefixNlriParser.java
index e7c61e9c9d3f536157c858292da356fb6d4fb469..4b7d2ed28bc3687918e4b5e22d57ad5cb80dfdbf 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/nlri/PrefixNlriParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/nlri/PrefixNlriParser.java
@@ -156,6 +156,7 @@ public final class PrefixNlriParser {
                 prefixBytes = Ipv4Util.bytesForPrefixBegin(new Ipv4Prefix(prefix));
                 prefixType = NlriType.Ipv4Prefix;
             } catch(final IllegalArgumentException e) {
+                LOG.debug("Creating Ipv6 prefix because", e);
                 prefixBytes = Ipv6Util.bytesForPrefixBegin(new Ipv6Prefix(prefix));
                 prefixType = NlriType.Ipv6Prefix;
             }

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv4NlriParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv4NlriParser.java
index b5f7188657a327b727671888fdd3caea4927343a..6db05b60906f2a3f285b9b18a9fe4ce9f4f317ff 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv4NlriParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv4NlriParser.java
@@ -51,13 +51,13 @@ public final class Ipv4NlriParser implements NlriParser, NlriSerializer {
     }
 
     @Override
-    public final void parseNlri(final ByteBuf nlri, final MpUnreachNlriBuilder builder) {
+    public void parseNlri(final ByteBuf nlri, final MpUnreachNlriBuilder builder) {
         builder.setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv4CaseBuilder().setDestinationIpv4(
             prefixes(nlri)).build()).build());
     }
 
     @Override
-    public final void parseNlri(final ByteBuf nlri, final MpReachNlriBuilder builder) throws BGPParsingException {
+    public void parseNlri(final ByteBuf nlri, final MpReachNlriBuilder builder) throws BGPParsingException {
         builder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(new DestinationIpv4CaseBuilder().setDestinationIpv4(prefixes(nlri)).build()).build());
     }
 }
\ No newline at end of file

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv6NlriParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv6NlriParser.java
index 56e79fa10896ed12e7a4edc35bd62a3bbc3aba7f..b81498bc1c6c871f68a391bcb149c8db49978f78 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv6NlriParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/Ipv6NlriParser.java
@@ -37,13 +37,13 @@ public final class Ipv6NlriParser implements NlriParser {
     }
 
     @Override
-    public final void parseNlri(final ByteBuf nlri, final MpUnreachNlriBuilder builder) {
+    public void parseNlri(final ByteBuf nlri, final MpUnreachNlriBuilder builder) {
         builder.setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv6CaseBuilder().setDestinationIpv6(
             prefixes(nlri)).build()).build());
     }
 
     @Override
-    public final void parseNlri(final ByteBuf nlri, final MpReachNlriBuilder builder) throws BGPParsingException {
+    public void parseNlri(final ByteBuf nlri, final MpReachNlriBuilder builder) throws BGPParsingException {
         builder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(new DestinationIpv6CaseBuilder().setDestinationIpv6(prefixes(nlri)).build()).build());
     }
 }
\ No newline at end of file

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractIPRIBSupport.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractIPRIBSupport.java
index 0fdba51b4a41fd20dee4efa3ee606f5c9f68df9d..99a97d1892f7c4b4aa56530fee682c496c3ad8c6 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractIPRIBSupport.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractIPRIBSupport.java
@@ -41,20 +41,20 @@ import org.slf4j.LoggerFactory;
  * Common {@link org.opendaylight.protocol.bgp.rib.spi.RIBSupport} class for IPv4 and IPv6 addresses.
  */
 abstract class AbstractIPRIBSupport extends AbstractRIBSupport {
-    private static abstract class ApplyRoute {
+    private abstract static class ApplyRoute {
         abstract void apply(DOMDataWriteTransaction tx, YangInstanceIdentifier base, NodeIdentifierWithPredicates routeKey, DataContainerNode<?> route, final ContainerNode attributes);
     }
 
     private static final class DeleteRoute extends ApplyRoute {
         @Override
-        void apply(final DOMDataWriteTransaction tx, final YangInstanceIdentifier base, NodeIdentifierWithPredicates routeKey, final DataContainerNode<?> route, final ContainerNode attributes) {
+        void apply(final DOMDataWriteTransaction tx, final YangInstanceIdentifier base, final NodeIdentifierWithPredicates routeKey, final DataContainerNode<?> route, final ContainerNode attributes) {
             tx.delete(LogicalDatastoreType.OPERATIONAL, base.node(routeKey));
         }
     }
 
     private final class PutRoute extends ApplyRoute {
         @Override
-        void apply(final DOMDataWriteTransaction tx, final YangInstanceIdentifier base, NodeIdentifierWithPredicates routeKey, final DataContainerNode<?> route, final ContainerNode attributes) {
+        void apply(final DOMDataWriteTransaction tx, final YangInstanceIdentifier base, final NodeIdentifierWithPredicates routeKey, final DataContainerNode<?> route, final ContainerNode attributes) {
             final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> b = ImmutableNodes.mapEntryBuilder();
             b.withNodeIdentifier(routeKey);
 
@@ -118,7 +118,7 @@ abstract class AbstractIPRIBSupport extends AbstractRIBSupport {
         return false;
     }
 
-    private final void processDestination(final DOMDataWriteTransaction tx, final YangInstanceIdentifier tablePath,
+    private void processDestination(final DOMDataWriteTransaction tx, final YangInstanceIdentifier tablePath,
             final ContainerNode destination, final ContainerNode attributes, final ApplyRoute function) {
         if (destination != null) {
             final Optional<DataContainerChild<? extends PathArgument, ?>> maybeRoutes = destination.getChild(nlriRoutesListIdentifier());
@@ -128,7 +128,7 @@ abstract class AbstractIPRIBSupport extends AbstractRIBSupport {
                     // Instance identifier to table/(choice routes)/(map of route)
                     final YangInstanceIdentifier base = tablePath.node(ROUTES).node(routesContainerIdentifier()).node(routeIdentifier());
                     for (final UnkeyedListEntryNode e : ((UnkeyedListNode)routes).getValue()) {
-                        NodeIdentifierWithPredicates routeKey = createRouteKey(e);
+                        final NodeIdentifierWithPredicates routeKey = createRouteKey(e);
                         function.apply(tx, base, routeKey,  e, attributes);
                     }
                 } else {
@@ -138,10 +138,10 @@ abstract class AbstractIPRIBSupport extends AbstractRIBSupport {
         }
     }
 
-    private NodeIdentifierWithPredicates createRouteKey(UnkeyedListEntryNode e) {
-        Optional<DataContainerChild<? extends PathArgument, ?>> maybeKeyLeaf = e.getChild(routeKeyLeafIdentifier());
+    private NodeIdentifierWithPredicates createRouteKey(final UnkeyedListEntryNode e) {
+        final Optional<DataContainerChild<? extends PathArgument, ?>> maybeKeyLeaf = e.getChild(routeKeyLeafIdentifier());
         Preconditions.checkState(maybeKeyLeaf.isPresent());
-        Object keyValue = ((LeafNode<?>) maybeKeyLeaf.get()).getValue();
+        final Object keyValue = ((LeafNode<?>) maybeKeyLeaf.get()).getValue();
         return new NodeIdentifierWithPredicates(routeQName(), keyLeafQName(), keyValue);
     }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeerRoleTracker.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeerRoleTracker.java
index a1fda070bb51513e16c3db57162bea8c8261e674..a1614ecfabcfdc9f6171f391cacf60e95a6a36b7 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeerRoleTracker.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractPeerRoleTracker.java
@@ -70,7 +70,7 @@ abstract class AbstractPeerRoleTracker implements AutoCloseable {
     private static final QName PEER_ROLE = QName.cachedReference(QName.create(Peer.QNAME, "peer-role"));
     private final ListenerRegistration<?> registration;
 
-    protected AbstractPeerRoleTracker(final @Nonnull DOMDataTreeChangeService service, @Nonnull final YangInstanceIdentifier ribId) {
+    protected AbstractPeerRoleTracker(@Nonnull final DOMDataTreeChangeService service, @Nonnull final YangInstanceIdentifier ribId) {
         // Slightly evil, but our users should be fine with this
         final YangInstanceIdentifier roleId = ribId.node(Peer.QNAME).node(Peer.QNAME).node(PEER_ROLE);
         this.registration = service.registerDataTreeChangeListener(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, roleId), new PeerRoleListener());

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java
index d7fdcf7a759ecb029fbcd17d78bcb66556a4f04c..a14fd54a29ea613b381a36248f67491d968963b8 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java
@@ -44,14 +44,12 @@ final class AdjRibOutListener implements DOMDataTreeChangeListener {
     private static final Logger LOG = LoggerFactory.getLogger(AdjRibOutListener.class);
 
     private final ChannelOutputLimiter session;
-    private final RIBSupportContextRegistry registry;
     private final RIBSupportContextImpl context;
     private final RIBSupport support;
 
     private AdjRibOutListener(final TablesKey tablesKey, final YangInstanceIdentifier ribId, final DOMDataTreeChangeService service, final RIBSupportContextRegistry registry, final ChannelOutputLimiter session) {
-        this.registry = Preconditions.checkNotNull(registry);
         this.session = Preconditions.checkNotNull(session);
-        this.context = (RIBSupportContextImpl) this.registry.getRIBSupportContext(tablesKey);
+        this.context = (RIBSupportContextImpl) registry.getRIBSupportContext(tablesKey);
         this.support = this.context.getRibSupport();
         final YangInstanceIdentifier adjRibOutId =  ribId.node(Peer.QNAME).node(Peer.QNAME).node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(tablesKey));
         service.registerDataTreeChangeListener(new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, adjRibOutId), this);

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
index d1bcbbfb7be9a5d2559880205d7182b3d6c58430..0af72dbc68af05dd6087118b5b52b5ac5f0cb7fc 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java
@@ -14,6 +14,7 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.Iterator;
+import org.opendaylight.protocol.util.Values;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.AsPath;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.ClusterId;
@@ -98,7 +99,7 @@ final class AttributeOperations {
         final Optional<NormalizedNode<?, ?>> maybeAsSequence = NormalizedNodes.findNode(segment, this.asPathChoice, this.asPathList, this.asPathSequence);
         if (maybeAsSequence.isPresent()) {
             final UnkeyedListNode asList = (UnkeyedListNode) maybeAsSequence.get();
-            if (asList.getSize() < 255) {
+            if (asList.getSize() < Values.UNSIGNED_BYTE_MAX_VALUE) {
                 return asList.getValue();
             }
         }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv4RIBSupport.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv4RIBSupport.java
index 98d5f480610f7d68c0cd021ad0babf0d45375d80..d3b9b297a07f217e301c7a562e0ecc8c8309c7d1 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv4RIBSupport.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv4RIBSupport.java
@@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
  */
 final class IPv4RIBSupport extends AbstractIPRIBSupport {
     @VisibleForTesting
-    final static QName PREFIX_QNAME = QName.cachedReference(QName.create(Ipv4Route.QNAME, "prefix"));
+    static final QName PREFIX_QNAME = QName.cachedReference(QName.create(Ipv4Route.QNAME, "prefix"));
     private static final IPv4RIBSupport SINGLETON = new IPv4RIBSupport();
     private final ChoiceNode emptyRoutes = Builders.choiceBuilder()
             .withNodeIdentifier(new NodeIdentifier(Routes.QNAME))

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv6RIBSupport.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv6RIBSupport.java
index ecf8c5df71a713ce91be9b8410c049cf3e5b5738..d144f6fa75fb9a8efc7493979ef719acd09cb290 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv6RIBSupport.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/IPv6RIBSupport.java
@@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
  * Class supporting IPv6 unicast RIBs.
  */
 final class IPv6RIBSupport extends AbstractIPRIBSupport {
-    private final static QName PREFIX_QNAME = QName.cachedReference(QName.create(Ipv6Route.QNAME, "prefix"));
+    private static final QName PREFIX_QNAME = QName.cachedReference(QName.create(Ipv6Route.QNAME, "prefix"));
     private static final IPv6RIBSupport SINGLETON = new IPv6RIBSupport();
     private final ChoiceNode emptyRoutes = Builders.choiceBuilder()
             .withNodeIdentifier(new NodeIdentifier(Routes.QNAME))

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
index bf63e03be0c5ea14f5cafe6adca20bf0998df3cb..87e3d0f4a8652302a3f5e466549858464edeb015 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
@@ -62,8 +62,6 @@ final class LocRibWriter implements AutoCloseable, DOMDataTreeChangeListener {
     private final RIBSupport ribSupport;
     private final NodeIdentifierWithPredicates tableKey;
     private final RIBSupportContextRegistry registry;
-    private final YangInstanceIdentifier adjRibOutTarget;
-    private final YangInstanceIdentifier ribId;
 
     LocRibWriter(final RIBSupportContextRegistry registry, final DOMTransactionChain chain, final YangInstanceIdentifier target, final Long ourAs,
         final DOMDataTreeChangeService service, final PolicyDatabase pd, final TablesKey tablesKey) {
@@ -75,8 +73,6 @@ final class LocRibWriter implements AutoCloseable, DOMDataTreeChangeListener {
         this.ribSupport = this.registry.getRIBSupportContext(tablesKey).getRibSupport();
         this.attributesIdentifier = this.ribSupport.routeAttributesIdentifier();
         this.peerPolicyTracker = new ExportPolicyPeerTracker(service, target, pd);
-        this.adjRibOutTarget = target.node(Peer.QNAME).node(Peer.QNAME).node(AdjRibOut.QNAME).node(Tables.QNAME).node(this.tableKey);
-        this.ribId = target;
 
         final DOMDataWriteTransaction tx = this.chain.newWriteOnlyTransaction();
         tx.merge(LogicalDatastoreType.OPERATIONAL, this.locRibTarget, this.ribSupport.emptyRoutes());

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java
index 6e9f75fc5e8346dede212b6fdaeec0d75b77bdca..aa252233507a1659701fffcc93ee54ba0f1c7bf1 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java
@@ -56,12 +56,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 class RIBSupportContextImpl extends RIBSupportContext {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RIBSupportContextImpl.class);
     private static final ContainerNode EMPTY_TABLE_ATTRIBUTES = ImmutableNodes.containerNode(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.tables.Attributes.QNAME);
     private static final Set<Class<? extends DataObject>> ATTRIBUTE_CACHEABLES;
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
index 69b1922ed905bc18efba07901872061ac27f54fc..486264d046c4a073d0f338dc1bb9a1e1d5d5ff4a 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeConte
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
+final class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
 
     private final LoadingCache<RIBSupport, RIBSupportContextImpl> contexts = CacheBuilder.newBuilder()
             .build(new CacheLoader<RIBSupport, RIBSupportContextImpl>(){
@@ -31,7 +31,7 @@ class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
                 @Override
                 public RIBSupportContextImpl load(final RIBSupport key) {
                     return createContext(key);
-                };
+                }
             });
 
     private final RIBExtensionConsumerContext extensionContext;
@@ -53,37 +53,37 @@ class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry {
 
     @Override
     public RIBSupportContext getRIBSupportContext(final TablesKey key) {
-        final RIBSupport ribSupport = extensionContext.getRIBSupport(key);
+        final RIBSupport ribSupport = this.extensionContext.getRIBSupport(key);
         if(ribSupport != null) {
-            return contexts.getUnchecked(ribSupport);
+            return this.contexts.getUnchecked(ribSupport);
         }
         return null;
     }
 
     @Override
     public RIBSupportContext getRIBSupportContext(final NodeIdentifierWithPredicates key) {
-        final RIBSupport ribSupport = extensionContext.getRIBSupport(key);
+        final RIBSupport ribSupport = this.extensionContext.getRIBSupport(key);
         if(ribSupport != null) {
-            return contexts.getUnchecked(ribSupport);
+            return this.contexts.getUnchecked(ribSupport);
         }
         return null;
     }
 
     private RIBSupportContextImpl createContext(final RIBSupport ribSupport) {
         final RIBSupportContextImpl ribContext = new RIBSupportContextImpl(ribSupport);
-        if(latestCodecTree != null) {
+        if(this.latestCodecTree != null) {
             // FIXME: Do we need to recalculate latestCodecTree? E.g. new rib support was added
             // after bgp was started.
-            ribContext.onCodecTreeUpdated(latestCodecTree);
+            ribContext.onCodecTreeUpdated(this.latestCodecTree);
         }
         return ribContext;
     }
 
     void onSchemaContextUpdated(final SchemaContext context) {
-        final BindingRuntimeContext runtimeContext = BindingRuntimeContext.create(classContext, context);
-        latestCodecTree  = codecFactory.create(runtimeContext);
-        for(final RIBSupportContextImpl rib : contexts.asMap().values()) {
-            rib.onCodecTreeUpdated(latestCodecTree);
+        final BindingRuntimeContext runtimeContext = BindingRuntimeContext.create(this.classContext, context);
+        this.latestCodecTree  = this.codecFactory.create(runtimeContext);
+        for(final RIBSupportContextImpl rib : this.contexts.asMap().values()) {
+            rib.onCodecTreeUpdated(this.latestCodecTree);
         }
     }
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContextRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContextRegistry.java
index 31c2107c8534a23f15fd10d5d28d6c77cc30ab0d..b18bce1a158f3c4f1e6616a9a4f71681893c6136 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContextRegistry.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContextRegistry.java
@@ -19,7 +19,7 @@ public interface RIBSupportContextRegistry {
      * @return RIBSupport instance, or null if the AFI/SAFI is
      *         not implemented.
     */
-    public abstract @Nullable RIBSupportContext getRIBSupportContext(TablesKey key);
+    @Nullable abstract RIBSupportContext getRIBSupportContext(TablesKey key);
 
     /**
      * Acquire a RIB Support Context for a AFI/SAFI combination.
@@ -27,6 +27,5 @@ public interface RIBSupportContextRegistry {
      * @return RIBSupport instance, or null if the AFI/SAFI is
      *         not implemented.
     */
-    public abstract @Nullable RIBSupportContext getRIBSupportContext(NodeIdentifierWithPredicates key);
-
+    @Nullable abstract RIBSupportContext getRIBSupportContext(NodeIdentifierWithPredicates key);
 }

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
index 303111db8fc772c31a5dffb016a9c600d368ad7b..269e16ada5a2e43b38546ffd82608f8fe4df8172 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
@@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 
-public class RibSupportUtils {
+public final class RibSupportUtils {
 
     private static final QName AFI_QNAME = QName.cachedReference(QName.create(Tables.QNAME, "afi"));
     private static final QName SAFI_QNAME = QName.cachedReference(QName.create(Tables.QNAME, "safi"));

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
index c3832787ee6f95d1ef5d700311f8328c95c77943..4812266341a38d92914ec914ade402b47afd7d10 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPRequestMessageParser.java
@@ -216,10 +216,8 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
                 rBuilder.setVendorInformationObject(vendorInfo);
             }
             // expansion
-            if (rpObj.isPathKey()) {
-                if (objects.get(0) instanceof PathKey) {
-                    rBuilder.setPathKeyExpansion(new PathKeyExpansionBuilder().setPathKey((PathKey) objects.get(0)).build());
-                }
+            if (rpObj.isPathKey() && objects.get(0) instanceof PathKey) {
+                rBuilder.setPathKeyExpansion(new PathKeyExpansionBuilder().setPathKey((PathKey) objects.get(0)).build());
             }
 
             final P2pBuilder p2pBuilder = new P2pBuilder();

diff --git a/util/src/main/java/org/opendaylight/protocol/util/BitArray.java b/util/src/main/java/org/opendaylight/protocol/util/BitArray.java
index c5df9a0858b2b07ef765b2148e7f18b85c700eff..b942989be881ef12c5954cca95366b288d24e312 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/BitArray.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/BitArray.java
@@ -41,7 +41,7 @@ public final class BitArray {
     private BitArray(final byte[] backingArray, final int size) {
         Preconditions.checkNotNull(backingArray, "Byte Array cannot be null");
         this.size = size;
-        this.backingArray = backingArray;
+        this.backingArray = (backingArray == null) ? null : backingArray.clone();
         this.offset = (calculateBytes(this.size) * Byte.SIZE) - this.size;
     }