add refresh branches cache and list branches cache

Author: yunheli

platform-api/src/main/java/com/flow/platform/api/controller/FlowController.java

@@ -16,9 +16,9 @@
 
 package com.flow.platform.api.controller;
 
-import com.flow.platform.api.domain.permission.Actions;
 import com.flow.platform.api.domain.node.Flow;
 import com.flow.platform.api.domain.node.Node;
+import com.flow.platform.api.domain.permission.Actions;
 import com.flow.platform.api.domain.request.ListParam;
 import com.flow.platform.api.domain.response.BooleanValue;
 import com.flow.platform.api.domain.user.User;
@@ -246,11 +246,15 @@ public BooleanValue isFlowNameExist() {
      *  ]
      */
     @GetMapping("/{root}/branches")
-    public List<String> listBranches() {
+    public List<String> listBranches(@RequestParam(required = false) Boolean refresh) {
         Node root = nodeService.find(currentNodePath.get());
-        return gitService.branches(root);
+        if (refresh != null && refresh == true) {
+            return gitService.refreshBranches(root);
+        }
+        return gitService.listBranches(root);
     }
 
+
     /**
      * @api {get} /flows/:root/tags List Tags
      * @apiParam {String} root flow node name
@@ -415,7 +419,7 @@ public Node createFromYml(@RequestBody String yml) {
      */
     @PostMapping("/{root}/users/auth")
     @WebSecurity(action = Actions.FLOW_AUTH)
-    public List<User> flowAuthUsers(@RequestBody ListParam<String> listParam){
+    public List<User> flowAuthUsers(@RequestBody ListParam<String> listParam) {
         return nodeService.authUsers(listParam.getArrays(), currentNodePath.get());
     }
 }

platform-api/src/main/java/com/flow/platform/api/service/GitService.java

@@ -63,7 +63,12 @@ interface ProgressListener {
     /**
      * Fetch branches from git repo
      */
-    List<String> branches(Node node);
+    List<String> listBranches(Node node);
+
+    /**
+     * refresh branches
+     */
+    List<String> refreshBranches(Node node);
 
     /**
      * Fetch tags from git repo

platform-api/src/main/java/com/flow/platform/api/service/GitServiceImpl.java

@@ -47,6 +47,7 @@
 import org.eclipse.jgit.lib.Ref;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -90,9 +91,18 @@ public String clone(Node node, String filePath, ProgressListener progressListene
         return fetch(client, filePath);
     }
 
-    @Override
-    @Cacheable(value = "branches")
-    public List<String> branches(Node node) {
+
+    @Cacheable(value = "branches", key = "#node.getPath()")
+    public List<String> listBranches(Node node) {
+        return fetchBranches(node);
+    }
+
+    @CachePut(value = "branches", key = "#node.getPath()")
+    public List<String> refreshBranches(Node node) {
+        return fetchBranches(node);
+    }
+
+    private List<String> fetchBranches(Node node) {
         GitClient client = gitClientInstance(node);
         try {
             Collection<Ref> branches = client.branches();

platform-api/src/test/java/com/flow/platform/api/test/service/GitServiceTest.java

@@ -99,7 +99,7 @@ public void onFinish() {
 
     @Test
     public void should_list_branches_of_git_repo() {
-        List<String> branches = gitService.branches(node);
+        List<String> branches = gitService.listBranches(node);
         Assert.assertNotNull(branches);
         Assert.assertEquals("develop", branches.get(0));
         Assert.assertEquals("master", branches.get(1));