fix retrive branch or tag name with refs/heads

Author: Yang Guo

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

@@ -17,6 +17,7 @@
 package com.flow.platform.util.git;
 
 import com.flow.platform.util.ExceptionUtil;
+import com.flow.platform.util.StringUtil;
 import com.flow.platform.util.git.model.GitCommit;
 import com.flow.platform.util.git.model.GitProject;
 import com.google.common.base.Strings;
@@ -246,9 +247,11 @@ private List<String> toRefString(Collection<Ref> refs) {
         List<String> refStringList = new ArrayList<>(refs.size());
 
         for (Ref ref : refs) {
-            // convert ref name from ref/head/master to master
+            // convert ref name from refs/heads/master to master
             String refName = ref.getName();
-            String simpleName = refName.replaceFirst("refs/heads/", "");
+            String simpleName = refName
+                .replaceFirst("refs/heads/", StringUtil.EMPTY)
+                .replace("refs/tags/", StringUtil.EMPTY);
 
             // add to result list
             refStringList.add(simpleName);

platform-util-git/src/test/java/com/flow/platform/util/git/test/GitHttpClientTest.java

@@ -21,6 +21,7 @@
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import org.eclipse.jgit.lib.Ref;
 import org.junit.After;
@@ -45,14 +46,16 @@ public void should_load_all_branch_and_tags() throws Throwable {
         GitHttpClient client = new GitHttpClient(TEST_GIT_HTTP_URL, Paths.get(tmpPath), "", "");
 
         // load all branches
-        Collection<String> branches = client.branches();
+        List<String> branches = client.branches();
         Assert.assertNotNull(branches);
         Assert.assertTrue(branches.size() >= 1);
+        Assert.assertFalse(branches.get(0).startsWith("refs/heads/"));
 
         // load all tags
-        Collection<String> tags = client.tags();
+        List<String> tags = client.tags();
         Assert.assertNotNull(tags);
         Assert.assertTrue(tags.size() >= 1);
+        Assert.assertFalse(tags.get(0).startsWith("refs/tags/"));
     }
 
     @Test

platform-util-git/src/test/java/com/flow/platform/util/git/test/GitSshClientTest.java

@@ -21,6 +21,7 @@
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import org.eclipse.jgit.lib.Ref;
 import org.junit.After;
@@ -47,14 +48,16 @@ public void should_load_all_branch_and_tags() throws Throwable {
         GitSshClient client = new GitSshClient(TEST_GIT_SSH_URL, Paths.get(tmpPath));
 
         // load all branches
-        Collection<String> branches = client.branches();
+        List<String> branches = client.branches();
         Assert.assertNotNull(branches);
         Assert.assertTrue(branches.size() >= 1);
+        Assert.assertFalse(branches.get(0).startsWith("refs/heads/"));
 
         // load all tags
-        Collection<String> tags = client.tags();
+        List<String> tags = client.tags();
         Assert.assertNotNull(tags);
         Assert.assertTrue(tags.size() >= 1);
+        Assert.assertFalse(tags.get(0).startsWith("refs/tags/"));
     }
 
     @Test