From: Dana Kutenicsova <dkutenic@cisco.com>
Date: Fri, 10 Oct 2014 08:40:16 +0000 (+0200)
Subject: BUG-731 : removed critical sonar warnings
X-Git-Tag: release/lithium~360^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1e9c8aae667229879e85c3cd92a5c2639e71896f;p=bgpcep.git

BUG-731 : removed critical sonar warnings

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

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
index 80df0203c2..47cc5b2a3a 100644
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
@@ -300,6 +300,7 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBs<CLinkstateDestination, Li
         }
         if (dests == null || dests.size() != 1) {
             LOG.warn("Null or more than one LinkstateRoute Key was parsed");
+            return null;
         }
         return dests.get(0);
     }
diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
index 005dc368d5..c7837329a2 100644
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java
@@ -331,7 +331,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     }
 
     @VisibleForTesting
-    protected void setLastMessageSentAt(final long lastMessageSentAt) {
+    protected synchronized void setLastMessageSentAt(final long lastMessageSentAt) {
         this.lastMessageSentAt = lastMessageSentAt;
     }
 }
diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/CInitiated00SrpObjectWithPstTlvParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/CInitiated00SrpObjectWithPstTlvParser.java
index 01c7d41936..7d4f13700a 100644
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/CInitiated00SrpObjectWithPstTlvParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/CInitiated00SrpObjectWithPstTlvParser.java
@@ -32,11 +32,9 @@ public class CInitiated00SrpObjectWithPstTlvParser extends CInitiated00SrpObject
     public void addTlv(final TlvsBuilder builder, final Tlv tlv) {
         super.addTlv(builder, tlv);
         final Tlvs7Builder tlvBuilder = new Tlvs7Builder();
-        if (builder != null) {
-            final Tlvs7 tlvs = builder.getAugmentation(Tlvs7.class);
-            if (tlvs != null && tlvs.getPathSetupType() != null) {
-                tlvBuilder.setPathSetupType(tlvs.getPathSetupType());
-            }
+        final Tlvs7 tlvs = builder.getAugmentation(Tlvs7.class);
+        if (tlvs != null && tlvs.getPathSetupType() != null) {
+            tlvBuilder.setPathSetupType(tlvs.getPathSetupType());
         }
         if (tlv instanceof PathSetupType) {
             tlvBuilder.setPathSetupType((PathSetupType) tlv);
diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
index f6393ba9d0..2c161141b3 100644
--- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
+++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
@@ -24,19 +24,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 
 public class PcepRpObjectWithPstTlvParser extends PCEPRequestParameterObjectParser {
 
-    public PcepRpObjectWithPstTlvParser(TlvRegistry tlvReg, VendorInformationTlvRegistry viTlvReg) {
+    public PcepRpObjectWithPstTlvParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) {
         super(tlvReg, viTlvReg);
     }
 
     @Override
-    public void addTlv(final TlvsBuilder builder, Tlv tlv) {
+    public void addTlv(final TlvsBuilder builder, final Tlv tlv) {
         super.addTlv(builder, tlv);
         final Tlvs1Builder tlvBuilder = new Tlvs1Builder();
-        if (builder != null) {
-            final Tlvs1 tlvs = builder.getAugmentation(Tlvs1.class);
-            if (tlvs != null && tlvs.getPathSetupType() != null) {
-                tlvBuilder.setPathSetupType(tlvs.getPathSetupType());
-            }
+        final Tlvs1 tlvs = builder.getAugmentation(Tlvs1.class);
+        if (tlvs != null && tlvs.getPathSetupType() != null) {
+            tlvBuilder.setPathSetupType(tlvs.getPathSetupType());
         }
         if (tlv instanceof PathSetupType) {
             tlvBuilder.setPathSetupType((PathSetupType) tlv);
diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
index 0fc3f2c56f..46ad4cab9c 100644
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
@@ -12,9 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import io.netty.util.concurrent.FutureListener;
-
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,9 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.annotation.concurrent.GuardedBy;
-
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -128,11 +124,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
          */
         final InetAddress peerAddress = session.getRemoteAddress();
 
-        final TopologyNodeState state = serverSessionManager.takeNodeState(peerAddress, this);
-        if (state == null) {
-            session.close(TerminationReason.Unknown);
-            return;
-        }
+        final TopologyNodeState state = this.serverSessionManager.takeNodeState(peerAddress, this);
 
         LOG.trace("Peer {} resolved to topology node {}", peerAddress, state.getNodeId());
         this.synced = false;
@@ -172,7 +164,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
 
     @GuardedBy("this")
     private void tearDown(final PCEPSession session) {
-        this.serverSessionManager.releaseNodeState(this.nodeState);
+        this.serverSessionManager.releaseNodeState(this.nodeState, session);
         this.nodeState = null;
         this.session = null;
 
@@ -344,7 +336,6 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
             LOG.debug("Setting new paths {} to lsp {}", updatedPaths, name);
             rlb.setPath(updatedPaths);
         }
-        Preconditions.checkState(name != null);
         rlb.setKey(new ReportedLspKey(name));
         rlb.setName(name);
 
@@ -415,7 +406,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
         return this.lsps.get(id);
     }
 
-    protected synchronized final <T extends DataObject> ListenableFuture<Optional<T>> readOperationalData(final InstanceIdentifier<T> id) {
+    protected final synchronized <T extends DataObject> ListenableFuture<Optional<T>> readOperationalData(final InstanceIdentifier<T> id) {
         return this.nodeState.readOperationalData(id);
     }
 }
diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
index 9897ba3f42..afc7172f89 100644
--- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
+++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
@@ -22,6 +22,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.protocol.framework.SessionListenerFactory;
+import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPSessionListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.AddLspArgs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.EnsureLspOperationalInput;
@@ -84,9 +85,9 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
         return new NodeId("pcc://" + addr.getHostAddress());
     }
 
-    synchronized void releaseNodeState(final TopologyNodeState nodeState) {
+    synchronized void releaseNodeState(final TopologyNodeState nodeState, final PCEPSession session) {
         LOG.debug("Node {} unbound", nodeState.getNodeId());
-        this.nodes.remove(nodeState.getNodeId());
+        this.nodes.remove(createNodeId(session.getRemoteAddress()));
         nodeState.released();
     }
 
@@ -97,12 +98,11 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
         TopologyNodeState ret = this.state.get(id);
 
         if (ret == null) {
-            ret = new TopologyNodeState(broker, topology, id, DEFAULT_HOLD_STATE_NANOS);
+            ret = new TopologyNodeState(this.broker, this.topology, id, DEFAULT_HOLD_STATE_NANOS);
             LOG.debug("Created topology node {} for id {} at {}", ret, id, ret.getNodeId());
             this.state.put(id, ret);
-        } else {
-            // FIXME: check for conflicting session
         }
+        // FIXME: else check for conflicting session
 
         ret.taken();
         this.nodes.put(id, sessionListener);
@@ -112,7 +112,7 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
 
     @Override
     public PCEPSessionListener getSessionListener() {
-        return listenerFactory.createTopologySessionListener(this);
+        return this.listenerFactory.createTopologySessionListener(this);
     }
 
     @Override
@@ -165,10 +165,10 @@ final class ServerSessionManager implements SessionListenerFactory<PCEPSessionLi
 
     @Override
     public void close() throws TransactionCommitFailedException {
-        for (final TopologySessionListener sessionListener : nodes.values()) {
+        for (final TopologySessionListener sessionListener : this.nodes.values()) {
             sessionListener.close();
         }
-        for (final TopologyNodeState nodeState : state.values()) {
+        for (final TopologyNodeState nodeState : this.state.values()) {
             nodeState.close();
         }
         final WriteTransaction t = this.broker.newWriteOnlyTransaction();