Modify styles.

wukong121 · Oct 7, 2023 · ed7c1df · ed7c1df
1 parent b3e8e9e
commit ed7c1df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...ig/src/main/java/com/alibaba/nacos/config/server/service/kubernetes/ApiClientFactory.java b/...ig/src/main/java/com/alibaba/nacos/config/server/service/kubernetes/ApiClientFactory.java
@@ -26,6 +26,11 @@
 import java.io.FileReader;
 import java.io.IOException;
 
+/**
+ * The ApiClient factory.
+ *
+ * @author wangyixing
+ */
 public class ApiClientFactory {
 
     /**

diff --git a/...ain/java/com/alibaba/nacos/config/server/service/kubernetes/ConfigMapSyncServiceImpl.java b/...ain/java/com/alibaba/nacos/config/server/service/kubernetes/ConfigMapSyncServiceImpl.java
@@ -36,20 +36,16 @@
 import io.kubernetes.client.informer.SharedIndexInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.openapi.ApiClient;
-import io.kubernetes.client.openapi.Configuration;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapList;
 import io.kubernetes.client.util.CallGeneratorParams;
-import io.kubernetes.client.util.ClientBuilder;
-import io.kubernetes.client.util.KubeConfig;
 import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.io.FileReader;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -237,7 +233,7 @@ public ConfigInfo configMapToNacosConfigInfo(V1ConfigMap configMap) {
         String group = ConfigMapSyncConfig.K8S_GROUP;
         String tenant = configMap.getMetadata().getNamespace();
         // 将 ConfigMap 的数据转换为 Nacos 的配置内容
-        Map<String, String> dataMap = configMap.getData() != null ? configMap.getData() : new HashMap<>();
+        Map<String, String> dataMap = configMap.getData() != null ? configMap.getData() : new HashMap<>(10);
         String content = getContent(dataMap);
         return new ConfigInfo(dataId, group, tenant, null, content);
     }

diff --git a/...g/src/main/java/com/alibaba/nacos/config/server/service/kubernetes/ConfigMapSyncTask.java b/...g/src/main/java/com/alibaba/nacos/config/server/service/kubernetes/ConfigMapSyncTask.java
@@ -119,7 +119,10 @@ public void checkAndSyncConfigMaps() {
      * @return whether contents are equal.
      */
     private Boolean compareContent(String configMapContent, String nacosContent) {
-        if (configMapContent == null && nacosContent != null || configMapContent != null && nacosContent == null) {
+        if (configMapContent == null && nacosContent != null) {
+            return false;
+        }
+        if (configMapContent != null && nacosContent == null) {
             return false;
         }
         assert configMapContent != null;