From 5755cced016dd176508a8f1a9c35bfc863bc8cf9 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Tue, 2 Feb 2021 18:02:26 -0500
Subject: [PATCH] Use the scale in names.

---
 .../lang3/concurrent/EventCountCircuitBreaker.java     | 10 +++++-----
 .../lang3/concurrent/EventCountCircuitBreakerTest.java |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java
index f924eceb9..2d44a12e9 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java
@@ -293,7 +293,7 @@ public boolean incrementAndCheckState() {
     @Override
     public void open() {
         super.open();
-        checkIntervalData.set(new CheckIntervalData(0, now()));
+        checkIntervalData.set(new CheckIntervalData(0, nanoTime()));
     }
 
     /**
@@ -305,7 +305,7 @@ public void open() {
     @Override
     public void close() {
         super.close();
-        checkIntervalData.set(new CheckIntervalData(0, now()));
+        checkIntervalData.set(new CheckIntervalData(0, nanoTime()));
     }
 
     /**
@@ -321,7 +321,7 @@ private boolean performStateCheck(final int increment) {
         State currentState;
 
         do {
-            final long time = now();
+            final long time = nanoTime();
             currentState = state.get();
             currentData = checkIntervalData.get();
             nextData = nextCheckIntervalData(increment, currentData, currentState, time);
@@ -360,7 +360,7 @@ private boolean updateCheckIntervalData(final CheckIntervalData currentData,
      */
     private void changeStateAndStartNewCheckInterval(final State newState) {
         changeState(newState);
-        checkIntervalData.set(new CheckIntervalData(0, now()));
+        checkIntervalData.set(new CheckIntervalData(0, nanoTime()));
     }
 
     /**
@@ -391,7 +391,7 @@ private CheckIntervalData nextCheckIntervalData(final int increment,
      *
      * @return the current time in nanoseconds
      */
-    long now() {
+    long nanoTime() {
         return System.nanoTime();
     }
 
diff --git a/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java b/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java
index 02a929005..1a3e2cf49 100644
--- a/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreakerTest.java
@@ -96,7 +96,7 @@ public void testInitiallyClosed() {
     public void testNow() {
         final EventCountCircuitBreaker breaker = new EventCountCircuitBreaker(OPENING_THRESHOLD, 1,
                 TimeUnit.SECONDS);
-        final long nowNanos = breaker.now();
+        final long nowNanos = breaker.nanoTime();
         final long deltaNanos = Math.abs(System.nanoTime() - nowNanos);
         assertTrue(deltaNanos < 100_000, String.format("Delta %,d ns to current time too large", deltaNanos));
     }
@@ -364,7 +364,7 @@ public EventCountCircuitBreakerTestImpl at(final long time) {
          * method.
          */
         @Override
-        long now() {
+        long nanoTime() {
             return currentTime;
         }
     }