From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 5 Dec 2018 10:26:34 +0000 (+0100)
Subject: Improve timeout check error message
X-Git-Tag: release/neon~42
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f23c0bb85435ad6b41baa2e551fa84c81a44349b

Improve timeout check error message

Report the value being set in checkArgument.

Change-Id: I76e88504f794300634f61b293876e1677c549792
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java
index d57134d11d..6a350afc8e 100644
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.controller.cluster.common.actor;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.typesafe.config.Config;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 
 public class CommonConfig extends AbstractConfig {
@@ -83,7 +83,7 @@ public class CommonConfig extends AbstractConfig {
                 ? get().getDuration(PATH, TimeUnit.NANOSECONDS)
                 : DEFAULT_MAILBOX_PUSH_TIMEOUT;
 
-        cachedMailBoxPushTimeout = new FiniteDuration(timeout, TimeUnit.NANOSECONDS);
+        cachedMailBoxPushTimeout = FiniteDuration.create(timeout, TimeUnit.NANOSECONDS);
         return cachedMailBoxPushTimeout;
     }
 
@@ -107,7 +107,7 @@ public class CommonConfig extends AbstractConfig {
 
         @SuppressWarnings("unchecked")
         public T mailboxCapacity(int capacity) {
-            Preconditions.checkArgument(capacity > 0, "mailbox capacity must be >0");
+            checkArgument(capacity > 0, "mailbox capacity must be >0");
 
             Map<String, Object> boundedMailbox = (Map<String, Object>) configHolder.get(TAG_MAILBOX);
             boundedMailbox.put(TAG_MAILBOX_CAPACITY, capacity);
@@ -116,8 +116,8 @@ public class CommonConfig extends AbstractConfig {
 
         @SuppressWarnings("unchecked")
         public T mailboxPushTimeout(String timeout) {
-            Duration pushTimeout = Duration.create(timeout);
-            Preconditions.checkArgument(pushTimeout.isFinite(), "invalid value for mailbox push timeout");
+            checkArgument(FiniteDuration.create(timeout).isFinite(), "invalid value \"%s\" for mailbox push timeout",
+                timeout);
 
             Map<String, Object> boundedMailbox = (Map<String, Object>) configHolder.get(TAG_MAILBOX);
             boundedMailbox.put(TAG_MAILBOX_PUSH_TIMEOUT, timeout);