From e67033471962c210659599258252fb91e5b6791a Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 13 Nov 2020 19:36:38 +0100 Subject: [PATCH] Reformat TimeUtils and TimeUtilsTest --- .../org/mvndaemon/mvnd/common/TimeUtils.java | 28 +++++++++---------- .../mvndaemon/mvnd/common/TimeUtilsTest.java | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/TimeUtils.java b/common/src/main/java/org/mvndaemon/mvnd/common/TimeUtils.java index ea07effb..d5abefd0 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/TimeUtils.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/TimeUtils.java @@ -35,11 +35,11 @@ public final class TimeUtils { "(?-?\\d+)" + "|" + "(" + - "((?\\d+)\\s*d(ay(s)?)?)?" + "\\s*" + - "((?\\d+)\\s*h(our(s)?)?)?" + "\\s*" + - "((?\\d+)\\s*m(in(ute(s)?)?)?)?" + "\\s*" + - "((?\\d+(\\.\\d+)?)\\s*s(ec(ond(s)?)?)?)?" + "\\s*" + - "((?\\d+(\\.\\d+)?)\\s*m(illi)?s(ec(ond)?(s)?)?)?" + + "((?\\d+)\\s*d(ay(s)?)?)?" + "\\s*" + + "((?\\d+)\\s*h(our(s)?)?)?" + "\\s*" + + "((?\\d+)\\s*m(in(ute(s)?)?)?)?" + "\\s*" + + "((?\\d+(\\.\\d+)?)\\s*s(ec(ond(s)?)?)?)?" + "\\s*" + + "((?\\d+(\\.\\d+)?)\\s*m(illi)?s(ec(ond)?(s)?)?)?" + ")", Pattern.CASE_INSENSITIVE); @@ -57,13 +57,13 @@ public final class TimeUtils { /** * This will print time in human readable format from milliseconds. * Examples: - * 500 -> 500ms - * 1300 -> 1s300ms - * 310300 -> 5m10s300ms - * 6600000 -> 1h50m + * 500 -> 500ms + * 1300 -> 1s300ms + * 310300 -> 5m10s300ms + * 6600000 -> 1h50m * * @param millis time in milliseconds - * @return time in string + * @return time in string */ public static String printDuration(long millis) { if (millis < 0) { @@ -111,10 +111,10 @@ public final class TimeUtils { String s = matcher.group("s"); String l = matcher.group("l"); return (d != null ? TimeUnit.DAYS.toMillis(Long.parseLong(d)) : 0) - + (h != null ? TimeUnit.HOURS.toMillis(Long.parseLong(h)) : 0) - + (m != null ? TimeUnit.MINUTES.toMillis(Long.parseLong(m)) : 0) - + (s != null ? TimeUnit.SECONDS.toMillis(Long.parseLong(s)) : 0) - + (l != null ? TimeUnit.MILLISECONDS.toMillis(Long.parseLong(l)) : 0); + + (h != null ? TimeUnit.HOURS.toMillis(Long.parseLong(h)) : 0) + + (m != null ? TimeUnit.MINUTES.toMillis(Long.parseLong(m)) : 0) + + (s != null ? TimeUnit.SECONDS.toMillis(Long.parseLong(s)) : 0) + + (l != null ? TimeUnit.MILLISECONDS.toMillis(Long.parseLong(l)) : 0); } } diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java b/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java index 12bfcc25..26e3f83a 100644 --- a/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java +++ b/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java @@ -16,7 +16,6 @@ package org.mvndaemon.mvnd.common; import java.time.Duration; - import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals;