hub4j
diff --git a/‎src/main/java/org/kohsuke/github/GitHubRequest.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHubRequest.java
+8-6Lines changed: 8 additions & 6 deletions b/‎src/main/java/org/kohsuke/github/GitHubRequest.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHubRequest.java
+8-6Lines changed: 8 additions & 6 deletions
diff --git a/‎src/test/java/org/kohsuke/github/GitHubStaticTest.java
Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/GitHubStaticTest.java
+33Lines changed: 33 additions & 0 deletions b/‎src/test/java/org/kohsuke/github/GitHubStaticTest.java
Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/GitHubStaticTest.java
+33Lines changed: 33 additions & 0 deletions
@@ -92,21 +92,23 @@ public static Builder<?> newBuilder() {
     @Nonnull
     static URL getApiURL(String apiUrl, String tailApiUrl) {
         try {
+            String urlString = "";
             if (tailApiUrl.startsWith("/")) {
-                if ("github.com".equals(apiUrl)) {// backward compatibility
-                    return new URL(GitHubClient.GITHUB_URL + tailApiUrl);
+                if ("github.com".equals(apiUrl)) {
+                    // backward compatibility
+                    urlString = GitHubClient.GITHUB_URL;
                 } else {
-                    return new URL(apiUrl + tailApiUrl);
+                    urlString = apiUrl;
                 }
-            } else {
-                return new URL(tailApiUrl);
             }
+            urlString += tailApiUrl;
+            return new URL(urlString);
         } catch (MalformedURLException e) {
             // The data going into constructing this URL should be controlled by the GitHub API framework,
             // so a malformed URL here is a framework runtime error.
             // All callers of this method ended up wrapping and throwing GHException,
             // indicating the functionality should be moved to the common code path.
-            throw new GHException("Malformed URL ", e);
+            throw new GHException("Malformed URL", e);
         }
     }
 
 
@@ -1,7 +1,9 @@
 package org.kohsuke.github;
 
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
@@ -344,6 +346,37 @@ public void testMappingReaderWriter() throws Exception {
 
     }
 
+    @Test
+    public void testGitHubRequest_getApiURL() throws Exception {
+        assertThat(GitHubRequest.getApiURL("github.com", "/endpoint").toString(),
+                equalTo("https://api.github.com/endpoint"));
+
+        // This URL is completely invalid but doesn't throw
+        assertThat(GitHubRequest.getApiURL("github.com", "//endpoint&?").toString(),
+                equalTo("https://api.github.com//endpoint&?"));
+
+        assertThat(GitHubRequest.getApiURL("ftp://whoa.github.com", "/endpoint").toString(),
+                equalTo("ftp://whoa.github.com/endpoint"));
+        assertThat(GitHubRequest.getApiURL(null, "ftp://api.test.github.com/endpoint").toString(),
+                equalTo("ftp://api.test.github.com/endpoint"));
+
+        GHException e;
+        e = Assert.assertThrows(GHException.class,
+                () -> GitHubRequest.getApiURL("gopher://whoa.github.com", "/endpoint"));
+        assertThat(e.getCause(), instanceOf(MalformedURLException.class));
+        assertThat(e.getCause().getMessage(), equalTo("unknown protocol: gopher"));
+
+        e = Assert.assertThrows(GHException.class, () -> GitHubRequest.getApiURL("bogus", "/endpoint"));
+        assertThat(e.getCause(), instanceOf(MalformedURLException.class));
+        assertThat(e.getCause().getMessage(), equalTo("no protocol: bogus/endpoint"));
+
+        e = Assert.assertThrows(GHException.class,
+                () -> GitHubRequest.getApiURL(null, "gopher://api.test.github.com/endpoint"));
+        assertThat(e.getCause(), instanceOf(MalformedURLException.class));
+        assertThat(e.getCause().getMessage(), equalTo("unknown protocol: gopher"));
+
+    }
+
     static String formatDate(Date dt, String format) {
         return formatZonedDate(dt, format, "GMT");
     }