Fix checkstyle issues reported by odlparent-3.0.0's checkstyle

[yangtools.git] / common / util / src / main / java / org / opendaylight / yangtools / util / DurationStatisticsTracker.java

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java b/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java
index 10cb39ce7571f6b629c80944d593795a9540a27c..e3d121d68935bce66b867f3bbe2d835e0fac86e4 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java
@@ -11,6 +11,7 @@ import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.common.annotations.Beta;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -181,11 +182,10 @@ public abstract class DurationStatisticsTracker {
     }
 
     private static String formatDuration(final DurationWithTime current) {
-        if (current != null) {
-            return formatDuration(current.getDuration(), current.getTimeMillis());
-        } else {
+        if (current == null) {
             return formatDuration(0, null);
         }
+        return formatDuration(current.getDuration(), current.getTimeMillis());
     }
 
     private static TimeUnit chooseUnit(final long nanos) {
@@ -204,23 +204,23 @@ public abstract class DurationStatisticsTracker {
 
     private static String abbreviate(final TimeUnit unit) {
         switch (unit) {
-        case NANOSECONDS:
-            return "ns";
-        case MICROSECONDS:
-            return "\u03bcs"; // μs
-        case MILLISECONDS:
-            return "ms";
-        case SECONDS:
-            return "s";
-        case MINUTES:
-            return "m";
-        case HOURS:
-            return "h";
-        case DAYS:
-            return "d";
+            case NANOSECONDS:
+                return "ns";
+            case MICROSECONDS:
+                return "μs";
+            case MILLISECONDS:
+                return "ms";
+            case SECONDS:
+                return "s";
+            case MINUTES:
+                return "m";
+            case HOURS:
+                return "h";
+            case DAYS:
+                return "d";
+            default:
+                LOG.warn("Unhandled time unit {}", unit);
+                return "";
         }
-
-        LOG.warn("Unhandled time unit {}", unit);
-        return "";
     }
 }