Merge "Replace deprecated URL constructor"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
index 005d565..b69d048 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
@@ -30,6 +30,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import org.eclipse.jgit.lib.Config;
 
@@ -54,7 +55,7 @@
 
     String baseGerritUrl;
     if (gerritUrl != null) {
-      URL u = new URL(gerritUrl);
+      URL u = URI.create(gerritUrl).toURL();
       baseGerritUrl = u.getPath();
     } else {
       baseGerritUrl = "/";
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java
index 97ab188..a2152c2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/PluginModule.java
@@ -40,6 +40,7 @@
 import com.google.inject.TypeLiteral;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.List;
@@ -164,7 +165,7 @@
     URL u;
     String hostName;
     if (gerritUrl != null) {
-      u = new URL(gerritUrl);
+      u = URI.create(gerritUrl).toURL();
       hostName = u.getHost() != null ? u.getHost() : getLocalHostName();
     } else {
       u = null;