[wicket] branch master updated: Remove dependency on Guava

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new c5a5f4d  Remove dependency on Guava
c5a5f4d is described below

commit c5a5f4d78bfbd2278648667250925b791cb5aae1
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Fri May 10 12:57:17 2019 +0300

    Remove dependency on Guava
    
    Stopwatch class was used by a single test
    
    (cherry picked from commit 00f5dfbb0bf70165bc48b2ec66298d11a50109d0)
---
 pom.xml                                                 |  5 -----
 wicket-core/pom.xml                                     |  5 -----
 .../wicket/pageStore/AsynchronousPageStoreTest.java     | 17 ++++++-----------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66f5d81..a05fbe2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,11 +222,6 @@
                                <type>jar</type>
                        </dependency>
                        <dependency>
-                               <groupId>com.google.guava</groupId>
-                               <artifactId>guava</artifactId>
-                               <version>27.0.1-jre</version>
-                       </dependency>
-                       <dependency>
                                <groupId>com.google.inject</groupId>
                                <artifactId>guice</artifactId>
                                <version>4.2.2</version>
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 9b6c5ca..18ee93f 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -68,11 +68,6 @@
                        <artifactId>jdk-serializable-functional</artifactId>
                </dependency>
                <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
                        <scope>test</scope>
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
index 0dd7cb4..7bad045 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java
@@ -40,8 +40,6 @@ import org.apache.wicket.util.WicketTestTag;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.base.Stopwatch;
-
 
 /**
  * AsynchronousPageStoreTest
@@ -449,8 +447,6 @@ public class AsynchronousPageStoreTest
 
                IPageStore asyncPageStore = new 
AsynchronousPageStore(pageStore, asyncPageStoreCapacity);
 
-               Stopwatch stopwatch = Stopwatch.createUnstarted();
-
                for (int pageId = 1; pageId <= pages; pageId++)
                {
                        for (int i = 1; i <= sessions; i++)
@@ -459,18 +455,17 @@ public class AsynchronousPageStoreTest
                                IPageContext context = new 
MockPageContext(sessionId);
                                Metrics metrics = new Metrics();
 
-                               stopwatch.reset();
-                               DummyPage page = new DummyPage(pageId, 
around(writeMillis), around(readMillis), sessionId);
-                               stopwatch.start();
+                               DummyPage page = new DummyPage(pageId, 
around(writeMillis), around(readMillis),
+                                               sessionId);
+                               final long startStoring = 
System.currentTimeMillis();
                                asyncPageStore.addPage(context, page);
                                metrics.storedPage = page;
-                               metrics.storingMillis = 
stopwatch.elapsed(TimeUnit.MILLISECONDS);
+                               metrics.storingMillis = 
System.currentTimeMillis() - startStoring;
 
-                               stopwatch.reset();
-                               stopwatch.start();
+                               final long startRestoring = 
System.currentTimeMillis();
                                metrics.restoredPage = DummyPage.class
                                                
.cast(asyncPageStore.getPage(context, pageId));
-                               metrics.restoringMillis = 
stopwatch.elapsed(TimeUnit.MILLISECONDS);
+                               metrics.restoringMillis = 
System.currentTimeMillis() - startRestoring;
 
                                results.add(metrics);
                        }