Java10: Use pre-defined charset, making catch exception not needed anymore

Author: dizzzz

exist-core/src/main/java/org/exist/client/InteractiveClient.java

@@ -2090,7 +2090,7 @@ public boolean run() throws Exception {
         printNotice();
 
         // Fix "uri" property: Excalibur CLI can't parse dashes, so we need to URL encode them:
-        properties.setProperty(URI, URLDecoder.decode(properties.getProperty(URI), UTF_8.name()));
+        properties.setProperty(URI, URLDecoder.decode(properties.getProperty(URI), UTF_8));
 
         final boolean interactive = isInteractive();
 

exist-core/src/main/java/org/exist/storage/serializers/XIncludeFilter.java

@@ -608,14 +608,10 @@ protected Map<String, String> processParameters(final String args) {
                 value = args.substring(start, end - 1);
             }
             start = end;
-            try {
-                param = URLDecoder.decode(param, UTF_8.name());
-                value = URLDecoder.decode(value, UTF_8.name());
-                LOG.debug("parameter: {} = {}", param, value);
-                parameters.put(param, value);
-            } catch (final UnsupportedEncodingException e) {
-                LOG.warn(e.getMessage(), e);
-            }
+            param = URLDecoder.decode(param, UTF_8);
+            value = URLDecoder.decode(value, UTF_8);
+            LOG.debug("parameter: {} = {}", param, value);
+            parameters.put(param, value);
         }
         return parameters;
     }

exist-core/src/main/java/org/exist/xmldb/XmldbURI.java

@@ -387,13 +387,8 @@ public String getCollectionPath() {
             return null;
         }
 
-        try {
-            //TODO: we might want to cache this value
-            return URLDecoder.decode(encodedCollectionPath, UTF_8.name());
-        } catch (final UnsupportedEncodingException e) {
-            //Should never happen
-            throw new IllegalArgumentException(encodedCollectionPath + " can not be properly escaped");
-        }
+        //TODO: we might want to cache this value
+        return URLDecoder.decode(encodedCollectionPath, UTF_8);
     }
 
     public XmldbURI toCollectionPathURI() {

exist-core/src/main/java/org/exist/xquery/util/URIUtils.java

@@ -324,14 +324,9 @@ public static String escapeHtmlURI(String uri){
 	 * @return The UTF-8 encoded value of the supplied uri
 	 */
 	public static String urlEncodeUtf8(String uri) {
-		try {
-			final String almostEncoded = URLEncoder.encode(uri, UTF_8.name());
-			return almostEncoded.replaceAll("\\+","%20");
-		} catch(final UnsupportedEncodingException e) {
-			//wrap with a runtime Exception
-			throw new RuntimeException(e);
-		}
-	}
+        final String almostEncoded = URLEncoder.encode(uri, UTF_8);
+        return almostEncoded.replaceAll("\\+","%20");
+    }
 
 	/**
 	 * This method decodes the provided uri for human readability.  The
@@ -342,13 +337,8 @@ public static String urlEncodeUtf8(String uri) {
 	 * @return The decoded value of the supplied uri
 	 */
 	public static String urlDecodeUtf8(String uri) {
-		try {
-			return URLDecoder.decode(uri, UTF_8.name());
-		} catch(final UnsupportedEncodingException e) {
-			//wrap with a runtime Exception
-			throw new RuntimeException(e);
-		}
-	}
+        return URLDecoder.decode(uri, UTF_8);
+    }
 
 	/**
 	 * This method decodes the provided uri for human readability.  The
@@ -359,13 +349,8 @@ public static String urlDecodeUtf8(String uri) {
 	 * @return The decoded value of the supplied uri
 	 */
 	public static String urlDecodeUtf8(XmldbURI uri) {
-		try {
-			return URLDecoder.decode(uri.toString(), UTF_8.name());
-		} catch(final UnsupportedEncodingException e) {
-			//wrap with a runtime Exception
-			throw new RuntimeException(e);
-		}
-	}
+        return URLDecoder.decode(uri.toString(), UTF_8);
+    }
 
 	/**
 	 * This method splits the supplied url on the character