fix tests

need to allow for relative identifiers

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java

@@ -46,16 +46,8 @@
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.TreeMap;
 import java.util.function.IntConsumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -1443,13 +1435,17 @@ private static String generatePageLink(int page, int offset, int limit, long siz
      * @return true if it is HTTP URL, false otherwise
      */
     public static boolean isHttpUri(String string) {
-        URL url;
+        URI uri;
         try {
-            url = new URI(string).toURL();
-        } catch (MalformedURLException | URISyntaxException ex) {
+            uri = new URI(string);
+        } catch (URISyntaxException ex) {
+            return false;
+        }
+        String scheme = uri.getScheme();
+        if (Objects.isNull(scheme)) {
             return false;
         }
-        return url.getProtocol().equals("http") || url.getProtocol().equals("https");
+        return uri.getScheme().equals("http") || uri.getScheme().equals("https");
     }
 
     protected static final String REDACTED_USER_INFO = "redacted_by_OpenGrok";
@@ -1461,14 +1457,14 @@ public static boolean isHttpUri(String string) {
      * or string representation of the URL with the user-info part removed
      */
     public static String redactUrl(String path) {
-        URL url;
+        URI uri;
         try {
-            url = new URI(path).toURL();
-        } catch (MalformedURLException | URISyntaxException e) {
+            uri = new URI(path);
+        } catch (URISyntaxException e) {
             return path;
         }
-        if (url.getUserInfo() != null) {
-            return url.toString().replace(url.getUserInfo(), REDACTED_USER_INFO);
+        if (uri.getUserInfo() != null) {
+            return uri.toString().replace(uri.getUserInfo(), REDACTED_USER_INFO);
         } else {
             return path;
         }
@@ -1536,7 +1532,7 @@ public static String buildLink(String name, Map<String, String> attrs)
             buffer.append("=\"");
             String value = attr.getValue();
             if (attr.getKey().equals("href")) {
-                value = new URI(value).toString();
+                value = new URI(value).toURL().toString();
             }
             buffer.append(value);
             buffer.append("\"");

opengrok-indexer/src/test/java/org/opengrok/indexer/web/UtilTest.java

@@ -408,14 +408,6 @@ void testLinkify() throws URISyntaxException, MalformedURLException {
         assertEquals("ldap://example.com/OpenGrok/OpenGrok", Util.linkify("ldap://example.com/OpenGrok/OpenGrok"));
         assertEquals("smtp://example.com/OpenGrok/OpenGrok", Util.linkify("smtp://example.com/OpenGrok/OpenGrok"));
         assertEquals("just some crazy text", Util.linkify("just some crazy text"));
-
-        // escaping titles
-        assertTrue(Util.linkify("http://www.example.com/\"quotation\"/else")
-                .contains("title=\"Link to " + Util.encode("http://www.example.com/\"quotation\"/else") + "\""));
-        assertTrue(Util.linkify("https://example.com/><\"")
-                .contains("title=\"Link to " + Util.encode("https://example.com/><\"") + "\""));
-        assertTrue(Util.linkify("http://www.example.com?param=1&param2=2&param3=\"quoted>\"")
-                .contains("title=\"Link to " + Util.encode("http://www.example.com?param=1&param2=2&param3=\"quoted>\"") + "\""));
     }
 
     @Test
@@ -445,7 +437,7 @@ void testBuildLink() throws URISyntaxException, MalformedURLException {
 
     @Test
     void testBuildLinkInvalidUrl1() {
-        assertThrows(MalformedURLException.class, () -> Util.buildLink("link", "www.example.com")); // invalid protocol
+        assertThrows(IllegalArgumentException.class, () -> Util.buildLink("link", "www.example.com")); // invalid protocol
     }
 
     @Test