Fix Java 8 build break

Author: sbabcoc

src/main/java/com/nordstrom/automation/selenium/core/GridUtility.java

@@ -1,5 +1,7 @@
 package com.nordstrom.automation.selenium.core;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -13,7 +15,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -207,7 +208,7 @@ public static String readAvailable(InputStream inputStream) throws IOException {
             length = inputStream.read(buffer);
             result.write(buffer, 0, length);
         }
-        return result.toString(StandardCharsets.UTF_8.name());
+        return result.toString(UTF_8.name());
     }
 
     /**

src/main/java/com/nordstrom/automation/selenium/plugins/AndroidActivityLauncher.java

@@ -1,12 +1,16 @@
 package com.nordstrom.automation.selenium.plugins;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 
+import com.nordstrom.common.base.UncheckedThrow;
+
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -106,8 +110,12 @@ private static Map<String, List<String>> parseQueryParams(final URI uri) {
             int idx = pair.indexOf('=');
             String key = idx > 0 ? pair.substring(0, idx) : pair;
             String value = idx > 0 && pair.length() > idx + 1 ? pair.substring(idx + 1) : "";
-            key = URLDecoder.decode(key, StandardCharsets.UTF_8);
-            value = URLDecoder.decode(value, StandardCharsets.UTF_8);
+            try {
+                key = URLDecoder.decode(key, UTF_8.name());
+                value = URLDecoder.decode(value, UTF_8.name());
+            } catch (UnsupportedEncodingException e) {
+                throw UncheckedThrow.throwUnchecked(e);
+            }
             rawParams.computeIfAbsent(key, k -> new ArrayList<>()).add(value);
         }
 

src/selenium3/java/com/nordstrom/automation/selenium/SeleniumConfig.java

@@ -1,13 +1,14 @@
 package com.nordstrom.automation.selenium;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -262,7 +263,7 @@ public Path createHubConfig() throws IOException {
             hubConfig.servlets = Arrays.asList(servlets.toArray(new String[0]));
             try(OutputStream fos = new FileOutputStream(filePath.toFile());
                 OutputStream out = new BufferedOutputStream(fos)) {
-                out.write(new Json().toJson(hubConfig).getBytes(StandardCharsets.UTF_8));
+                out.write(new Json().toJson(hubConfig).getBytes(UTF_8));
             }
         }
         return filePath;
@@ -307,7 +308,7 @@ public Path createNodeConfig(String capabilities, URL hubUrl) throws IOException
             nodeConfig.servlets = Arrays.asList(servlets.toArray(new String[0]));
             try(OutputStream fos = new FileOutputStream(filePath.toFile());
                 OutputStream out = new BufferedOutputStream(fos)) {
-                out.write(new Json().toJson(nodeConfig).getBytes(StandardCharsets.UTF_8));
+                out.write(new Json().toJson(nodeConfig).getBytes(UTF_8));
             }
         }
         return filePath;

src/selenium4/java/com/nordstrom/automation/selenium/SeleniumConfig.java

@@ -1,5 +1,6 @@
 package com.nordstrom.automation.selenium;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.openqa.selenium.json.Json.LIST_OF_MAPS_TYPE;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
 
@@ -10,7 +11,6 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -422,7 +422,7 @@ public Path createHubConfig() throws IOException {
             distributorOptions.put("slot-matcher", slotMatcher);
             try (OutputStream fos = new FileOutputStream(filePath.toFile());
                  OutputStream out = new BufferedOutputStream(fos)) {
-                out.write(new Json().toJson(hubConfig).getBytes(StandardCharsets.UTF_8));
+                out.write(new Json().toJson(hubConfig).getBytes(UTF_8));
             }
         }
         return filePath;
@@ -505,7 +505,7 @@ public Path createNodeConfig(String capabilities, URL hubUrl) throws IOException
             }
             try (OutputStream fos = new FileOutputStream(filePath.toFile());
                  OutputStream out = new BufferedOutputStream(fos)) {
-                out.write(new Json().toJson(nodeConfig).getBytes(StandardCharsets.UTF_8));
+                out.write(new Json().toJson(nodeConfig).getBytes(UTF_8));
             }
         }
         return filePath;