Minor refactors and cleanup

Author: prasanth08

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;
 

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();

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;
             }

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());
+                }
+            });
     }
 
     /**

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);

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);
         }

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;
 
     /**

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;
 

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);
     }
 
     /**

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);
         }
     }