optimize branch cache

Author: Yang Guo

platform-api/src/main/java/com/flow/platform/api/config/CachingConfig.java

@@ -33,8 +33,7 @@ public class CachingConfig {
 
     private final static int EXPIRE_CACHE_SECOND = 3600 * 24;
 
-    private final static int MAX_CACHE_NUM = 1000;
-
+    private final static int MAX_CACHE_NUM = 100;
 
     private CacheBuilder cacheBuilder = CacheBuilder
         .newBuilder()

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

@@ -235,7 +235,7 @@ public BooleanValue isFlowNameExist() {
     /**
      * @api {get} /flows/:root/branches List Branches
      * @apiParam {String} root flow node name
-     * @apiParam {refresh} [refresh] true or false
+     * @apiParam {Boolean} [refresh] true or false, the default is false
      * @apiGroup Flows
      *
      * @apiSuccessExample {json} Success-Response
@@ -248,13 +248,13 @@ public BooleanValue isFlowNameExist() {
      */
     @GetMapping("/{root}/branches")
     public List<String> listBranches(@RequestParam(required = false) Boolean refresh) {
-        Node root = nodeService.find(currentNodePath.get());
-        if (refresh != null && refresh == true) {
-            return gitService.refreshBranches(root);
+        if (refresh == null) {
+            refresh = false;
         }
-        return gitService.listBranches(root);
-    }
 
+        Node root = nodeService.find(currentNodePath.get());
+        return gitService.branches(root, refresh);
+    }
 
     /**
      * @api {get} /flows/:root/tags List Tags

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

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

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

@@ -42,8 +42,6 @@
 import javax.annotation.PostConstruct;
 import org.eclipse.jgit.lib.ProgressMonitor;
 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;
 
@@ -103,18 +101,9 @@ public String fetch(Node node, String filePath, ProgressListener progressListene
         return client.fetch(branch, filePath, new GitCloneProgressMonitor(progressListener));
     }
 
-
-    @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) {
+    @Override
+    @Cacheable(value = "git.branches", key = "#node.getPath()", condition = "#refresh == false")
+    public List<String> branches(Node node, boolean refresh) {
         GitClient client = gitClientInstance(node);
         try {
             return client.branches();

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

@@ -94,18 +94,18 @@ public void onFinishTask(String task) {
 
     @Test
     public void should_list_branches_of_git_repo() {
-        List<String> branches = gitService.listBranches(node);
+        List<String> branches = gitService.branches(node, false);
         Assert.assertNotNull(branches);
         Assert.assertEquals("develop", branches.get(0));
         Assert.assertEquals("master", branches.get(1));
-    }
 
-    @Test
-    public void should_refresh_branches_of_git_repo() {
-        List<String> branches = gitService.refreshBranches(node);
+        // should load branches from cache
+        branches = gitService.branches(node, false);
+        Assert.assertNotNull(branches);
+
+        // should load branched from git repo for refresh
+        branches = gitService.branches(node, true);
         Assert.assertNotNull(branches);
-        Assert.assertEquals("develop", branches.get(0));
-        Assert.assertEquals("master", branches.get(1));
     }
 
     @Test