Merge pull request #75 from common-workflow-language/hotfix-trailslash-dedupe

Remove trailing slashes from submitted URLs

Author: MarkRobbo

src/main/java/org/commonwl/viewer/domain/WorkflowForm.java

@@ -25,19 +25,32 @@
  */
 public class WorkflowForm {
 
+    private String githubURL;
+
     public WorkflowForm() {}
 
     public WorkflowForm(String githubURL) {
-        this.githubURL = githubURL;
+        if (githubURL != null) {
+            this.githubURL = trimTrailingSlashes(githubURL);
+        }
     }
 
-    private String githubURL;
-
     public String getGithubURL() {
         return githubURL;
     }
 
     public void setGithubURL(String githubURL) {
-        this.githubURL = githubURL;
+        if (githubURL != null) {
+            this.githubURL = trimTrailingSlashes(githubURL);
+        }
+    }
+
+    /**
+     * Cuts any trailing slashes off a string
+     * @param url The string to cut the slashes off
+     * @return The same string without trailing slashes
+     */
+    private String trimTrailingSlashes(String url) {
+        return url.replaceAll("\\/+$", "");
     }
 }

src/main/java/org/commonwl/viewer/services/GitHubService.java

@@ -26,7 +26,6 @@
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.service.CommitService;
 import org.eclipse.egit.github.core.service.ContentsService;
-import org.eclipse.egit.github.core.service.RepositoryService;
 import org.eclipse.egit.github.core.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -53,7 +52,6 @@ public class GitHubService {
     private final ContentsService contentsService;
     private final UserService userService;
     private final CommitService commitService;
-    private final RepositoryService repoService;
 
     // URL validation for directory links
     private final String GITHUB_DIR_REGEX = "^https?:\\/\\/github\\.com\\/([A-Za-z0-9_.-]+)\\/([A-Za-z0-9_.-]+)\\/?(?:(?:tree|blob)\\/([^/]+)\\/(.*))?$";
@@ -73,7 +71,6 @@ public GitHubService(@Value("${githubAPI.authentication}") String authSetting,
         this.contentsService = new ContentsService(client);
         this.userService = new UserService(client);
         this.commitService = new CommitService(client);
-        this.repoService = new RepositoryService(client);
     }
 
     /**