optimize template and repo data repersent class

Author: gy2006

core/src/main/java/com/flowci/core/common/config/AppProperties.java

@@ -23,6 +23,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.Resource;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotBlank;
@@ -106,7 +107,7 @@ public Minio minio() {
     @Data
     public static class Flow {
 
-        private String templatesUrl;
+        private Resource templatesUrl;
     }
 
     @Data
@@ -118,7 +119,7 @@ public static class Job {
     @Data
     public static class Plugin {
 
-        private String defaultRepo;
+        private Resource defaultRepo;
 
         private Boolean autoUpdate;
     }

core/src/main/java/com/flowci/core/common/manager/HttpRequestManager.java

@@ -20,14 +20,14 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
-import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.flow.domain.Template;
 import com.flowci.tree.NodeTree;
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 
@@ -58,13 +58,13 @@ public Cache<String, List<String>> gitBranchCache() {
     }
 
     @Bean("templates")
-    public List<Template> getTemplates(HttpRequestManager httpManager) throws IOException {
-        String body = httpManager.get(flowProperties.getTemplatesUrl());
+    public List<Template> getTemplates() throws IOException {
+        Resource r = flowProperties.getTemplatesUrl();
 
         TypeReference<List<Template>> typeRef = new TypeReference<List<Template>>() {
         };
 
-        List<Template> list = objectMapper.readValue(body, typeRef);
+        List<Template> list = objectMapper.readValue(r.getInputStream(), typeRef);
         log.info("Templates is loaded from {}", flowProperties.getTemplatesUrl());
         return list;
     }

core/src/main/java/com/flowci/core/flow/config/FlowConfig.java

@@ -19,6 +19,7 @@
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.domain.PluginRepoInfo;
 import com.flowci.domain.Vars;
+import org.springframework.core.io.Resource;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -71,7 +72,7 @@ public interface PluginService {
     /**
      * Load plugin repo info
      */
-    List<PluginRepoInfo> load(String repoUrl);
+    List<PluginRepoInfo> load(Resource repoUri);
 
     /**
      * Git clone plugin repos in Async

core/src/main/java/com/flowci/core/plugin/service/PluginService.java

@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.git.GitClient;
-import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.common.manager.VarManager;
 import com.flowci.core.plugin.dao.PluginDao;
 import com.flowci.core.plugin.domain.Plugin;
@@ -38,18 +37,17 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;
+import org.springframework.core.io.Resource;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.time.Instant;
 import java.util.*;
 
 /**
@@ -91,9 +89,6 @@ public class PluginServiceImpl implements PluginService {
     @Autowired
     private VarManager varManager;
 
-    @Autowired
-    private HttpRequestManager httpManager;
-
     private final Object reloadLock = new Object();
 
     @EventListener
@@ -192,13 +187,11 @@ public Path getDir(Plugin plugin) {
     }
 
     @Override
-    public List<PluginRepoInfo> load(String repoUrl) {
+    public List<PluginRepoInfo> load(Resource repoUri) {
         try {
-            repoUrl = repoUrl + "?t=" + Instant.now().toEpochMilli();
-            String body = httpManager.get(repoUrl);
-            return objectMapper.readValue(body, RepoListType);
+            return objectMapper.readValue(repoUri.getInputStream(), RepoListType);
         } catch (Throwable e) {
-            log.warn("Unable to load plugin repo '{}' : {}", repoUrl, e.getMessage());
+            log.warn("Unable to load plugin repo '{}' : {}", repoUri, e.getMessage());
             return Collections.emptyList();
         }
     }
@@ -225,9 +218,7 @@ public void clone(List<PluginRepoInfo> repos) {
     public void reload() {
         synchronized (reloadLock) {
             pluginDao.deleteAll();
-
-            String repoUrl = pluginProperties.getDefaultRepo();
-            List<PluginRepoInfo> repos = load(repoUrl);
+            List<PluginRepoInfo> repos = load(pluginProperties.getDefaultRepo());
             clone(repos);
         }
     }

core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java

@@ -16,11 +16,6 @@
 
 package com.flowci.core.test.plugin;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.core.plugin.domain.PluginRepoInfo;
 import com.flowci.core.plugin.event.RepoCloneEvent;
@@ -30,18 +25,19 @@
 import com.flowci.domain.Version;
 import com.flowci.util.StringHelper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.io.UrlResource;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 
 /**
  * @author yang
@@ -66,8 +62,8 @@ public void mockPluginRepo() throws IOException {
     }
 
     @Test
-    public void should_load_plugin_repos_from_url() {
-        List<PluginRepoInfo> repos = pluginService.load(RepoURL);
+    public void should_load_plugin_repos_from_url() throws MalformedURLException {
+        List<PluginRepoInfo> repos = pluginService.load(new UrlResource(RepoURL));
         Assert.assertEquals(1, repos.size());
 
         PluginRepoInfo repo = repos.get(0);
@@ -82,7 +78,7 @@ public void should_load_plugin_repos_from_url() {
     @Test
     public void should_clone_plugin_repo() throws Throwable {
         // init:
-        List<PluginRepoInfo> repos = pluginService.load(RepoURL);
+        List<PluginRepoInfo> repos = pluginService.load(new UrlResource(RepoURL));
 
         // init counter
         CountDownLatch counter = new CountDownLatch(1);