Merge pull request #58 from benj58xu/master

Enhance GitHubParsed so that it can handle URLs with ports and additional path segment

Author: danielyhuang

pom.xml

@@ -10,7 +10,7 @@
   </description>
   <url>https://github.com/Hygieia/${repository.name}</url>
   <packaging>jar</packaging>
-  <version>3.2.4-SNAPSHOT</version>
+  <version>3.2.5-SNAPSHOT</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>

src/main/java/com/capitalone/dashboard/model/GitHubParsed.java

@@ -52,6 +52,17 @@ private void parse() throws MalformedURLException, HygieiaException {
             baseApiUrl = protocol + "://" + PUBLIC_GITHUB_BASE_API;
             apiUrl = protocol + "://" + PUBLIC_GITHUB_REPO_HOST + path;
             graphQLUrl = protocol + "://" + PUBLIC_GITHUB_GRAPHQL;
+        } else if (parts.length>3) {
+            orgName = parts[parts.length-2];
+            repoName = parts[parts.length-1];
+            String baseUrl = protocol + "://" + host;
+            if (u.getPort()>0) baseUrl += ":" + u.getPort();
+            for (int i=1; i<parts.length-2; i++) {
+                baseUrl += "/" + parts[i];
+            }
+            apiUrl = baseUrl + SEGMENT_API + "/" + orgName + "/" + repoName;
+            baseApiUrl = baseUrl + BASE_API;
+            graphQLUrl = baseUrl + SEGMENT_GRAPHQL;
         } else {
             apiUrl = protocol + "://" + host + SEGMENT_API + path;
             baseApiUrl = protocol + "://" + host + BASE_API;