This is an automated email from the ASF dual-hosted git repository. adelbene pushed a commit to branch WICKET-6662 in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 6e08bb97a59c86cc9d34cf3717cb1c480b5a6f68 Author: Andrea Del Bene <[email protected]> AuthorDate: Sat Apr 27 20:44:54 2019 +0200 Moved method elapsedSince --- .../java/org/apache/wicket/page/PageAccessSynchronizer.java | 11 ++++------- .../org/apache/wicket/page/PageAccessSynchronizerTest.java | 7 +++++-- .../src/main/java/org/apache/wicket/util/time/Durations.java | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java b/wicket-core/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java index 829a073..8035de7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java @@ -23,11 +23,13 @@ import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; + import org.apache.wicket.Application; import org.apache.wicket.pageStore.IPageStore; import org.apache.wicket.settings.ExceptionSettings.ThreadDumpStrategy; import org.apache.wicket.util.LazyInitializer; import org.apache.wicket.util.lang.Threads; +import org.apache.wicket.util.time.Durations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +72,7 @@ public class PageAccessSynchronizer implements Serializable private static long remaining(Instant start, Duration timeout) { - Duration elapsedTime = elapsedSince(start); + Duration elapsedTime = Durations.elapsedSince(start); return Math.max(0, timeout.minus(elapsedTime).toMillis()); } @@ -106,7 +108,7 @@ public class PageAccessSynchronizer implements Serializable Duration timeout = getTimeout(pageId); - while (!locked && elapsedSince(start).compareTo(timeout) < 0) + while (!locked && Durations.elapsedSince(start).compareTo(timeout) < 0) { if (isDebugEnabled) { @@ -403,9 +405,4 @@ public class PageAccessSynchronizer implements Serializable notifyAll(); } } - - public static Duration elapsedSince(Instant start) - { - return Duration.between(start, Instant.now()); - } } diff --git a/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java b/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java index 85a5b03..db87ddb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java @@ -19,6 +19,7 @@ package org.apache.wicket.page; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; + import java.time.Duration; import java.time.Instant; import java.util.Random; @@ -26,11 +27,13 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; + import org.apache.wicket.MockPage; import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.mock.MockPageManager; import org.apache.wicket.page.PageAccessSynchronizer.PageLock; import org.apache.wicket.util.WicketTestTag; +import org.apache.wicket.util.time.Durations; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -141,10 +144,10 @@ class PageAccessSynchronizerTest Random random = new Random(); Instant start = Instant.now(); - while (PageAccessSynchronizer.elapsedSince(start).compareTo(duration) < 0 && error[0] == null) + while (Durations.elapsedSince(start).compareTo(duration) < 0 && error[0] == null) { logger.info("{} elapsed: {}, duration: {}", new Object[] { - Thread.currentThread().getName(), PageAccessSynchronizer.elapsedSince(start), duration }); + Thread.currentThread().getName(), Durations.elapsedSince(start), duration }); int page1 = random.nextInt(counts.length); int page2 = random.nextInt(counts.length); int count = 0; diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Durations.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Durations.java index 8601108..e8fc15d 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/time/Durations.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Durations.java @@ -17,19 +17,14 @@ package org.apache.wicket.util.time; import java.time.Duration; +import java.time.Instant; import java.util.Locale; -import java.util.regex.Pattern; import org.apache.wicket.util.string.StringValue; public class Durations { - /** pattern to match strings */ - private static final Pattern pattern = Pattern.compile( - "([0-9]+([.,][0-9]+)?)\\s+(millisecond|second|minute|hour|day)s?", - Pattern.CASE_INSENSITIVE); - public static String toString(final Duration duration, final Locale locale) { if (duration.toMillis() >= 0) @@ -77,4 +72,9 @@ public class Durations { return StringValue.valueOf(value, locale) + " " + units + ((value > 1.0) ? "s" : ""); } + + public static Duration elapsedSince(Instant start) + { + return Duration.between(start, Instant.now()); + } }
