Fixed some sonar warnings.

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

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParser.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParser.java
index 1cc4d6643b6e8b7aade30b34cc167da778bb7f1e..13dcb493a686512d615bb0c885867635b402c655 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParser.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParser.java
@@ -227,8 +227,7 @@ public final class LinkstateNlriParser implements NlriParser {
                throw new BGPParsingException("Router Id of invalid length " + value.length);
        }
 
-       private static PrefixDescriptors parsePrefixDescriptors(final NodeIdentifier localDescriptor, final byte[] bytes, final boolean ipv4)
-                       throws BGPParsingException {
+       private static PrefixDescriptors parsePrefixDescriptors(final byte[] bytes, final boolean ipv4) throws BGPParsingException {
                int byteOffset = 0;
                final PrefixDescriptorsBuilder builder = new PrefixDescriptorsBuilder();
                while (byteOffset != bytes.length) {
@@ -343,10 +342,10 @@ public final class LinkstateNlriParser implements NlriParser {
                                parseLink(builder, ByteArray.subByte(nlri, byteOffset, restLength));
                                break;
                        case Ipv4Prefix:
-                               builder.setPrefixDescriptors(parsePrefixDescriptors(localDescriptor, ByteArray.subByte(nlri, byteOffset, restLength), true));
+                               builder.setPrefixDescriptors(parsePrefixDescriptors(ByteArray.subByte(nlri, byteOffset, restLength), true));
                                break;
                        case Ipv6Prefix:
-                               builder.setPrefixDescriptors(parsePrefixDescriptors(localDescriptor, ByteArray.subByte(nlri, byteOffset, restLength), false));
+                               builder.setPrefixDescriptors(parsePrefixDescriptors(ByteArray.subByte(nlri, byteOffset, restLength), false));
                                break;
                        case Node:
                                // node nlri is already parsed as it contains only the common fields for node and link nlri

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionNegotiator.java
index 4c2ff7c482b0058c3e773b98a70b2af4bf6e8c3f..aa4bda4f5489700656a3d7f3e857946f77de915e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionNegotiator.java
@@ -159,15 +159,13 @@ public final class BGPSessionNegotiator extends AbstractSessionNegotiator<Notifi
 
        private void handleOpen(final Open openObj) {
                final List<BgpParameters> prefs = openObj.getBgpParameters();
-               if (prefs != null && !prefs.isEmpty()) {
-                       if (prefs.containsAll(this.localPref.getParams())) {
-                               this.remotePref = openObj;
-                               this.writeMessage(new KeepaliveBuilder().build());
-                               this.session = new BGPSessionImpl(this.timer, this.listener, this.channel, this.remotePref);
-                               this.state = State.OpenConfirm;
-                               LOG.debug("Channel {} moved to OpenConfirm state with remote proposal {}", this.channel, this.remotePref);
-                               return;
-                       }
+               if (prefs != null && !prefs.isEmpty() && prefs.containsAll(this.localPref.getParams())) {
+                       this.remotePref = openObj;
+                       this.writeMessage(new KeepaliveBuilder().build());
+                       this.session = new BGPSessionImpl(this.timer, this.listener, this.channel, this.remotePref);
+                       this.state = State.OpenConfirm;
+                       LOG.debug("Channel {} moved to OpenConfirm state with remote proposal {}", this.channel, this.remotePref);
+                       return;
                }
                final Notify ntf = new NotifyBuilder().setErrorCode(BGPError.UNSPECIFIC_OPEN_ERROR.getCode()).setErrorSubcode(
                                BGPError.UNSPECIFIC_OPEN_ERROR.getSubcode()).build();

diff --git a/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java b/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
index 0c5cf6ae41c8b26586cef7fe06b0faa7afd42ae3..278bc423e4f48ef437d49e862da6d4dd3a4166b0 100644 (file)
--- a/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
+++ b/bgp/rib-spi-config/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
@@ -15,19 +15,21 @@ import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
 /**
  *
  */
-public final class RIBExtensionsImplModule extends org.opendaylight.controller.config.yang.bgp.rib.spi.AbstractRIBExtensionsImplModule
-{
+public final class RIBExtensionsImplModule extends org.opendaylight.controller.config.yang.bgp.rib.spi.AbstractRIBExtensionsImplModule {
 
-       public RIBExtensionsImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+       public RIBExtensionsImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
                super(identifier, dependencyResolver);
        }
 
-       public RIBExtensionsImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final RIBExtensionsImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
+       public RIBExtensionsImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                       final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final RIBExtensionsImplModule oldModule,
+                       final java.lang.AutoCloseable oldInstance) {
                super(identifier, dependencyResolver, oldModule, oldInstance);
        }
 
        @Override
-       public void validate(){
+       public void validate() {
                super.validate();
                // Add custom validation for module attributes here.
        }
@@ -37,14 +39,14 @@ public final class RIBExtensionsImplModule extends org.opendaylight.controller.c
                final class RIBExtensionProviderContextImplCloseable extends SimpleRIBExtensionProviderContext implements AutoCloseable {
                        @Override
                        public void close() {
-                               for (RIBExtensionProviderActivator e : getExtensionDependency()) {
-                                       e.stopRIBExtensionProvider();;
+                               for (final RIBExtensionProviderActivator e : getExtensionDependency()) {
+                                       e.stopRIBExtensionProvider();
                                }
                        }
                }
 
                final RIBExtensionProviderContextImplCloseable ret = new RIBExtensionProviderContextImplCloseable();
-               for (RIBExtensionProviderActivator e : getExtensionDependency()) {
+               for (final RIBExtensionProviderActivator e : getExtensionDependency()) {
                        e.startRIBExtensionProvider(ret);
                }
 

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
index f63cd81c3e1e8edb4cc06e0817f95017dfa2760b..920e1e3983cd7d44c317d8514d3eb697a1b2b791 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
@@ -92,8 +92,8 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
        private static final Logger LOG = LoggerFactory.getLogger(LinkstateTopologyBuilder.class);
 
        public LinkstateTopologyBuilder(final DataProviderService dataProvider, final RibReference locRibReference, final TopologyId topologyId) {
-               super(dataProvider, locRibReference, topologyId,
-                               new TopologyTypesBuilder().addAugmentation(TopologyTypes1.class, new TopologyTypes1Builder().build()).build(), LinkstateRoute.class);
+               super(dataProvider, locRibReference, topologyId, new TopologyTypesBuilder().addAugmentation(TopologyTypes1.class,
+                               new TopologyTypes1Builder().build()).build(), LinkstateRoute.class);
        }
 
        private LinkId buildLinkId(final UriBuilder base, final LinkCase link) {
@@ -104,12 +104,15 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                return new NodeId(new UriBuilder(base, "node").add("", node).toString());
        }
 
-       private TpId buildTpId(final UriBuilder base, final TopologyIdentifier topologyIdentifier, final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
-               return new TpId(new UriBuilder(base, "tp").add("mt", topologyIdentifier).add("ipv4", ipv4InterfaceIdentifier).add("ipv6", ipv6InterfaceIdentifier).add("id", bs).toString());
+       private TpId buildTpId(final UriBuilder base, final TopologyIdentifier topologyIdentifier,
+                       final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
+               return new TpId(new UriBuilder(base, "tp").add("mt", topologyIdentifier).add("ipv4", ipv4InterfaceIdentifier).add("ipv6",
+                               ipv6InterfaceIdentifier).add("id", bs).toString());
        }
 
        private TpId buildLocalTpId(final UriBuilder base, final LinkDescriptors linkDescriptors) {
-               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
+               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4InterfaceAddress(),
+                               linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
        }
 
        private TerminationPoint buildTp(final TpId id, final TerminationPointType type) {
@@ -118,13 +121,17 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                stpb.setTpId(id);
 
                if (type != null) {
-                       stpb.addAugmentation(TerminationPoint1.class, new TerminationPoint1Builder().setIgpTerminationPointAttributes(new IgpTerminationPointAttributesBuilder().setTerminationPointType(null).build()).build());
+                       stpb.addAugmentation(
+                                       TerminationPoint1.class,
+                                       new TerminationPoint1Builder().setIgpTerminationPointAttributes(
+                                                       new IgpTerminationPointAttributesBuilder().setTerminationPointType(null).build()).build());
                }
 
                return stpb.build();
        }
 
-       private TerminationPointType getTpType(final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier, final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
+       private TerminationPointType getTpType(final Ipv4InterfaceIdentifier ipv4InterfaceIdentifier,
+                       final Ipv6InterfaceIdentifier ipv6InterfaceIdentifier, final byte[] bs) {
                // Order of preference: Unnumbered first, then IP
                if (bs != null) {
                        final long id = UnsignedInteger.fromIntBits(ByteArray.bytesToInt(bs)).longValue();
@@ -151,18 +158,21 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
 
        private TerminationPoint buildLocalTp(final UriBuilder base, final LinkDescriptors linkDescriptors) {
                final TpId id = buildLocalTpId(base, linkDescriptors);
-               final TerminationPointType t = getTpType(linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(), linkDescriptors.getLinkLocalIdentifier());
+               final TerminationPointType t = getTpType(linkDescriptors.getIpv4InterfaceAddress(), linkDescriptors.getIpv6InterfaceAddress(),
+                               linkDescriptors.getLinkLocalIdentifier());
 
                return buildTp(id, t);
        }
 
        private TpId buildRemoteTpId(final UriBuilder base, final LinkDescriptors linkDescriptors) {
-               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
+               return buildTpId(base, linkDescriptors.getMultiTopologyId(), linkDescriptors.getIpv4NeighborAddress(),
+                               linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
        }
 
        private TerminationPoint buildRemoteTp(final UriBuilder base, final LinkDescriptors linkDescriptors) {
                final TpId id = buildRemoteTpId(base, linkDescriptors);
-               final TerminationPointType t = getTpType(linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(), linkDescriptors.getLinkRemoteIdentifier());
+               final TerminationPointType t = getTpType(linkDescriptors.getIpv4NeighborAddress(), linkDescriptors.getIpv6NeighborAddress(),
+                               linkDescriptors.getLinkRemoteIdentifier());
 
                return buildTp(id, t);
        }
@@ -219,7 +229,8 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        ilab.setMultiTopologyId(topologyIdentifier.getValue().shortValue());
                }
 
-               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IgpLinkAttributes1Builder().setIsisLinkAttributes(ilab.build()).build();
+               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.isis.topology.rev131021.IgpLinkAttributes1Builder().setIsisLinkAttributes(
+                               ilab.build()).build();
        }
 
        private org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1 ospfLinkAttributes(
@@ -248,13 +259,14 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        ilab.setMultiTopologyId(topologyIdentifier.getValue().shortValue());
                }
 
-               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1Builder().setOspfLinkAttributes(ilab.build()).build();
+               return new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpLinkAttributes1Builder().setOspfLinkAttributes(
+                               ilab.build()).build();
        }
 
-       private void createLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkstateRoute value,
-                       final LinkCase l, final Attributes attributes) {
-               final LinkAttributes la =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.LinkCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getLinkAttributes();
+       private void createLink(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
+                       final LinkstateRoute value, final LinkCase l, final Attributes attributes) {
+               final LinkAttributes la = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.LinkCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getLinkAttributes();
 
                final IgpLinkAttributesBuilder ilab = new IgpLinkAttributesBuilder();
                ilab.setMetric(la.getMetric().getValue());
@@ -341,6 +353,7 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
 
        private org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.IgpNodeAttributes1 ospfNodeAttributes(
                        final NodeAttributes na) {
+               // FIXME: write appropriate reason,why the parameter should be kept here although it is unused
                final org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.TedBuilder tb = new org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.ospf.topology.rev131021.ospf.node.attributes.ospf.node.attributes.TedBuilder();
 
                final OspfNodeAttributesBuilder ab = new OspfNodeAttributesBuilder();
@@ -351,10 +364,10 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                                ab.build()).build();
        }
 
-       private void createNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base, final LinkstateRoute value,
-                       final NodeCase n, final Attributes attributes) {
-               final NodeAttributes na =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.NodeCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getNodeAttributes();
+       private void createNode(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
+                       final LinkstateRoute value, final NodeCase n, final Attributes attributes) {
+               final NodeAttributes na = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.NodeCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getNodeAttributes();
 
                final List<IpAddress> ids = new ArrayList<>();
                if (na.getIpv4RouterId() != null) {
@@ -402,14 +415,14 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
                        final UriBuilder base, final PrefixCase p) {
                return nodeIdentifierBuilder(base, p.getAdvertisingNodeDescriptors()).augmentation(Node1.class).child(
                                org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributes.class).child(
-                                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix.class,
-                                               new PrefixKey(p.getIpReachabilityInformation())).toInstance();
+                               org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix.class,
+                               new PrefixKey(p.getIpReachabilityInformation())).toInstance();
        }
 
        private void createPrefix(final DataModification<InstanceIdentifier<?>, DataObject> trans, final UriBuilder base,
                        final LinkstateRoute value, final PrefixCase p, final Attributes attributes) {
-               final PrefixAttributes pa =
-                               ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.PrefixCase) attributes.getAugmentation(Attributes1.class).getAttributeType()).getPrefixAttributes();
+               final PrefixAttributes pa = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.bgp.rib.rib.loc.rib.tables.routes.linkstate.routes._case.linkstate.routes.linkstate.route.attributes.attribute.type.PrefixCase) attributes.getAugmentation(
+                               Attributes1.class).getAttributeType()).getPrefixAttributes();
 
                final PrefixBuilder pb = new PrefixBuilder();
                pb.setPrefix(p.getIpReachabilityInformation());

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
index ba53ed9e9c3fc3779a659501662e723264ce6ab7..7cbeee400ba63e5d1b5cc06626f91cfc17e389da 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilder.java
@@ -19,23 +19,23 @@ final class UriBuilder {
        private final StringBuilder sb;
 
        UriBuilder(final UriBuilder base, final String type) {
-               sb = new StringBuilder(base.sb);
-               sb.append("type=").append(type);
+               this.sb = new StringBuilder(base.sb);
+               this.sb.append("type=").append(type);
        }
 
        UriBuilder(final LinkstateRoute route) {
-               sb = new StringBuilder("bgpls://");
+               this.sb = new StringBuilder("bgpls://");
 
                if (route.getDistinguisher() != null) {
-                       sb.append(route.getDistinguisher().getValue().toString()).append(':');
+                       this.sb.append(route.getDistinguisher().getValue().toString()).append(':');
                }
 
-               sb.append(route.getProtocolId().toString()).append(':').append(route.getIdentifier().getValue().toString()).append('/');
+               this.sb.append(route.getProtocolId().toString()).append(':').append(route.getIdentifier().getValue().toString()).append('/');
        }
 
        UriBuilder add(final String name, final Object value) {
                if (value != null) {
-                       sb.append('&').append(name).append('=').append(value.toString());
+                       this.sb.append('&').append(name).append('=').append(value.toString());
                }
                return this;
        }
@@ -58,14 +58,14 @@ final class UriBuilder {
        UriBuilder add(final String prefix, final NodeIdentifier node) {
                add(prefix + "as", node.getAsNumber());
                add(prefix + "domain", node.getDomainId());
-               add(prefix + "area", node.getAreaId());;
+               add(prefix + "area", node.getAreaId());
                add(prefix + "router", node.getCRouterIdentifier());
                return this;
        }
 
        @Override
        public String toString() {
-               final String ret = sb.toString();
+               final String ret = this.sb.toString();
                LOG.trace("New URI {}", ret);
                return ret;
        }

diff --git a/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolSessionPromise.java b/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolSessionPromise.java
index 41898a53f5cbe5f3c1a0e1585dbcbbee23787764..70669982962b54bed881579ed17c7eabeb9d1c6c 100644 (file)
--- a/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolSessionPromise.java
+++ b/framework/src/main/java/org/opendaylight/protocol/framework/ProtocolSessionPromise.java
@@ -37,7 +37,8 @@ final class ProtocolSessionPromise<S extends ProtocolSession<?>> extends Default
        @GuardedBy("this")
        private Future<?> pending;
 
-       ProtocolSessionPromise(final EventExecutor executor, final InetSocketAddress address, final ReconnectStrategy strategy, final Bootstrap b) {
+       ProtocolSessionPromise(final EventExecutor executor, final InetSocketAddress address, final ReconnectStrategy strategy,
+                       final Bootstrap b) {
                super(executor);
                this.strategy = Preconditions.checkNotNull(strategy);
                this.address = Preconditions.checkNotNull(address);
@@ -61,7 +62,7 @@ final class ProtocolSessionPromise<S extends ProtocolSession<?>> extends Default
                                                LOG.debug("Promise {} connection resolved", lock);
 
                                                // Triggered when a connection attempt is resolved.
-                                               Preconditions.checkState(ProtocolSessionPromise.this.pending == cf);
+                                               Preconditions.checkState(ProtocolSessionPromise.this.pending.equals(cf));
 
                                                /*
                                                 * The promise we gave out could have been cancelled,
@@ -81,14 +82,14 @@ final class ProtocolSessionPromise<S extends ProtocolSession<?>> extends Default
                                                }
 
                                                if (!cf.isSuccess()) {
-                                                       LOG.info("Attempt to connect to connect to {} failed", address, cf.cause());
+                                                       LOG.info("Attempt to connect to connect to {} failed", ProtocolSessionPromise.this.address, cf.cause());
                                                        final Future<Void> rf = ProtocolSessionPromise.this.strategy.scheduleReconnect(cf.cause());
                                                        rf.addListener(new FutureListener<Void>() {
                                                                @Override
                                                                public void operationComplete(final Future<Void> sf) {
                                                                        synchronized (lock) {
                                                                                // Triggered when a connection attempt is to be made.
-                                                                               Preconditions.checkState(ProtocolSessionPromise.this.pending == sf);
+                                                                               Preconditions.checkState(ProtocolSessionPromise.this.pending.equals(sf));
 
                                                                                /*
                                                                                 * The promise we gave out could have been cancelled,

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java
index 76bf79d9e33e8f65cf3800aeecca6b2e7eb5dded..e8a9b0ba3032cb420a17c6a6df5d6c07ec963034 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/AbstractMessageParser.java
@@ -60,11 +60,8 @@ abstract class AbstractMessageParser implements MessageParser, MessageSerializer
                if (object == null) {
                        throw new IllegalArgumentException("Null object passed.");
                }
-
                final ObjectSerializer serializer = this.registry.getObjectSerializer(object);
-
-               final byte[] retBytes = serializer.serializeObject(object);
-               return retBytes;
+               return serializer.serializeObject(object);
        }
 
        private List<Object> parseObjects(final byte[] bytes) throws PCEPDeserializerException {

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java
index 3897ee4d5ea28c53ec00054db5a5fe4385fd0d0e..56fc08f3051fc4edfce5ef545042254ec0b069b8 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/SimpleSessionListener.java
@@ -25,30 +25,30 @@ public class SimpleSessionListener implements PCEPSessionListener {
 
        public List<Message> messages = Lists.newArrayList();
 
-       private static final Logger logger = LoggerFactory.getLogger(SimpleSessionListener.class);
+       private static final Logger LOG = LoggerFactory.getLogger(SimpleSessionListener.class);
 
        public SimpleSessionListener() {
        }
 
        @Override
        public void onMessage(final PCEPSession session, final Message message) {
-               logger.debug("Received message: {}", message);
+               LOG.debug("Received message: {}", message);
                this.messages.add(message);
        }
 
        @Override
        public void onSessionUp(final PCEPSession session) {
-               logger.debug("Session up.");
+               LOG.debug("Session up.");
        }
 
        @Override
        public void onSessionDown(final PCEPSession session, final Exception e) {
-               logger.debug("Session down with cause : {} or exception: {}", e);
+               LOG.debug("Session down with cause : {} or exception: {}", e);
                session.close();
        }
 
        @Override
        public void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason cause) {
-               logger.debug("Session terminated. Cause : {}", cause.toString());
+               LOG.debug("Session terminated. Cause : {}", cause.toString());
        }
 }

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListener.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListener.java
index 30a62268dc26514b1b5cac14809fbccb57d4aacc..c5ecabb177cc96abc81a595372805dc3efd2ee24 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListener.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/TestingSessionListener.java
@@ -24,32 +24,32 @@ public class TestingSessionListener implements PCEPSessionListener {
 
        public boolean up = false;
 
-       private static final Logger logger = LoggerFactory.getLogger(TestingSessionListener.class);
+       private static final Logger LOG = LoggerFactory.getLogger(TestingSessionListener.class);
 
        public TestingSessionListener() {
        }
 
        @Override
        public void onMessage(final PCEPSession session, final Message message) {
-               logger.debug("Received message: {}", message);
+               LOG.debug("Received message: {}", message);
                this.messages.add(message);
        }
 
        @Override
        public void onSessionUp(final PCEPSession session) {
-               logger.debug("Session up.");
+               LOG.debug("Session up.");
                this.up = true;
        }
 
        @Override
        public void onSessionDown(final PCEPSession session, final Exception e) {
-               logger.debug("Session down. Cause : {} or {}", e);
+               LOG.debug("Session down. Cause : {} or {}", e);
                this.up = false;
        }
 
        @Override
        public void onSessionTerminated(final PCEPSession session, final PCEPTerminationReason cause) {
-               logger.debug("Session terminated. Cause : {}", cause);
+               LOG.debug("Session terminated. Cause : {}", cause);
        }
 
        public List<Message> messages() {