Minor refactors and cleanup

prasanth08 · web-flow · commit b624000c8369 · 2023-10-20T14:05:59.000-04:00
diff --git a/driver/src/main/java/oracle/nosql/driver/Region.java b/driver/src/main/java/oracle/nosql/driver/Region.java
@@ -8,7 +8,6 @@
 package oracle.nosql.driver;
 
 import java.text.MessageFormat;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/driver/src/main/java/oracle/nosql/driver/http/Client.java b/driver/src/main/java/oracle/nosql/driver/http/Client.java
@@ -781,8 +781,7 @@ public Result execute(Request kvRequest) {
                 return res;
 
             } catch (AuthenticationException rae) {
-                if (authProvider != null &&
-                    authProvider instanceof StoreAccessTokenProvider) {
+                if (authProvider instanceof StoreAccessTokenProvider) {
                     final StoreAccessTokenProvider satp =
                         (StoreAccessTokenProvider) authProvider;
                     satp.bootstrapLogin();
diff --git a/driver/src/main/java/oracle/nosql/driver/httpclient/ConnectionPool.java b/driver/src/main/java/oracle/nosql/driver/httpclient/ConnectionPool.java
@@ -244,12 +244,7 @@ public void operationComplete(
                      * few milliseconds for the promise to be completed
                      * (successfully or not).
                      */
-                    loop.execute(new Runnable() {
-                            @Override
-                            public void run() {
-                                checkChannel(channel, promise);
-                            }
-                        });
+                    loop.execute(() -> checkChannel(channel, promise));
                 }
                 break;
             }
diff --git a/driver/src/main/java/oracle/nosql/driver/httpclient/HttpClient.java b/driver/src/main/java/oracle/nosql/driver/httpclient/HttpClient.java
@@ -492,16 +492,13 @@ public void runRequest(HttpRequest request,
          * another thread.
          */
         channel.writeAndFlush(request).
-            addListener(new ChannelFutureListener() {
-                    @Override
-                    public void operationComplete(ChannelFuture future) {
-                        if (!future.isSuccess()) {
-                            /* handleException logs this exception */
-                            handler.handleException("HttpClient: send failed",
-                                                    future.cause());
-                        }
-                    }
-                });
+            addListener((ChannelFutureListener) future -> {
+                if (!future.isSuccess()) {
+                    /* handleException logs this exception */
+                    handler.handleException("HttpClient: send failed",
+                                            future.cause());
+                }
+            });
     }
 
     /**
diff --git a/driver/src/main/java/oracle/nosql/driver/iam/SecurityTokenSupplier.java b/driver/src/main/java/oracle/nosql/driver/iam/SecurityTokenSupplier.java
@@ -14,7 +14,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPublicKey;
@@ -385,7 +385,7 @@ static Map<String, String> parseToken(String token) {
             }
             String[] jwt = splitJWT(token);
             String claimJson = new String(Base64.getUrlDecoder().decode(jwt[1]),
-                                          Charset.forName("UTF-8"));
+                    StandardCharsets.UTF_8);
 
             try {
                 JsonParser parser = createParser(claimJson);
diff --git a/driver/src/main/java/oracle/nosql/driver/query/SortIter.java b/driver/src/main/java/oracle/nosql/driver/query/SortIter.java
@@ -158,18 +158,11 @@ public boolean next(RuntimeControlBlock rcb) {
             }
 
             state.theResults.sort(
-                new Comparator<MapValue>() {
-
-                    @Override
-                    public int compare(MapValue v1, MapValue v2) {
-
-                        return Compare.sortResults(rcb,
-                                                   v1,
-                                                   v2,
-                                                   theSortFields,
-                                                   theSortSpecs);
-                    }
-                });
+                    (v1, v2) -> Compare.sortResults(rcb,
+                                               v1,
+                                               v2,
+                                               theSortFields,
+                                               theSortSpecs));
 
             state.setState(StateEnum.RUNNING);
         }
diff --git a/driver/src/main/java/oracle/nosql/driver/util/HttpRequestUtil.java b/driver/src/main/java/oracle/nosql/driver/util/HttpRequestUtil.java
@@ -20,6 +20,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
@@ -42,7 +43,7 @@
  * Utility to issue HTTP request using {@link HttpClient}.
  */
 public class HttpRequestUtil {
-    private static final Charset utf8 = Charset.forName("UTF-8");
+    private static final Charset utf8 = StandardCharsets.UTF_8;
     private static final int DEFAULT_DELAY_MS = 200;
 
     /**
diff --git a/driver/src/main/java/oracle/nosql/driver/util/SimpleRateLimiter.java b/driver/src/main/java/oracle/nosql/driver/util/SimpleRateLimiter.java
@@ -9,7 +9,6 @@
 
 import oracle.nosql.driver.RateLimiter;
 
-import java.lang.IllegalArgumentException;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 
diff --git a/driver/src/test/java/oracle/nosql/driver/MultiDeleteTest.java b/driver/src/test/java/oracle/nosql/driver/MultiDeleteTest.java
@@ -8,6 +8,7 @@
 package oracle.nosql.driver;
 
 import static oracle.nosql.driver.util.BinaryProtocol.WRITE_KB_LIMIT;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -214,7 +215,7 @@ private void runMultiDelete(MapValue pKey,
             }
         }
 
-        assertTrue(nDeleted == expNumDeleted);
+        assertEquals(nDeleted, expNumDeleted);
     }
 
     /**
diff --git a/driver/src/test/java/oracle/nosql/driver/QueryTest.java b/driver/src/test/java/oracle/nosql/driver/QueryTest.java
@@ -1140,10 +1140,10 @@ public void testPreparedLongRunning() {
         verbose("Finished: total=" + total + ", pass=" + passed +
                 ", timeouts=" + timeouts + ", exceptions=" + exceptions +
                 ", nullResults=" + nullResults);
-        assertTrue("Unexpected number of exceptions. Expected zero, got " +
-                   exceptions, exceptions == 0);
-        assertTrue("Unexpected number of null results. Expected zero, got " +
-                   nullResults, nullResults == 0);
+        assertEquals("Unexpected number of exceptions. Expected zero, got " +
+                exceptions, 0, exceptions);
+        assertEquals("Unexpected number of null results. Expected zero, got " +
+                nullResults, 0, nullResults);
         assertTrue("Expected last request to pass, but it failed", lastPassed);
     }
 
@@ -2338,8 +2338,8 @@ private void executeQuery(String query,
             }
             while (!queryReq.isDone());
 
-            assertTrue("Wrong number of rows returned, expect " + expNumRows +
-                ", but get " + numRows, numRows == expNumRows);
+            assertEquals("Wrong number of rows returned, expect " + expNumRows +
+                    ", but get " + numRows, numRows, expNumRows);
         }
     }
 
diff --git a/driver/src/test/java/oracle/nosql/driver/TimestampTest.java b/driver/src/test/java/oracle/nosql/driver/TimestampTest.java
@@ -11,6 +11,7 @@
 import static oracle.nosql.driver.util.TimestampUtil.getNanoSeconds;
 import static oracle.nosql.driver.util.TimestampUtil.getSeconds;
 import static oracle.nosql.driver.util.TimestampUtil.parseString;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -148,34 +149,34 @@ private void doPutGetDeleteTest(Timestamp ts, boolean putShouldSucceed) {
         assertReadKB(getRes);
 
         Timestamp val = value.get("ts0").getTimestamp();
-        assertTrue("Wrong value of ts0", val.compareTo(roundUp(ts, 0)) == 0);
+        assertEquals("Wrong value of ts0", 0, val.compareTo(roundUp(ts, 0)));
 
         val = value.get("ts1").getTimestamp();
-        assertTrue("Wrong value of ts1", val.compareTo(roundUp(ts, 1)) == 0);
+        assertEquals("Wrong value of ts1", 0, val.compareTo(roundUp(ts, 1)));
 
         val = value.get("ts2").getTimestamp();
-        assertTrue("Wrong value of ts2", val.compareTo(roundUp(ts, 2)) == 0);
+        assertEquals("Wrong value of ts2", 0, val.compareTo(roundUp(ts, 2)));
 
         val = value.get("ts3").getTimestamp();
-        assertTrue("Wrong value of ts3", val.compareTo(roundUp(ts, 3)) == 0);
+        assertEquals("Wrong value of ts3", 0, val.compareTo(roundUp(ts, 3)));
 
         val = value.get("ts4").getTimestamp();
-        assertTrue("Wrong value of ts4", val.compareTo(roundUp(ts, 4)) == 0);
+        assertEquals("Wrong value of ts4", 0, val.compareTo(roundUp(ts, 4)));
 
         val = value.get("ts5").getTimestamp();
-        assertTrue("Wrong value of ts5", val.compareTo(roundUp(ts, 5)) == 0);
+        assertEquals("Wrong value of ts5", 0, val.compareTo(roundUp(ts, 5)));
 
         val = value.get("ts6").getTimestamp();
-        assertTrue("Wrong value of ts6", val.compareTo(roundUp(ts, 6)) == 0);
+        assertEquals("Wrong value of ts6", 0, val.compareTo(roundUp(ts, 6)));
 
         val = value.get("ts7").getTimestamp();
-        assertTrue("Wrong value of ts7", val.compareTo(roundUp(ts, 7)) == 0);
+        assertEquals("Wrong value of ts7", 0, val.compareTo(roundUp(ts, 7)));
 
         val = value.get("ts8").getTimestamp();
-        assertTrue("Wrong value of ts8", val.compareTo(roundUp(ts, 8)) == 0);
+        assertEquals("Wrong value of ts8", 0, val.compareTo(roundUp(ts, 8)));
 
         val = value.get("ts9").getTimestamp();
-        assertTrue("Wrong value of ts9", val.compareTo(roundUp(ts, 9)) == 0);
+        assertEquals("Wrong value of ts9", 0, val.compareTo(roundUp(ts, 9)));
 
         /* Delete the row */
         DeleteRequest delRequest = new DeleteRequest()
diff --git a/driver/src/test/java/oracle/nosql/driver/WriteMultipleTest.java b/driver/src/test/java/oracle/nosql/driver/WriteMultipleTest.java
@@ -963,8 +963,8 @@ private void assertTimeToLive(TimeToLive ttl,
         final long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
 
         if (ttl == null || ttl.getValue() == 0) {
-            assertTrue("Expiration time should be " + origExTime + ": " +
-                       actExTime, actExTime == origExTime);
+            assertEquals("Expiration time should be " + origExTime + ": " +
+                    actExTime, actExTime, origExTime);
         } else {
             assertTrue("Expiration time should be greater than 0",
                        actExTime > 0);

Original file line number	Diff line number	Diff line change
`@@ -244,12 +244,7 @@ public void operationComplete(`
`244`	`244`	`* few milliseconds for the promise to be completed`
`245`	`245`	`* (successfully or not).`
`246`	`246`	`*/`
`247`		`- loop.execute(new Runnable() {`
`248`		`- @Override`
`249`		`- public void run() {`
`250`		`- checkChannel(channel, promise);`
`251`		`- }`
`252`		`- });`
	`247`	`+ loop.execute(() -> checkChannel(channel, promise));`
`253`	`248`	`}`
`254`	`249`	`break;`
`255`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`package oracle.nosql.driver;`
`9`	`9`
`10`	`10`	`import static oracle.nosql.driver.util.BinaryProtocol.WRITE_KB_LIMIT;`
	`11`	`+import static org.junit.Assert.assertEquals;`
`11`	`12`	`import static org.junit.Assert.assertNotNull;`
`12`	`13`	`import static org.junit.Assert.assertTrue;`
`13`	`14`	`import static org.junit.Assert.fail;`
`@@ -214,7 +215,7 @@ private void runMultiDelete(MapValue pKey,`
`214`	`215`	`}`
`215`	`216`	`}`
`216`	`217`
`217`		`- assertTrue(nDeleted == expNumDeleted);`
	`218`	`+ assertEquals(nDeleted, expNumDeleted);`
`218`	`219`	`}`
`219`	`220`
`220`	`221`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1140,10 +1140,10 @@ public void testPreparedLongRunning() {`
`1140`	`1140`	`verbose("Finished: total=" + total + ", pass=" + passed +`
`1141`	`1141`	`", timeouts=" + timeouts + ", exceptions=" + exceptions +`
`1142`	`1142`	`", nullResults=" + nullResults);`
`1143`		`- assertTrue("Unexpected number of exceptions. Expected zero, got " +`
`1144`		`- exceptions, exceptions == 0);`
`1145`		`- assertTrue("Unexpected number of null results. Expected zero, got " +`
`1146`		`- nullResults, nullResults == 0);`
	`1143`	`+ assertEquals("Unexpected number of exceptions. Expected zero, got " +`
	`1144`	`+ exceptions, 0, exceptions);`
	`1145`	`+ assertEquals("Unexpected number of null results. Expected zero, got " +`
	`1146`	`+ nullResults, 0, nullResults);`
`1147`	`1147`	`assertTrue("Expected last request to pass, but it failed", lastPassed);`
`1148`	`1148`	`}`
`1149`	`1149`
`@@ -2338,8 +2338,8 @@ private void executeQuery(String query,`
`2338`	`2338`	`}`
`2339`	`2339`	`while (!queryReq.isDone());`
`2340`	`2340`
`2341`		`- assertTrue("Wrong number of rows returned, expect " + expNumRows +`
`2342`		`- ", but get " + numRows, numRows == expNumRows);`
	`2341`	`+ assertEquals("Wrong number of rows returned, expect " + expNumRows +`
	`2342`	`+ ", but get " + numRows, numRows, expNumRows);`
`2343`	`2343`	`}`
`2344`	`2344`	`}`
`2345`	`2345`