From 4ab0ad7fd8743175737b390dae5d13d0736f6ecc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Aug 2018 17:29:30 +0200 Subject: [PATCH] Fix findbugs warnings These bugs are reported by upgraded findbugs, fix them prior to the actual upgrade. Change-Id: I0c21059a289abec1631f3a7b324c771091930804 Signed-off-by: Robert Varga --- .../org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java | 2 +- .../org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java | 2 +- .../opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java | 2 +- .../protocol/bgp/rib/impl/EffectiveRibInWriter.java | 2 +- .../protocol/bgp/rib/impl/StrictBGPPeerRegistry.java | 2 +- .../java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java | 2 +- .../rib/spi/util/ClusterSingletonServiceRegistrationHelper.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java index 5f6de622dc..e42328069e 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java @@ -78,7 +78,7 @@ public final class OffsetMap { final Builder builder = ImmutableSet.builder(); final int index = indexOfRouterId(key); if (index < 0) { - LOG.trace("Router key not found", key); + LOG.trace("Router key {} not found", key); } else { builder.add(removeValue(this.routeKeys, index, EMPTY_KEYS)); } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java index d07ccf3b51..fad05e78e8 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java @@ -81,7 +81,7 @@ final class OffsetMap { final Builder builder = ImmutableSet.builder(); final int index = indexOfRouterId(key); if (index < 0) { - LOG.trace("Router key not found", key); + LOG.trace("Router key {} not found", key); } else { builder.add(removeValue(this.routeKeys, index, EMPTY_KEYS)); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java index b3c1665a5e..540e5eacee 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java @@ -66,7 +66,7 @@ public final class CodecsRegistryImpl implements CodecsRegistry { try { codecs.onCodecTreeUpdated(this.latestCodecTree); } catch (final Exception e) { - LOG.error("Codec creation threw {}", e.getMessage(), e); + LOG.error("Codec creation threw {}", e); } } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index eee78d287c..437136e8c0 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -300,7 +300,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn = this.effRibTables.child(Tables.class, tableKey); // Create an empty table - LOG.trace("Create Empty table", tablePath); + LOG.trace("Create Empty table at {}", tablePath); if (table.getDataBefore() == null) { tx.put(LogicalDatastoreType.OPERATIONAL, tablePath, new TablesBuilder() .setAfi(tableKey.getAfi()).setSafi(tableKey.getSafi()) diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java index 477cd61684..0fa2fa7f14 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java @@ -179,7 +179,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { return this.peers.get(ip); // Session reestablished with same source bgp id, dropping current as duplicate } else { - LOG.warn("BGP session with %s initiated from %s to %s has to be dropped. Same session already present", + LOG.warn("BGP session with {} initiated from {} to {} has to be dropped. Same session already present", ip, sourceId, remoteId); throw new BGPDocumentedException( String.format("BGP session with %s initiated %s has to be dropped. " diff --git a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java index 303f154c48..61f82893b5 100644 --- a/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java +++ b/bgp/rib-mock/src/main/java/org/opendaylight/protocol/bgp/rib/mock/BGPMock.java @@ -61,7 +61,7 @@ public final class BGPMock implements Closeable { messages.add(registry.parseMessage(Unpooled.copiedBuffer(body), null)); } } catch (final BGPDocumentedException | BGPParsingException e) { - LOG.warn("Failed to parse message {}", e.getMessage(), e); + LOG.warn("Failed to parse message", e); } return messages; } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelper.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelper.java index 9c3174ecef..19f9b20e96 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelper.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelper.java @@ -56,7 +56,7 @@ public final class ClusterSingletonServiceRegistrationHelper { throw e; } attempts--; - LOG.warn("Failed to register {} service to ClusterSingletonServiceProvider. Try again in {} ms. {}", + LOG.warn("Failed to register {} service to ClusterSingletonServiceProvider. Try again in {} ms.", clusterSingletonService, sleepTime, e); Uninterruptibles.sleepUninterruptibly(sleepTime, TimeUnit.MILLISECONDS); } -- 2.36.6