From b0f7db47eeb68cb1d36f1e2b83d0a3271f84f801 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:49:36 +0200 Subject: [PATCH 1/3] Added SimpleDurationUtil --- .../commons/time/SimpleDurationUtil.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java new file mode 100644 index 0000000..7f9f9c2 --- /dev/null +++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java @@ -0,0 +1,48 @@ +package com.eternalcode.commons.time; + +import java.time.Duration; +import java.time.temporal.ChronoUnit; + +public class SimpleDurationUtil { + + private static final Duration ONE_SECOND = Duration.ofSeconds(1); + private static final String ZERO_SECONDS = "0s"; + + private static final TemporalAmountParser WITHOUT_MILLIS_FORMAT = new DurationParser() + .withUnit("s", ChronoUnit.SECONDS) + .withUnit("m", ChronoUnit.MINUTES) + .withUnit("h", ChronoUnit.HOURS) + .withUnit("d", ChronoUnit.DAYS) + .withUnit("w", ChronoUnit.WEEKS) + .withUnit("mo", ChronoUnit.MONTHS) + .withUnit("y", ChronoUnit.YEARS) + .roundOff(ChronoUnit.MILLIS); + + private static final TemporalAmountParser STANDARD_FORMAT = new DurationParser() + .withUnit("ms", ChronoUnit.MILLIS) + .withUnit("s", ChronoUnit.SECONDS) + .withUnit("m", ChronoUnit.MINUTES) + .withUnit("h", ChronoUnit.HOURS) + .withUnit("d", ChronoUnit.DAYS) + .withUnit("w", ChronoUnit.WEEKS) + .withUnit("mo", ChronoUnit.MONTHS) + .withUnit("y", ChronoUnit.YEARS); + + public static String format(Duration duration, boolean removeMillis) { + if (removeMillis) { + if (duration.toMillis() < ONE_SECOND.toMillis()) { + return "0s"; + } + + return WITHOUT_MILLIS_FORMAT.format(duration); + } + + return STANDARD_FORMAT.format(duration); + } + + public static String format(Duration duration) { + return format(duration, false); + } + + +} From 24fa44a64f40e5ef760f3707b18e3e56e66d8564 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:50:03 +0200 Subject: [PATCH 2/3] Created tests for SimpleDurationUtil --- .../commons/time/SimpleDurationUtilTest.java | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 eternalcode-commons-shared/test/com/eternalcode/commons/time/SimpleDurationUtilTest.java diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/time/SimpleDurationUtilTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/time/SimpleDurationUtilTest.java new file mode 100644 index 0000000..e73e186 --- /dev/null +++ b/eternalcode-commons-shared/test/com/eternalcode/commons/time/SimpleDurationUtilTest.java @@ -0,0 +1,89 @@ +package com.eternalcode.commons.time; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import java.time.Duration; +import org.junit.jupiter.api.Test; + +public class SimpleDurationUtilTest { + + @Test + public void testFormatWithoutMillis() { + Duration duration = Duration.ofMillis(500); + String result = SimpleDurationUtil.format(duration, true); + assertEquals("0s", result); + + duration = Duration.ofSeconds(30); + result = SimpleDurationUtil.format(duration, true); + assertEquals("30s", result); + + duration = Duration.ofMinutes(5); + result = SimpleDurationUtil.format(duration, true); + assertEquals("5m", result); + + duration = Duration.ofHours(2); + result = SimpleDurationUtil.format(duration, true); + assertEquals("2h", result); + + duration = Duration.ofDays(1); + result = SimpleDurationUtil.format(duration, true); + assertEquals("1d", result); + + duration = Duration.ofDays(14); + result = SimpleDurationUtil.format(duration, true); + assertEquals("2w", result); + + duration = Duration.ofDays(60); + result = SimpleDurationUtil.format(duration, true); + assertEquals("2mo", result); + + duration = Duration.ofDays(365 * 3); + result = SimpleDurationUtil.format(duration, true); + assertEquals("3y", result); + } + + @Test + public void testFormatWithMillis() { + Duration duration = Duration.ofMillis(500); + String result = SimpleDurationUtil.format(duration, false); + assertEquals("500ms", result); + + duration = Duration.ofSeconds(30); + result = SimpleDurationUtil.format(duration, false); + assertEquals("30s", result); + + duration = Duration.ofMinutes(5); + result = SimpleDurationUtil.format(duration, false); + assertEquals("5m", result); + + duration = Duration.ofHours(2); + result = SimpleDurationUtil.format(duration, false); + assertEquals("2h", result); + + duration = Duration.ofDays(1); + result = SimpleDurationUtil.format(duration, false); + assertEquals("1d", result); + + duration = Duration.ofDays(14); + result = SimpleDurationUtil.format(duration, false); + assertEquals("2w", result); + + duration = Duration.ofDays(60); + result = SimpleDurationUtil.format(duration, false); + assertEquals("2mo", result); + + duration = Duration.ofDays(365 * 3); + result = SimpleDurationUtil.format(duration, false); + assertEquals("3y", result); + } + + @Test + public void testFormatDefault() { + Duration duration = Duration.ofSeconds(610); + String result = SimpleDurationUtil.format(duration); + assertEquals("10m10s", result); + + duration = Duration.ofMillis(120); + result = SimpleDurationUtil.format(duration); + assertEquals("120ms", result); + } +} From 482047fd4832ed76b93c83f734e8df9af49811fc Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:52:50 +0200 Subject: [PATCH 3/3] Added missing String value --- .../java/com/eternalcode/commons/time/SimpleDurationUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java index 7f9f9c2..a982811 100644 --- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java +++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/SimpleDurationUtil.java @@ -31,7 +31,7 @@ public class SimpleDurationUtil { public static String format(Duration duration, boolean removeMillis) { if (removeMillis) { if (duration.toMillis() < ONE_SECOND.toMillis()) { - return "0s"; + return ZERO_SECONDS; } return WITHOUT_MILLIS_FORMAT.format(duration);