Improve timeout check error message

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / common / actor / CommonConfig.java

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 48afe40607907786ebddd2260746bd18f9a2f9c3..6a350afc8eed3e33a19fce622a2028c5752ecd02 100644 (file)
--- 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,15 +7,13 @@
  */
 package org.opendaylight.controller.cluster.common.actor;
 
+import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.common.base.Preconditions;
 import com.typesafe.config.Config;
-import scala.concurrent.duration.Duration;
-import scala.concurrent.duration.FiniteDuration;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import scala.concurrent.duration.FiniteDuration;
 
 public class CommonConfig extends AbstractConfig {
 
@@ -43,8 +41,8 @@ public class CommonConfig extends AbstractConfig {
         return get().getString(TAG_ACTOR_SYSTEM_NAME);
     }
 
-    public boolean isMetricCaptureEnabled(){
-        if (cachedMetricCaptureEnableFlag != null){
+    public boolean isMetricCaptureEnabled() {
+        if (cachedMetricCaptureEnableFlag != null) {
             return cachedMetricCaptureEnableFlag;
         }
 
@@ -65,7 +63,7 @@ public class CommonConfig extends AbstractConfig {
             return cachedMailBoxCapacity;
         }
 
-        final String PATH = new StringBuilder(TAG_MAILBOX).append(".").append(TAG_MAILBOX_CAPACITY).toString();
+        final String PATH = TAG_MAILBOX + "." + TAG_MAILBOX_CAPACITY;
         cachedMailBoxCapacity = get().hasPath(PATH)
                 ? get().getInt(PATH)
                 : DEFAULT_MAILBOX_CAPACITY;
@@ -79,17 +77,17 @@ public class CommonConfig extends AbstractConfig {
             return cachedMailBoxPushTimeout;
         }
 
-        final String PATH = new StringBuilder(TAG_MAILBOX).append(".").append(TAG_MAILBOX_PUSH_TIMEOUT).toString();
+        final String PATH = TAG_MAILBOX + "." + TAG_MAILBOX_PUSH_TIMEOUT;
 
         long timeout = get().hasPath(PATH)
                 ? get().getDuration(PATH, TimeUnit.NANOSECONDS)
                 : DEFAULT_MAILBOX_PUSH_TIMEOUT;
 
-        cachedMailBoxPushTimeout = new FiniteDuration(timeout, TimeUnit.NANOSECONDS);
+        cachedMailBoxPushTimeout = FiniteDuration.create(timeout, TimeUnit.NANOSECONDS);
         return cachedMailBoxPushTimeout;
     }
 
-    public static class Builder<T extends Builder> extends AbstractConfig.Builder<T>{
+    public static class Builder<T extends Builder<T>> extends AbstractConfig.Builder<T> {
 
         public Builder(String actorSystemName) {
             super(actorSystemName);
@@ -101,22 +99,25 @@ public class CommonConfig extends AbstractConfig {
             configHolder.put(TAG_MAILBOX, new HashMap<String, Object>());
         }
 
+        @SuppressWarnings("unchecked")
         public T metricCaptureEnabled(boolean enabled) {
             configHolder.put(TAG_METRIC_CAPTURE_ENABLED, String.valueOf(enabled));
             return (T)this;
         }
 
+        @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);
             return (T)this;
         }
 
-        public T mailboxPushTimeout(String timeout){
-            Duration pushTimeout = Duration.create(timeout);
-            Preconditions.checkArgument(pushTimeout.isFinite(), "invalid value for mailbox push timeout");
+        @SuppressWarnings("unchecked")
+        public T mailboxPushTimeout(String 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);