代码优化

magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitRepo.java

@@ -30,10 +30,10 @@ public class GitRepo {
      */
     private String rootPath;
     private String gitFilePath;
-    private GitStoreProperties properties;
+    private MagicGitProperties properties;
     private Git git;
 
-    public GitRepo(String rootPath, GitStoreProperties properties) {
+    public GitRepo(String rootPath, MagicGitProperties properties) {
         this.rootPath = rootPath;
         this.gitFilePath = rootPath + File.separator + ".git";
         this.properties = properties;
@@ -154,7 +154,7 @@ public class GitRepo {
         return true;
     }
 
-    public GitStoreProperties getProperties() {
+    public MagicGitProperties getProperties() {
         return properties;
     }
 }

magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitResource.java

@@ -3,8 +3,6 @@ package org.ssssssss.magicapi.git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.ssssssss.magicapi.core.resource.FileResource;
 import org.ssssssss.magicapi.core.resource.Resource;
-import org.ssssssss.magicapi.core.resource.ResourceAdapter;
-import org.ssssssss.magicapi.git.GitStoreProperties;
 import org.ssssssss.magicapi.utils.IoUtils;
 
 import java.io.File;
@@ -20,9 +18,9 @@ import java.util.stream.Collectors;
  * @author mxd
  */
 public class GitResource extends FileResource {
-	private GitRepo gitRepo;
+	private final GitRepo gitRepo;
 
-	public static GitResource of(org.ssssssss.magicapi.core.config.Resource config, GitStoreProperties properties) throws IOException, GitAPIException {
+	public static GitResource of(org.ssssssss.magicapi.core.config.Resource config, MagicGitProperties properties) throws IOException, GitAPIException {
 		File file = new File(config.getLocation());
 		GitRepo gitRepo = new GitRepo(file.getAbsolutePath(), properties);
 		GitResource gitResource = new GitResource(config.isReadonly(), file,

magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitConfiguration.java

@@ -10,20 +10,19 @@ import org.ssssssss.magicapi.core.config.MagicAPIProperties;
 import org.ssssssss.magicapi.core.config.MagicPluginConfiguration;
 import org.ssssssss.magicapi.core.config.Resource;
 import org.ssssssss.magicapi.core.model.Plugin;
-import org.ssssssss.magicapi.git.GitStoreProperties;
 
 import java.io.IOException;
 
 @Configuration
-@EnableConfigurationProperties(GitStoreProperties.class)
+@EnableConfigurationProperties(MagicGitProperties.class)
 public class MagicGitConfiguration implements MagicPluginConfiguration {
 
 	private final MagicAPIProperties properties;
-	private final GitStoreProperties gitStoreProperties;
+	private final MagicGitProperties gitProperties;
 
-	public MagicGitConfiguration(MagicAPIProperties properties, GitStoreProperties gitStoreProperties) {
+	public MagicGitConfiguration(MagicAPIProperties properties, MagicGitProperties gitProperties) {
 		this.properties = properties;
-		this.gitStoreProperties = gitStoreProperties;
+		this.gitProperties = gitProperties;
 	}
 
 	/**
@@ -37,7 +36,7 @@ public class MagicGitConfiguration implements MagicPluginConfiguration {
 	@ConditionalOnProperty(prefix = "magic-api", name = "resource.type", havingValue = "git")
 	public org.ssssssss.magicapi.core.resource.Resource magicGitResource() throws IOException, GitAPIException {
 		Resource resourceConfig = properties.getResource();
-		return GitResource.of(resourceConfig, this.gitStoreProperties);
+		return GitResource.of(resourceConfig, this.gitProperties);
 	}
 
 

magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/GitStoreProperties.java → magic-api-plugins/magic-api-plugin-git/src/main/java/org/ssssssss/magicapi/git/MagicGitProperties.java

@@ -3,7 +3,7 @@ package org.ssssssss.magicapi.git;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "magic-api.resource.git")
-public class GitStoreProperties {
+public class MagicGitProperties {
     /**
      * git仓库地址
      */