minor refactor: remove URL constructor deprecation warnings

Author: paulk-asert

src/main/java/groovy/lang/GroovyClassLoader.java

@@ -218,8 +218,8 @@ public Class defineClass(final String name, final byte[] bytes) throws ClassForm
     public Class defineClass(final ClassNode classNode, final String file, final String newCodeBase) {
         CodeSource codeSource = null;
         try {
-            codeSource = new CodeSource(new URL("file", "", newCodeBase), (java.security.cert.Certificate[]) null);
-        } catch (MalformedURLException ignore) {
+            codeSource = new CodeSource(new URI("file", "", newCodeBase, null).toURL(), (java.security.cert.Certificate[]) null);
+        } catch (MalformedURLException | URISyntaxException ignore) {
         }
 
         CompilationUnit unit = createCompilationUnit(config, codeSource);

src/main/java/groovy/lang/GroovyCodeSource.java

@@ -29,6 +29,7 @@
 import java.io.Reader;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.CodeSource;
@@ -231,9 +232,9 @@ private static CodeSource createCodeSource(final String codeBase) {
             sm.checkPermission(new GroovyCodeSourcePermission(codeBase));
         }
         try {
-            return new CodeSource(new URL("file", "", codeBase), (java.security.cert.Certificate[]) null);
+            return new CodeSource(new URI("file", "", codeBase, null).toURL(), (java.security.cert.Certificate[]) null);
         }
-        catch (MalformedURLException e) {
+        catch (MalformedURLException | URISyntaxException e) {
             throw new RuntimeException("A CodeSource file URL cannot be constructed from the supplied codeBase: " + codeBase);
         }
     }

src/main/java/groovy/ui/GroovySocketServer.java

@@ -137,9 +137,9 @@ public GroovySocketServer(GroovyShell groovy, GroovyCodeSource source, boolean a
         this.source = source;
         this.autoOutput = autoOutput;
         try {
-            url = new URL("http", InetAddress.getLocalHost().getHostAddress(), port, "/");
+            url = new URI("http", null, InetAddress.getLocalHost().getHostAddress(), port, "/", null, null).toURL();
             System.out.println("groovy is listening on port " + port);
-        } catch (IOException e) {
+        } catch (IOException | URISyntaxException e) {
             e.printStackTrace();
         }
         new Thread(this).start();

src/main/java/groovy/util/GroovyScriptEngine.java

@@ -45,6 +45,8 @@
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.CodeSource;
@@ -363,11 +365,11 @@ public URLConnection getResourceConnection(String resourceName) throws ResourceE
         for (URL root : roots) {
             URL scriptURL = null;
             try {
-                scriptURL = new URL(root, resourceName);
+                scriptURL = root.toURI().resolve(resourceName).toURL();
                 groovyScriptConn = openConnection(scriptURL);
 
                 break; // Now this is a bit unusual
-            } catch (MalformedURLException e) {
+            } catch (MalformedURLException | URISyntaxException e) {
                 String message = "Malformed URL: with context=" + root + " and spec=" + resourceName + " because " + e.getMessage();
                 if (se == null) {
                     se = new ResourceException(message);
@@ -464,7 +466,7 @@ private static URL[] createRoots(String[] urls) throws MalformedURLException {
         URL[] roots = new URL[urls.length];
         for (int i = 0; i < roots.length; i++) {
             if (urls[i].contains("://")) {
-                roots[i] = new URL(urls[i]);
+                roots[i] = URI.create(urls[i]).toURL();
             } else {
                 roots[i] = new File(urls[i]).toURI().toURL();
             }

subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java

@@ -44,6 +44,7 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -349,7 +350,13 @@ public void setEntityResolver(final EntityResolver entityResolver) {
      * @param base The URL used to resolve relative URLs
      */
     public void setEntityBaseUrl(final URL base) {
-        reader.setEntityResolver((publicId, systemId) -> new InputSource(new URL(base, systemId).openStream()));
+        reader.setEntityResolver((publicId, systemId) -> {
+            try {
+                return new InputSource(base.toURI().resolve(systemId).toURL().openStream());
+            } catch (URISyntaxException e) {
+                throw new SAXException(e);
+            }
+        });
     }
 
     /* (non-Javadoc)