Merge pull request #4 from ben-gibson/bugfix-url-encoding

bugfix: fixed broken url encoding

Author: ben-gibson

src/uk/co/ben_gibson/repositorymapper/UrlFactory/GitHubUrlFactory.java

@@ -3,9 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import uk.co.ben_gibson.repositorymapper.Context.Context;
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
+import java.net.*;
 
 /**
  * Creates a URL in the format expected by the remote repository provider GitHub.
@@ -18,8 +16,7 @@ public class GitHubUrlFactory implements UrlFactory
      */
     @Override
     @NotNull
-    public URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException
-    {
+    public URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException, URISyntaxException {
 
         String branch;
 
@@ -29,12 +26,16 @@ public URL getUrlFromContext(@NotNull Context context) throws MalformedURLExcept
             throw new UrlFactoryException("Failed to encode path, unsupported encoding");
         }
 
-        String path = context.getRemoteHost().toString() + "/blob/" + branch + context.getPath();
+        URL remoteHost = context.getRemoteHost();
+
+        String path = context.getRemoteHost().getPath() + "/blob/" + branch + context.getPath();
+
+        String fragment = null;
 
         if (context.getCaretLinePosition() != null) {
-            path += "#L" + context.getCaretLinePosition().toString();
+            fragment = "L" + context.getCaretLinePosition().toString();
         }
 
-        return new URL(path);
+        return new URI(remoteHost.getProtocol(), remoteHost.getHost(), path, fragment).toURL();
     }
 }

src/uk/co/ben_gibson/repositorymapper/UrlFactory/StashUrlFactory.java

@@ -2,11 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import uk.co.ben_gibson.repositorymapper.Context.Context;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
+import java.net.*;
 
 /**
  * Creates a URL in the format expected by the remote repository provider Stash.
@@ -19,7 +15,7 @@ public class StashUrlFactory implements UrlFactory
      */
     @Override
     @NotNull
-    public URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException {
+    public URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException, URISyntaxException {
 
         URL remoteHost = context.getRemoteHost();
 
@@ -36,25 +32,21 @@ public URL getUrlFromContext(@NotNull Context context) throws MalformedURLExcept
         String project    = parts[1];
         String repository = parts[2];
 
-        String fullPath = String.format(
+        String path = String.format(
             "/projects/%s/repos/%s/browse%s",
             project,
             repository,
             context.getPath()
         );
 
-        try {
-            fullPath += "?at=" + URLEncoder.encode("refs/heads/" + context.getBranch(), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new UrlFactoryException("Failed to encode path, unsupported encoding");
-        }
+        String query = "at=refs/heads/" + context.getBranch();
+
+        String fragment = null;
 
         if (context.getCaretLinePosition() != null) {
-            fullPath += "#" + context.getCaretLinePosition().toString();
+            fragment = context.getCaretLinePosition().toString();
         }
 
-        fullPath = remoteHost.getProtocol() + "://" + remoteHost.getHost() + fullPath;
-
-        return new URL(fullPath);
+        return new URI(remoteHost.getProtocol(), remoteHost.getHost(), path, query, fragment).toURL();
     }
 }

src/uk/co/ben_gibson/repositorymapper/UrlFactory/UrlFactory.java

@@ -3,6 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import uk.co.ben_gibson.repositorymapper.Context.Context;
 import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 /**
@@ -19,5 +20,5 @@ public interface UrlFactory
      * @return Url
      */
     @NotNull
-    URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException;
+    URL getUrlFromContext(@NotNull Context context) throws MalformedURLException, UrlFactoryException, URISyntaxException;
 }