From: Robert Varga Date: Mon, 3 Jul 2017 08:17:54 +0000 (+0200) Subject: Fix Verify/Preconditions string format X-Git-Tag: release/nitrogen~54 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b712eb01354ddb5878008e2a2e8f03fb19b92555 Fix Verify/Preconditions string format These methods take a String.format() string, not a logging one, hence we are not getting the information we want. Change-Id: I46de0d64c85594e3d7b8be97951f1cf5249bca8f Signed-off-by: Robert Varga (cherry picked from commit 3e9ac68fea1aef0c7fedec346e50882efdde8acc) --- diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java index 97c42803ef..7a1a74e75f 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java @@ -437,8 +437,8 @@ class ConfigTransactionControllerImpl implements LOG.debug("About to commit {} in transaction {}", moduleIdentifier, getTransactionIdentifier()); AutoCloseable instance = module.getInstance(); - Preconditions.checkNotNull(instance, "Instance is null:{} in transaction {}", moduleIdentifier, getTransactionIdentifier()); - } catch (final Exception e) { + Preconditions.checkNotNull(instance, "Instance is null:%s in transaction %s", moduleIdentifier, getTransactionIdentifier()); + } catch (Exception e) { LOG.error("Commit failed on {} in transaction {}", moduleIdentifier, getTransactionIdentifier(), e); internalAbort(); diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/InternalJMXRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/InternalJMXRegistrator.java index 147d6ee369..7d0bee2533 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/InternalJMXRegistrator.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/InternalJMXRegistrator.java @@ -88,7 +88,7 @@ abstract class InternalJMXRegistrator implements AutoCloseable { final synchronized void unregisterMBean(final ObjectName on) { // first check that on was registered using this instance boolean removed = registeredObjectNames.remove(on); - Preconditions.checkState(removed, "Cannot unregister - ObjectName not found in 'registeredObjectNames': {}", on); + Preconditions.checkState(removed, "Cannot unregister - ObjectName not found in 'registeredObjectNames': %s", on); try { getMBeanServer().unregisterMBean(on); diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java index ae047efc25..6f283f549c 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/TransmitQueue.java @@ -246,7 +246,7 @@ abstract class TransmitQueue { } final void setForwarder(final ReconnectForwarder forwarder, final long now) { - Verify.verify(successor == null, "Successor {} already set on connection {}", successor, this); + Verify.verify(successor == null, "Successor %s already set on connection %s", successor, this); successor = Preconditions.checkNotNull(forwarder); LOG.debug("Connection {} superseded by {}, splicing queue", this, successor); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java index 07b89e0923..2988c391a3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java @@ -364,7 +364,7 @@ abstract class AbstractProxyTransaction implements Identifiable maybeProtocol = request.getPersistenceProtocol(); if (maybeProtocol.isPresent()) { - Verify.verify(callback != null, "Request {} has null callback", request); + Verify.verify(callback != null, "Request %s has null callback", request); if (markSealed()) { sealOnly(); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 99c03768ed..277c09f730 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -699,11 +699,11 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat public CDSShardAccess getShardAccess(@Nonnull final DOMDataTreeIdentifier subtree) { Preconditions.checkArgument( subtrees.stream().anyMatch(dataTreeIdentifier -> dataTreeIdentifier.contains(subtree)), - "Subtree {} is not controlled by this producer {}", subtree, this); + "Subtree %s is not controlled by this producer %s", subtree, this); final DOMDataTreePrefixTableEntry> lookup = shardTable.lookup(subtree); - Preconditions.checkState(lookup != null, "Subtree {} is not contained in any registered shard."); + Preconditions.checkState(lookup != null, "Subtree %s is not contained in any registered shard.", subtree); final DOMDataTreeIdentifier lookupId = lookup.getValue().getPrefix(); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java index c7e8ced21a..df0dbcd77d 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java @@ -334,7 +334,7 @@ public final class PingPongTransactionChain implements DOMTransactionChain { synchronized void cancelTransaction(final PingPongTransaction tx, final DOMDataReadWriteTransaction frontendTx) { // Attempt to unlock the operation. final boolean lockedMatch = LOCKED_UPDATER.compareAndSet(this, tx, null); - Verify.verify(lockedMatch, "Cancelling transaction {} collided with locked transaction {}", tx, lockedTx); + Verify.verify(lockedMatch, "Cancelling transaction %s collided with locked transaction %s", tx, lockedTx); // Cancel the backend transaction, so we do not end up leaking it. final boolean backendCancelled = tx.getTransaction().cancel(); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java index 9898ce9bb9..f8a16b606a 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java @@ -200,7 +200,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact final State localState = state; do { - Preconditions.checkState(!CLOSED.equals(localState), "Transaction chain {} has been closed", this); + Preconditions.checkState(!CLOSED.equals(localState), "Transaction chain %s has been closed", this); if (FAILED.equals(localState)) { LOG.debug("Ignoring user close in failed state");