From 32de58ddec79025c40342566a93fb8bf52077334 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 14 Sep 2019 08:27:19 +0200 Subject: [PATCH] Add @SupressFBWarnings around Await.result() Await.result() is throwing Exceptions we need to catch, raising the ire of SpotBugs. Suppress that. Change-Id: I1a880c86a8ab1759c5741dd27c8341d89452c7e8 Signed-off-by: Robert Varga --- .../entityownership/DistributedEntityOwnershipService.java | 2 ++ .../jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java index 42ac5a4e39..c2e4aab5a4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java @@ -18,6 +18,7 @@ import akka.pattern.Patterns; import akka.util.Timeout; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; @@ -215,6 +216,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @VisibleForTesting @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "Akka's Await.result() API contract") DataTree getLocalEntityOwnershipShardDataTree() { if (localEntityOwnershipShardDataTree == null) { try { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java index 0dadd69e2f..6c6726ca08 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java @@ -15,6 +15,7 @@ import akka.dispatch.Futures; import akka.pattern.Patterns; import akka.util.Timeout; import com.google.common.base.Throwables; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -59,7 +60,8 @@ public class ShardDataTreeListenerInfoMXBeanImpl extends AbstractMXBean implemen } @SuppressWarnings("checkstyle:IllegalCatch") - private static List getListenerActorsInfo(Collection actors) { + @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "Akka's Await.result() API contract") + private static List getListenerActorsInfo(final Collection actors) { final Timeout timeout = new Timeout(20, TimeUnit.SECONDS); final List> futureList = new ArrayList<>(actors.size()); for (ActorSelection actor: actors) { -- 2.36.6