Remove a constructor from the SessionCleaner

jimedelstein · May 12, 2017 · c87f2dc · c87f2dc
1 parent a17ee39
commit c87f2dc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/DriverServlet.java b/java/server/src/org/openqa/selenium/remote/server/DriverServlet.java
@@ -112,7 +112,8 @@ private synchronized Logger configureLogging() {
   @VisibleForTesting
   protected void createSessionCleaner(Logger logger, DriverSessions driverSessions,
                                     long sessionTimeOutInMs, long browserTimeoutInMs) {
-    sessionCleaner = new SessionCleaner(driverSessions, logger, sessionTimeOutInMs, browserTimeoutInMs);
+    sessionCleaner = new SessionCleaner(driverSessions, logger, new SystemClock(),
+                                        sessionTimeOutInMs, browserTimeoutInMs);
     sessionCleaner.start();
   }
 

diff --git a/java/server/src/org/openqa/selenium/remote/server/SessionCleaner.java b/java/server/src/org/openqa/selenium/remote/server/SessionCleaner.java
@@ -38,11 +38,12 @@ class SessionCleaner extends Thread {   // Thread safety reviewed
   private final Clock clock;
   private volatile boolean running = true;
 
-  SessionCleaner(DriverSessions driverSessions, Logger log, long clientGoneTimeout, long insideBrowserTimeout) {
-    this(driverSessions, log, new SystemClock(), clientGoneTimeout, insideBrowserTimeout);
-  }
-
-  SessionCleaner(DriverSessions driverSessions, Logger log, Clock clock, long clientGoneTimeout, long insideBrowserTimeout) {
+  SessionCleaner(
+      DriverSessions driverSessions,
+      Logger log,
+      Clock clock,
+      long clientGoneTimeout,
+      long insideBrowserTimeout) {
     super("DriverServlet Session Cleaner");
     this.log = log;
     this.clock = clock;

diff --git a/java/server/test/org/openqa/selenium/remote/server/SessionCleanerTest.java b/java/server/test/org/openqa/selenium/remote/server/SessionCleanerTest.java
@@ -54,7 +54,12 @@ public void testCleanup() throws Exception {
     defaultDriverSessions.newSession(DesiredCapabilities.firefox());
     defaultDriverSessions.newSession(DesiredCapabilities.firefox());
     assertEquals(2, defaultDriverSessions.getSessions().size());
-    SessionCleaner sessionCleaner = new SessionCleaner(defaultDriverSessions, log, 10, 10);
+    SessionCleaner sessionCleaner = new SessionCleaner(
+        defaultDriverSessions,
+        log,
+        new SystemClock(),
+        10,
+        10);
     waitForAllSessionsToExpire(11);
     sessionCleaner.checkExpiry();
     assertEquals(0, defaultDriverSessions.getSessions().size());
@@ -75,7 +80,7 @@ public void testCleanupWithTimedOutKillableDriver() throws Exception {
     started.await();
 
     assertTrue(session.isInUse());
-    SessionCleaner sessionCleaner = new SessionCleaner(testSessions, log, 10, 10);
+    SessionCleaner sessionCleaner = new SessionCleaner(testSessions, log, new SystemClock(), 10, 10);
     waitForAllSessionsToExpire(11);
     sessionCleaner.checkExpiry();
     assertEquals(0, testSessions.getSessions().size());
@@ -130,7 +135,7 @@ private void waitForAllSessionsToExpire(long time) throws InterruptedException {
 
   class TestSessionCleaner extends SessionCleaner {
     TestSessionCleaner(DriverSessions driverSessions, Logger log, int sessionTimeOutInMs) {
-      super(driverSessions, log, sessionTimeOutInMs, sessionTimeOutInMs);
+      super(driverSessions, log, new SystemClock(), sessionTimeOutInMs, sessionTimeOutInMs);
     }
 
     @Override