代码优化C

dumasd · Aug 11, 2024 · 3718366 · 3718366
1 parent 682dd10
commit 3718366
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 42 deletions.
diff --git a/src/main/java/io/jenkins/plugins/configops/database/DatabaseConfigApplyStep.java b/src/main/java/io/jenkins/plugins/configops/database/DatabaseConfigApplyStep.java
@@ -9,6 +9,10 @@
 import io.jenkins.plugins.configops.model.resp.DatabaseConfigApplyResp;
 import io.jenkins.plugins.configops.utils.ConfigOpsClient;
 import io.jenkins.plugins.configops.utils.Logger;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,11 +23,6 @@
 import org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 @Getter
 @Setter
 @ToString

diff --git a/src/main/java/io/jenkins/plugins/configops/model/req/DatabaseConfigReq.java b/src/main/java/io/jenkins/plugins/configops/model/req/DatabaseConfigReq.java
@@ -1,13 +1,12 @@
 package io.jenkins.plugins.configops.model.req;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import java.io.Serializable;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.io.Serializable;
-
 @Setter
 @Getter
 @ToString
@@ -18,5 +17,4 @@ public class DatabaseConfigReq implements Serializable {
     private String dbId;
 
     private String sql;
-
 }
diff --git a/src/main/java/io/jenkins/plugins/configops/model/resp/DatabaseConfigApplyResp.java b/src/main/java/io/jenkins/plugins/configops/model/resp/DatabaseConfigApplyResp.java
@@ -1,12 +1,12 @@
 package io.jenkins.plugins.configops.model.resp;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.io.Serializable;
-import java.util.List;
-
 @Setter
 @Getter
 @ToString
@@ -15,7 +15,7 @@ public class DatabaseConfigApplyResp implements Serializable {
 
     private String database;
 
-    private List<SqlResult> result;
+    private List<SqlResult> result = new ArrayList<>();
 
     @Setter
     @Getter

diff --git a/src/main/java/io/jenkins/plugins/configops/model/resp/NacosConfigModifyPreviewResp.java b/src/main/java/io/jenkins/plugins/configops/model/resp/NacosConfigModifyPreviewResp.java
@@ -2,14 +2,12 @@
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.annotation.JSONField;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import javax.servlet.ServletException;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigChoicesParameterDefinition.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigChoicesParameterDefinition.java
@@ -5,14 +5,11 @@
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.Util;
-import hudson.model.AbstractBuild;
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterValue;
 import hudson.model.Run;
 import hudson.util.ListBoxModel;
-import hudson.util.VariableResolver;
 import io.jenkins.plugins.configops.model.dto.NacosFileDTO;
-
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -22,7 +19,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigEditParameterDefinition.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigEditParameterDefinition.java
@@ -8,17 +8,14 @@
 import hudson.model.ParameterDefinition;
 import hudson.model.ParameterValue;
 import hudson.model.Run;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.logging.Level;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.java.Log;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;

diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigModifyApplyStep.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigModifyApplyStep.java
@@ -8,6 +8,11 @@
 import io.jenkins.plugins.configops.model.req.NacosConfigReq;
 import io.jenkins.plugins.configops.utils.ConfigOpsClient;
 import io.jenkins.plugins.configops.utils.Logger;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -19,12 +24,6 @@
 import org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * 修改确认
  *
@@ -49,15 +48,15 @@ public class NacosConfigModifyApplyStep extends Step implements Serializable {
     private final String content;
 
     @DataBoundConstructor
-    public NacosConfigModifyApplyStep(String nacosId, String toolUrl, String namespaceGroup, String dataId, String content) {
+    public NacosConfigModifyApplyStep(
+            String nacosId, String toolUrl, String namespaceGroup, String dataId, String content) {
         this.nacosId = nacosId;
         this.toolUrl = toolUrl;
         this.namespaceGroup = namespaceGroup;
         this.dataId = dataId;
         this.content = content;
     }
 
-
     @Override
     public StepExecution start(StepContext context) throws Exception {
         return new NacosConfigModifyApplyStepExecution(context, this);
@@ -102,7 +101,9 @@ protected Map<String, Object> run() throws Exception {
 
             TaskListener taskListener = getContext().get(TaskListener.class);
             Logger logger = new Logger("NacosConfigModifyApplyStep", taskListener);
-            logger.log("Applying nacos config. toolUrl:%s, nacosId:%s, namespace:%s, group:%s, dataId:%s", step.getToolUrl(), step.getNacosId(), ng[0], ng[1], step.getDataId());
+            logger.log(
+                    "Applying nacos config. toolUrl:%s, nacosId:%s, namespace:%s, group:%s, dataId:%s",
+                    step.getToolUrl(), step.getNacosId(), ng[0], ng[1], step.getDataId());
 
             ConfigOpsClient client = new ConfigOpsClient(step.getToolUrl());
             if (StringUtils.isBlank(step.getContent())) {

diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigModifyPreviewStep.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigModifyPreviewStep.java
@@ -8,15 +8,13 @@
 import io.jenkins.plugins.configops.model.req.NacosConfigReq;
 import io.jenkins.plugins.configops.model.resp.NacosConfigModifyPreviewResp;
 import io.jenkins.plugins.configops.utils.ConfigOpsClient;
-
 import java.io.File;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.java.Log;
@@ -85,7 +83,8 @@ protected Map<String, Object> run() throws Exception {
             if (Objects.isNull(workspace)) {
                 throw new NullPointerException("Workspace not found");
             }
-            FilePath fullDataIdFile = workspace.child(String.format("%s/%s/%s", step.getWorkingDir(), step.getNamespaceGroup(), step.getDataId()));
+            FilePath fullDataIdFile = workspace.child(
+                    String.format("%s/%s/%s", step.getWorkingDir(), step.getNamespaceGroup(), step.getDataId()));
             String fullCnt = FileUtils.readFileToString(new File(fullDataIdFile.getRemote()), StandardCharsets.UTF_8);
             String patchCnt = null;
             if (StringUtils.isNotBlank(step.getVersion())) {

diff --git a/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigsGetterStep.java b/src/main/java/io/jenkins/plugins/configops/nacos/NacosConfigsGetterStep.java
@@ -7,7 +7,6 @@
 import hudson.model.TaskListener;
 import io.jenkins.plugins.configops.model.dto.NacosFileDTO;
 import io.jenkins.plugins.configops.utils.FileFileFilter;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang.StringUtils;

diff --git a/src/main/java/io/jenkins/plugins/configops/utils/ConfigOpsClient.java b/src/main/java/io/jenkins/plugins/configops/utils/ConfigOpsClient.java
@@ -6,22 +6,16 @@
 import io.jenkins.plugins.configops.model.req.NacosConfigReq;
 import io.jenkins.plugins.configops.model.resp.DatabaseConfigApplyResp;
 import io.jenkins.plugins.configops.model.resp.NacosConfigModifyPreviewResp;
-
 import java.io.IOException;
 import java.util.List;
-
-import org.apache.hc.client5.http.HttpResponseException;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpPut;
 import org.apache.hc.client5.http.impl.classic.AbstractHttpClientResponseHandler;
 import org.apache.hc.client5.http.impl.classic.BasicHttpClientResponseHandler;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpException;
-import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.entity.HttpEntities;
 import org.apache.hc.core5.net.URIBuilder;

diff --git a/src/main/java/io/jenkins/plugins/configops/utils/Logger.java b/src/main/java/io/jenkins/plugins/configops/utils/Logger.java
@@ -1,7 +1,6 @@
 package io.jenkins.plugins.configops.utils;
 
 import hudson.model.TaskListener;
-
 import java.io.PrintStream;
 
 /**