Merge branch 'develop' into feature/161

Author: Yang Guo

platform-api/src/main/java/com/flow/platform/api/git/GitEventEnvConverter.java

@@ -19,6 +19,7 @@
 import com.flow.platform.api.domain.job.JobCategory;
 import com.flow.platform.api.envs.GitEnvs;
 import com.flow.platform.core.exception.IllegalParameterException;
+import com.flow.platform.util.git.JGitUtil;
 import com.flow.platform.util.git.model.GitCommit;
 import com.flow.platform.util.git.model.GitEvent;
 import com.flow.platform.util.git.model.GitEventType;
@@ -67,13 +68,13 @@ public static Map<String, String> convert(GitEvent event) {
 
             // the branch is on source for open pr
             if (pr.getState() == State.OPEN) {
-                info.put(GitEnvs.FLOW_GIT_BRANCH.name(), simpleRef(pr.getSource().getBranch()));
+                info.put(GitEnvs.FLOW_GIT_BRANCH.name(), JGitUtil.simpleRef(pr.getSource().getBranch()));
                 info.put(GitEnvs.FLOW_GIT_AUTHOR.name(), pr.getSubmitter());
             }
 
             // the branch is on target for close pr
             if (pr.getState() == State.CLOSE) {
-                info.put(GitEnvs.FLOW_GIT_BRANCH.name(), simpleRef(pr.getTarget().getBranch()));
+                info.put(GitEnvs.FLOW_GIT_BRANCH.name(), JGitUtil.simpleRef(pr.getTarget().getBranch()));
                 info.put(GitEnvs.FLOW_GIT_AUTHOR.name(), pr.getMergedBy());
             }
 
@@ -93,7 +94,7 @@ public static Map<String, String> convert(GitEvent event) {
             Map<String, String> info = new HashMap<>(10);
             info.put(GitEnvs.FLOW_GIT_EVENT_TYPE.name(), pt.getType().name());
             info.put(GitEnvs.FLOW_GIT_EVENT_SOURCE.name(), pt.getGitSource().name());
-            info.put(GitEnvs.FLOW_GIT_BRANCH.name(), simpleRef(pt.getRef()));
+            info.put(GitEnvs.FLOW_GIT_BRANCH.name(), JGitUtil.simpleRef(pt.getRef()));
             info.put(GitEnvs.FLOW_GIT_AUTHOR.name(), pt.getUsername());
             info.put(GitEnvs.FLOW_GIT_AUTHOR_EMAIL.name(), pt.getUserEmail());
             info.put(GitEnvs.FLOW_GIT_COMMIT_ID.name(), pt.getAfter());
@@ -113,15 +114,4 @@ public static Map<String, String> convert(GitEvent event) {
 
         throw new IllegalParameterException("Git event type not supported");
     }
-
-    /**
-     * Simplify ref from 'ref/head/master' to 'master'
-     */
-    private static String simpleRef(String ref) {
-        int slashIndex = ref.lastIndexOf('/');
-        if (slashIndex == -1) {
-            return ref;
-        }
-        return ref.substring(slashIndex + 1);
-    }
 }

platform-util-git/src/main/java/com/flow/platform/util/git/JGitUtil.java

@@ -54,9 +54,7 @@ public static List<String> simpleRef(Collection<Ref> refs) {
         for (Ref ref : refs) {
             // convert ref name from refs/heads/master to master
             String refName = ref.getName();
-            String simpleName = refName
-                .replaceFirst("refs/heads/", StringUtil.EMPTY)
-                .replace("refs/tags/", StringUtil.EMPTY);
+            String simpleName = simpleRef(refName);
 
             // add to result list
             refStringList.add(simpleName);
@@ -65,6 +63,12 @@ public static List<String> simpleRef(Collection<Ref> refs) {
         return refStringList;
     }
 
+    public static String simpleRef(String ref) {
+        return ref
+            .replaceFirst("refs/heads/", StringUtil.EMPTY)
+            .replace("refs/tags/", StringUtil.EMPTY);
+    }
+
     public static Repository getRepo(Path path) throws GitException {
         try (Git git = Git.open(path.toFile())) {
             return git.getRepository();