address review comments

Author: stoty

hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/Client.java

@@ -26,6 +26,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
@@ -256,7 +257,7 @@ public Client(Cluster cluster, Configuration conf, boolean sslEnabled,
   /**
    * Constructor, allowing to define custom trust store (only for SSL connections) This constructor
    * also enables sticky mode. This is a preferred constructor when not using BASIC or JWT
-   * authentication. Clients created by this will not use the old faulty load balancing logic.
+   * authentication. Clients created by this will use the old faulty load balancing logic.
    * @param cluster            the cluster definition
    * @param conf               HBase/Hadoop Configuration
    * @param trustStorePath     custom trust store to use for SSL connections
@@ -267,7 +268,7 @@ public Client(Cluster cluster, Configuration conf, boolean sslEnabled,
   public Client(Cluster cluster, Configuration conf, boolean sslEnabled, String trustStorePath,
     Optional<String> trustStorePassword, Optional<String> trustStoreType) {
     KeyStore trustStore = loadTruststore(trustStorePath, trustStorePassword, trustStoreType);
-    initialize(cluster, conf, true, false, Optional.of(trustStore), Optional.empty(),
+    initialize(cluster, conf, sslEnabled, false, Optional.of(trustStore), Optional.empty(),
       Optional.empty(), Optional.empty());
   }
 
@@ -437,7 +438,6 @@ public HttpResponse executeURI(HttpUriRequest method, Header[] headers, String u
         throw new IOException(e);
       }
       if (stickyContext != null) {
-        // We set the cookie twice, but it shouldn't be a problem
         resp = httpClient.execute(method, stickyContext);
       } else {
         resp = httpClient.execute(method);
@@ -513,18 +513,17 @@ private void negotiate(HttpUriRequest method, String uri)
 
   private Configuration setupTrustStoreForHadoop(KeyStore trustStore)
     throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
-    String tmpdir =
-      Files.createTempDirectory("hbase_rest_client_truststore").toFile().getAbsolutePath();
-    String trustStoreLocation = tmpdir + File.separator + "truststore.jks";
+    Path tmpDirPath = Files.createTempDirectory("hbase_rest_client_truststore");
+    File trustStoreFile = tmpDirPath.resolve("truststore.jks").toFile();
     // Shouldn't be needed with the secure temp dir, but let's generate a password anyway
     String password = Double.toString(Math.random());
-    try (FileOutputStream fos = new FileOutputStream(trustStoreLocation)) {
+    try (FileOutputStream fos = new FileOutputStream(trustStoreFile)) {
       trustStore.store(fos, password.toCharArray());
     }
 
     Configuration sslConf = new Configuration();
     // Type is the Java default, we use the same JVM to read this back
-    sslConf.set("ssl.client.keystore.location", trustStoreLocation);
+    sslConf.set("ssl.client.keystore.location", trustStoreFile.getAbsolutePath());
     sslConf.set("ssl.client.keystore.password", password);
     return sslConf;
   }