Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git

This commit is contained in:
Gary Gregory 2022-08-21 14:31:38 -04:00
parent 60884907a7 2f153733c7
commit cf8b7edbe1
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/apache/commons/lang3/time/DurationUtils.java
View File

@ -56,7 +56,7 @@ public class DurationUtils {
public static <T extends Throwable> void accept(final FailableBiConsumer<Long, Integer, T> consumer, final Duration duration) public static <T extends Throwable> void accept(final FailableBiConsumer<Long, Integer, T> consumer, final Duration duration)
throws T { throws T {
if (consumer != null && duration != null) { if (consumer != null && duration != null) {
consumer.accept(duration.toMillis(), getNanosOfMiili(duration)); consumer.accept(duration.toMillis(), getNanosOfMilli(duration));
} }
} }
@ -72,8 +72,28 @@ public class DurationUtils {
* *
* @param duration The duration to query. * @param duration The duration to query.
* @return nanoseconds between 0 and 999,999. * @return nanoseconds between 0 and 999,999.
* @deprecated Use {@link #getNanosOfMilli(Duration)}.
*/ */
@Deprecated
public static int getNanosOfMiili(final Duration duration) { public static int getNanosOfMiili(final Duration duration) {
return getNanosOfMilli(duration);
}
/**
* Gets the nanosecond part of a Duration converted to milliseconds.
* <p>
* Handy when calling an API that takes a long of milliseconds and an int of nanoseconds. For example,
* {@link Object#wait(long, int)} and {@link Thread#sleep(long, int)}.
* </p>
* <p>
* Note that is this different from {@link Duration#getNano()} because a duration are seconds and nanoseconds.
* </p>
*
* @param duration The duration to query.
* @return nanoseconds between 0 and 999,999.
* @since 3.13.0
*/
public static int getNanosOfMilli(final Duration duration) {
return zeroIfNull(duration).getNano() % 1_000_000; return zeroIfNull(duration).getNano() % 1_000_000;
} }

14
src/test/java/org/apache/commons/lang3/time/DurationUtilsTest.java
View File

@ -38,6 +38,20 @@ public class DurationUtilsTest extends AbstractLangTest {
@Test @Test
public void testGetNanosOfMilli() { public void testGetNanosOfMilli() {
assertEquals(0, DurationUtils.getNanosOfMilli(null));
assertEquals(0, DurationUtils.getNanosOfMilli(Duration.ZERO));
assertEquals(1, DurationUtils.getNanosOfMilli(Duration.ofNanos(1)));
assertEquals(10, DurationUtils.getNanosOfMilli(Duration.ofNanos(10)));
assertEquals(100, DurationUtils.getNanosOfMilli(Duration.ofNanos(100)));
assertEquals(1_000, DurationUtils.getNanosOfMilli(Duration.ofNanos(1_000)));
assertEquals(10_000, DurationUtils.getNanosOfMilli(Duration.ofNanos(10_000)));
assertEquals(100_000, DurationUtils.getNanosOfMilli(Duration.ofNanos(100_000)));
assertEquals(0, DurationUtils.getNanosOfMilli(Duration.ofNanos(1_000_000)));
assertEquals(1, DurationUtils.getNanosOfMilli(Duration.ofNanos(1_000_001)));
}
@Test
public void testGetNanosOfMiili() {
assertEquals(0, DurationUtils.getNanosOfMiili(null)); assertEquals(0, DurationUtils.getNanosOfMiili(null));
assertEquals(0, DurationUtils.getNanosOfMiili(Duration.ZERO)); assertEquals(0, DurationUtils.getNanosOfMiili(Duration.ZERO));
assertEquals(1, DurationUtils.getNanosOfMiili(Duration.ofNanos(1))); assertEquals(1, DurationUtils.getNanosOfMiili(Duration.ofNanos(1)));