Be more consistent with time unit naming

2 files changed, 12 insertions, 12 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index 3495ce42159..659803beb60 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -386,7 +386,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                 return;
             }
             transitionTo(new StateDescription(State.WORKING));
-            taskExecutor.submitTask(new SendCreateVisitorsTask(sessionTimeoutMs()));
+            taskExecutor.submitTask(new SendCreateVisitorsTask(sessionTimeoutMillis()));
         }
     }
 
@@ -937,11 +937,11 @@ public class MessageBusVisitorSession implements VisitorSession {
                     || enoughHitsReceived());
     }
 
-    private long sessionTimeoutMs() {
+    private long sessionTimeoutMillis() {
         return (params.getTimeoutMs() != -1) ? params.getTimeoutMs() : 5 * 60 * 1000;
     }
 
-    private long elapsedTimeMs() {
+    private long elapsedTimeMillis() {
         return TimeUnit.NANOSECONDS.toMillis(clock.monotonicNanoTime() - startTimeNanos);
     }
 
@@ -951,10 +951,10 @@ public class MessageBusVisitorSession implements VisitorSession {
      * scheduled such a task.
      */
     private void scheduleSendCreateVisitorsIfApplicable(long delay, TimeUnit unit) {
-        final long elapsedMs = elapsedTimeMs();
-        final long timeoutMs = sessionTimeoutMs();
-        if (elapsedMs >= timeoutMs) {
-            transitionTo(new StateDescription(State.TIMED_OUT, String.format("Session timeout of %d ms expired", timeoutMs)));
+        final long elapsedMillis = elapsedTimeMillis();
+        final long timeoutMillis = sessionTimeoutMillis();
+        if (elapsedMillis >= timeoutMillis) {
+            transitionTo(new StateDescription(State.TIMED_OUT, String.format("Session timeout of %d ms expired", timeoutMillis)));
             if (visitingCompleted()) {
                 markSessionCompleted();
             }
@@ -963,8 +963,8 @@ public class MessageBusVisitorSession implements VisitorSession {
         if (!mayScheduleCreateVisitorsTask()) {
             return;
         }
-        final long messageTimeoutMs = timeoutMs - elapsedMs;
-        taskExecutor.scheduleTask(new SendCreateVisitorsTask(messageTimeoutMs), delay, unit);
+        final long messageTimeoutMillis = timeoutMillis - elapsedMillis;
+        taskExecutor.scheduleTask(new SendCreateVisitorsTask(messageTimeoutMillis), delay, unit);
         scheduledSendCreateVisitors = true;
     }
 
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
index a9c8ee88082..c6352639af5 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
@@ -2448,13 +2448,13 @@ public class MessageBusVisitorSessionTestCase {
                 mc.receiver.repliesToString());
     }
 
-    private MockComponents createTimeoutMocksAtInitialTime(long timeoutMs, long currentTimeMs, int maxPending) {
+    private MockComponents createTimeoutMocksAtInitialTime(long timeoutMillis, long currentTimeMillis, int maxPending) {
         MockComponentsBuilder builder = new MockComponentsBuilder();
-        builder.params.setTimeoutMs(timeoutMs);
+        builder.params.setTimeoutMs(timeoutMillis);
         builder.params.setControlHandler(builder.controlHandler);
         MockComponents mc = builder.createMockComponents();
         mc.sender.setMaxPending(maxPending);
-        mc.clock.setMonotonicTime(currentTimeMs, TimeUnit.MILLISECONDS); // Baseline time
+        mc.clock.setMonotonicTime(currentTimeMillis, TimeUnit.MILLISECONDS); // Baseline time
 
         mc.visitorSession.start();
         mc.controlHandler.resetMock(); // clear messages