BUG-731 : more sonar warnings fixed

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

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
index 4004b4d53313422845ad188f6df60c44d019bf0b..a605c773eb8e7682548422b08167d68b6fc07e36 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java
@@ -184,24 +184,24 @@ public class BGPPeer implements ReusableBGPPeer, Peer, AutoCloseable, BGPPeerRun
     @Override
     public void resetStats() {
         if (this.session instanceof BGPSessionStatistics) {
-            ((BGPSessionStatistics) session).resetSessionStats();
+            ((BGPSessionStatistics) this.session).resetSessionStats();
         }
     }
 
-    public void registerRootRuntimeBean(final BGPPeerRuntimeRegistrator registrator) {
+    public synchronized void registerRootRuntimeBean(final BGPPeerRuntimeRegistrator registrator) {
         this.registrator = registrator;
     }
 
     @Override
     public BgpSessionState getBgpSessionState() {
         if (this.session instanceof BGPSessionStatistics) {
-            return ((BGPSessionStatistics) session).getBgpSesionState();
+            return ((BGPSessionStatistics) this.session).getBgpSesionState();
         }
         return new BgpSessionState();
     }
 
     @Override
-    public BgpPeerState getBgpPeerState() {
+    public synchronized BgpPeerState getBgpPeerState() {
         final BgpPeerState peerState = new BgpPeerState();
         final List<RouteTable> routes = Lists.newArrayList();
         for (final TablesKey tablesKey : this.tables) {

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 bda181f66768492702eea95c2b13766f91c688f8..5b58ce9a64d8399854cac3466f0edc10718b3590 100644 (file)
--- 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
@@ -363,7 +363,7 @@ public class BGPSessionImpl extends AbstractProtocolSession<Notification> implem
     }
 
     @Override
-    public BgpSessionState getBgpSesionState() {
+    public synchronized BgpSessionState getBgpSesionState() {
         return this.sessionStats.getBgpSessionState(this.state);
     }
 

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBs.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBs.java
index d242103e89b04b2a24c08ad199210a7f8eb1542e..4343b452f8ec70d8e2447cb0add311341d59ee9e 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBs.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBs.java
@@ -237,7 +237,8 @@ public abstract class AbstractAdjRIBs<I, D extends Identifiable<K> & Route, K ex
      * @param id instance identifier
      * @return router identifier
      */
-    public abstract @Nullable KeyedInstanceIdentifier<D, K> routeIdentifier(InstanceIdentifier<?> id);
+    @Nullable
+    public abstract KeyedInstanceIdentifier<D, K> routeIdentifier(InstanceIdentifier<?> id);
 
     /**
      * Craates route key out of instance identifier

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 95c80c98b501cadb166394994d697d4bdf5ec9e0..fa6b77bf147bc8289bf6aba9c76ff6e2d5899f41 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
@@ -602,17 +602,14 @@ public final class LinkstateTopologyBuilder extends AbstractTopologyBuilder<Link
 
             ab.setRouterType(new PseudonodeBuilder().setPseudonode(Boolean.TRUE).build());
             ab.setDrInterfaceId(pn.getLanInterface().getValue());
-        } else if (ri instanceof OspfNodeCase) {
+        } else if (ri instanceof OspfNodeCase && na != null && na.getNodeFlags() != null) {
             // TODO: what should we do with in.getOspfRouterId()?
-            // final OspfNode in = ((OspfNodeCase) ri).getOspfNode();
-
-            if (na != null && na.getNodeFlags() != null) {
-                final NodeFlagBits nf = na.getNodeFlags();
-                if (nf.isAbr()) {
-                    ab.setRouterType(new AbrBuilder().setAbr(Boolean.TRUE).build());
-                } else if (!nf.isExternal()) {
-                    ab.setRouterType(new InternalBuilder().setInternal(Boolean.TRUE).build());
-                }
+
+            final NodeFlagBits nf = na.getNodeFlags();
+            if (nf.isAbr()) {
+                ab.setRouterType(new AbrBuilder().setAbr(Boolean.TRUE).build());
+            } else if (!nf.isExternal()) {
+                ab.setRouterType(new InternalBuilder().setInternal(Boolean.TRUE).build());
             }
         }
 

diff --git a/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java b/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java
index 171c295006882f28fb57fdd17bb9fb6cb3fb8bac..56c4ce83266653f50825ac3c6b8f075080db1aa0 100644 (file)
--- a/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java
+++ b/data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java
@@ -22,15 +22,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class DataChangeCounterImplModule extends org.opendaylight.controller.config.yang.bgpcep.data.change.counter.AbstractDataChangeCounterImplModule {
 
-    public DataChangeCounterImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+    public DataChangeCounterImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
     }
 
-    public DataChangeCounterImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            org.opendaylight.controller.config.yang.bgpcep.data.change.counter.DataChangeCounterImplModule oldModule,
-            java.lang.AutoCloseable oldInstance) {
+    public DataChangeCounterImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final org.opendaylight.controller.config.yang.bgpcep.data.change.counter.DataChangeCounterImplModule oldModule,
+            final java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
     }
 
@@ -54,14 +54,14 @@ public class DataChangeCounterImplModule extends org.opendaylight.controller.con
         private final TopologyDataChangeCounter inner;
         private final ListenerRegistration<DataChangeListener> registration;
 
-        public DataChangeCounterCloseable(TopologyDataChangeCounter inner,
-                ListenerRegistration<DataChangeListener> registration) {
+        public DataChangeCounterCloseable(final TopologyDataChangeCounter inner,
+                final ListenerRegistration<DataChangeListener> registration) {
             this.inner = inner;
             this.registration = registration;
         }
 
         @Override
-        public void close() throws Exception {
+        public void close() {
             this.registration.close();
             this.inner.close();
         }

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java
index 12a560f107b2b07a99f6bc100f1bcb772dcafd33..b006b7558b58c1f7020444b4b904c29235843866 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tlv/AbstractVendorInformationTlvParser.java
@@ -12,10 +12,8 @@ import static org.opendaylight.protocol.pcep.spi.VendorInformationUtil.VENDOR_IN
 import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedInt;
 
 import com.google.common.base.Preconditions;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-
 import org.opendaylight.protocol.pcep.spi.EnterpriseSpecificInformationParser;
 import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException;
 import org.opendaylight.protocol.pcep.spi.TlvParser;

diff --git a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
index cb4e8e227647fb31daa0bef1aff32e6e1a964eba..e997fd25f5f2a4c88c2ee133f6c3297ead10ccee 100644 (file)
--- a/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
+++ b/pcep/testtool/src/main/java/org/opendaylight/protocol/pcep/testtool/Main.java
@@ -68,7 +68,7 @@ public final class Main {
 
     private static final int KA_TO_DEADTIMER_RATIO = 4;
 
-    public static void main(final String[] args) throws NumberFormatException, UnknownHostException, InterruptedException, ExecutionException {
+    public static void main(final String[] args) throws UnknownHostException, InterruptedException, ExecutionException {
         if (args.length == 0 || (args.length == 1 && args[0].equalsIgnoreCase("--help"))) {
             LOG.info(Main.USAGE);
             return;

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 49c024bf0a383f4e5016c76ebbcb9a7ceced9ce6..4f5f320eaabe4ca188312d7cc42a1d552a8f489f 100644 (file)
--- 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
@@ -486,7 +486,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements PCEPSessi
     }
 
     @Override
-    public String getPeerId() {
+    public synchronized String getPeerId() {
         return this.session.getPeerPref().getIpAddress();
     }
 }