Merge pull request #59 from Hygieia/add-type-field

Add repository type to allOptions section of Github Collector.

Author: danielyhuang

pom.xml

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

src/main/java/com/capitalone/dashboard/collector/GitHubCollectorTask.java

@@ -1,7 +1,6 @@
 package com.capitalone.dashboard.collector;
 
 
-import com.capitalone.dashboard.client.RestOperationsSupplier;
 import com.capitalone.dashboard.misc.HygieiaException;
 import com.capitalone.dashboard.model.BaseModel;
 import com.capitalone.dashboard.model.CollectionError;
@@ -18,7 +17,6 @@
 import com.capitalone.dashboard.repository.GitRequestRepository;
 import com.capitalone.dashboard.util.CommitPullMatcher;
 import com.capitalone.dashboard.util.GithubRepoMatcher;
-import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -35,7 +33,6 @@
 import org.springframework.web.client.RestClientException;
 
 import java.net.MalformedURLException;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -103,6 +100,7 @@ public Collector getCollector() {
         allOptions.put(GitHubRepo.USER_ID, "");
         allOptions.put(GitHubRepo.PASSWORD, "");
         allOptions.put(GitHubRepo.PERSONAL_ACCESS_TOKEN, "");
+        allOptions.put(GitHubRepo.TYPE, "");
         protoType.setAllFields(allOptions);
 
         Map<String, Object> uniqueOptions = new HashMap<>();
@@ -164,7 +162,7 @@ public void collect(Collector collector){
        clean(collector);
        List<GitHubRepo> enabledRepos = enabledRepos(collector);
        if(gitHubSettings.getSearchCriteria() != null){
-           String searchCriteria[] = gitHubSettings.getSearchCriteria().split(Pattern.quote("|"));
+           String[] searchCriteria = gitHubSettings.getSearchCriteria().split(Pattern.quote("|"));
            if(REPO_NAME.equalsIgnoreCase(searchCriteria[0])){
                enabledRepos = enabledRepos.stream().filter(repo -> GithubRepoMatcher.repoNameMatcher(repo.getRepoUrl(),searchCriteria[1])).collect(Collectors.toList());
            }else if(ORG_NAME.equalsIgnoreCase(searchCriteria[0])) {

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

@@ -5,10 +5,11 @@
  */
 public class GitHubRepo extends CollectorItem {
     public static final String REPO_URL = "url"; // http://github.company.com/jack/somejavacode
-    public static final String BRANCH = "branch"; // master, development etc.
+    public static final String BRANCH = "branch"; // main, development, release  etc.
     public static final String USER_ID = "userID";
     public static final String PASSWORD = "password";
     public static final String PERSONAL_ACCESS_TOKEN = "personalAccessToken";
+    public static final String TYPE = "type"; // SOURCE, BUILD, INFRA, TEST etc
 
 
     public String getUserId() {
@@ -36,6 +37,10 @@ public void setBranch(String branch) {
         getOptions().put(BRANCH, branch);
     }
 
+    public String getType() { return (String) getOptions().get(TYPE); }
+
+    public void setType(String type) { getOptions().put(TYPE, type); }
+
     public static String getPersonalAccessToken() {
         return PERSONAL_ACCESS_TOKEN;
     }