Fix compile error.

alibaba · Jan 8, 2025 · 68f99e5 · 68f99e5
1 parent 8738216
commit 68f99e5
Show file tree

Hide file tree

Showing 24 changed files with 165 additions and 293 deletions.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
@@ -30,9 +30,9 @@
 import com.alibaba.nacos.config.server.model.ConfigCacheGray;
 import com.alibaba.nacos.config.server.model.gray.BetaGrayRule;
 import com.alibaba.nacos.config.server.model.gray.TagGrayRule;
+import com.alibaba.nacos.config.server.service.LongPollingService;
 import com.alibaba.nacos.config.server.service.query.ConfigChainRequestExtractorService;
 import com.alibaba.nacos.config.server.service.query.ConfigQueryChainService;
-import com.alibaba.nacos.config.server.service.LongPollingService;
 import com.alibaba.nacos.config.server.service.query.enums.ResponseCode;
 import com.alibaba.nacos.config.server.service.query.model.ConfigQueryChainRequest;
 import com.alibaba.nacos.config.server.service.query.model.ConfigQueryChainResponse;
@@ -41,13 +41,12 @@
 import com.alibaba.nacos.config.server.utils.Protocol;
 import com.alibaba.nacos.config.server.utils.RequestUtil;
 import com.alibaba.nacos.plugin.encryption.handler.EncryptionHandler;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URLEncoder;
@@ -58,7 +57,6 @@
 import static com.alibaba.nacos.api.common.Constants.CONFIG_TYPE;
 import static com.alibaba.nacos.api.common.Constants.VIPSERVER_TAG;
 import static com.alibaba.nacos.config.server.constant.Constants.CONTENT_MD5;
-import static com.alibaba.nacos.config.server.utils.LogUtil.PULL_LOG;
 
 /**
  * ConfigServlet inner for aop.
@@ -164,9 +162,11 @@ private String handlerConfigNotFound(HttpServletResponse response, ApiVersionEnu
     private String handlerConfigConflict(HttpServletResponse response, ApiVersionEnum apiVersion) throws IOException {
         response.setStatus(HttpServletResponse.SC_CONFLICT);
         if (apiVersion == ApiVersionEnum.V1) {
-            return writeResponseForV1(response, Result.failure(ErrorCode.RESOURCE_CONFLICT, "requested file is being modified, please try later."));
+            return writeResponseForV1(response,
+                    Result.failure(ErrorCode.RESOURCE_CONFLICT, "requested file is being modified, please try later."));
         } else {
-            return writeResponseForV2(response, Result.failure(ErrorCode.RESOURCE_CONFLICT, "requested file is being modified, please try later."));
+            return writeResponseForV2(response,
+                    Result.failure(ErrorCode.RESOURCE_CONFLICT, "requested file is being modified, please try later."));
         }
     }
 
@@ -206,7 +206,8 @@ private String handleResponseForV2(HttpServletResponse response, ConfigQueryChai
     }
 
     private void setResponseHeadForV1(HttpServletResponse response, ConfigQueryChainResponse chainResponse) {
-        String contentType = chainResponse.getContentType() != null ? chainResponse.getContentType() : FileTypeEnum.TEXT.getFileType();
+        String contentType = chainResponse.getContentType() != null ? chainResponse.getContentType()
+                : FileTypeEnum.TEXT.getFileType();
         FileTypeEnum fileTypeEnum = FileTypeEnum.getFileTypeEnumByFileExtensionOrFileType(contentType);
         String contentTypeHeader = fileTypeEnum.getContentType();
         response.setHeader(HttpHeaderConsts.CONTENT_TYPE, contentTypeHeader);
@@ -284,18 +285,21 @@ private void logPullEvent(String dataId, String group, String tenant, String req
         if (status == ConfigQueryChainResponse.ConfigQueryStatus.CONFIG_QUERY_CONFLICT) {
             ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, -1, pullEvent,
                     ConfigTraceService.PULL_TYPE_CONFLICT, -1, clientIp, notify, "http");
-        } else if (status == ConfigQueryChainResponse.ConfigQueryStatus.CONFIG_NOT_FOUND || chainResponse.getContent() == null) {
+        } else if (status == ConfigQueryChainResponse.ConfigQueryStatus.CONFIG_NOT_FOUND
+                || chainResponse.getContent() == null) {
             ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, -1, pullEvent,
                     ConfigTraceService.PULL_TYPE_NOTFOUND, -1, clientIp, notify, "http");
         } else {
             long delayed = notify ? -1 : System.currentTimeMillis() - chainResponse.getLastModified();
-            ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, chainResponse.getLastModified(), pullEvent,
-                    ConfigTraceService.PULL_TYPE_OK, delayed, clientIp, notify, "http");
+            ConfigTraceService.logPullEvent(dataId, group, tenant, requestIpApp, chainResponse.getLastModified(),
+                    pullEvent, ConfigTraceService.PULL_TYPE_OK, delayed, clientIp, notify, "http");
         }
     }
 
-    private void setCommonResponseHead(HttpServletResponse response, ConfigQueryChainResponse chainResponse, String tag) {
-        String contentType = chainResponse.getContentType() != null ? chainResponse.getContentType() : FileTypeEnum.TEXT.getFileType();
+    private void setCommonResponseHead(HttpServletResponse response, ConfigQueryChainResponse chainResponse,
+            String tag) {
+        String contentType = chainResponse.getContentType() != null ? chainResponse.getContentType()
+                : FileTypeEnum.TEXT.getFileType();
 
         response.setHeader(CONFIG_TYPE, contentType);
         response.setHeader(CONTENT_MD5, chainResponse.getMd5());
@@ -314,8 +318,9 @@ private void setCommonResponseHead(HttpServletResponse response, ConfigQueryChai
                 response.setHeader("isBeta", "true");
             } else if (TagGrayRule.TYPE_TAG.equals(chainResponse.getMatchedGray().getGrayRule().getType())) {
                 try {
-                    response.setHeader(TagGrayRule.TYPE_TAG, URLEncoder.encode(chainResponse.getMatchedGray().getGrayRule().getRawGrayRuleExp(),
-                            StandardCharsets.UTF_8.displayName()));
+                    response.setHeader(TagGrayRule.TYPE_TAG,
+                            URLEncoder.encode(chainResponse.getMatchedGray().getGrayRule().getRawGrayRuleExp(),
+                                    StandardCharsets.UTF_8.displayName()));
                 } catch (Exception e) {
                     LOGGER.error("Error encoding tag", e);
                 }

diff --git a/.../src/main/java/com/alibaba/nacos/config/server/service/ConfigGrayModelMigrateService.java b/.../src/main/java/com/alibaba/nacos/config/server/service/ConfigGrayModelMigrateService.java
@@ -89,7 +89,7 @@ public void checkMigrateBeta(String dataId, String group, String tenant) {
                 return;
             }
             configInfoGrayPersistService.removeConfigInfoGray(dataId, group, tenant, BetaGrayRule.TYPE_BETA,
-                    NetUtils.localIP(), "nacos_auto_migrate");
+                    NetUtils.localIp(), "nacos_auto_migrate");
             return;
         }
         ConfigInfoGrayWrapper configInfo4Gray = configInfoGrayPersistService.findConfigInfo4Gray(dataId, group, tenant,
@@ -101,7 +101,7 @@ public void checkMigrateBeta(String dataId, String group, String tenant) {
             ConfigGrayPersistInfo localConfigGrayPersistInfo = new ConfigGrayPersistInfo(BetaGrayRule.TYPE_BETA,
                     BetaGrayRule.VERSION, configInfo4Beta.getBetaIps(), BetaGrayRule.PRIORITY);
             configInfoGrayPersistService.insertOrUpdateGray(configInfo4Beta, BetaGrayRule.TYPE_BETA,
-                    GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo), NetUtils.localIP(),
+                    GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo), NetUtils.localIp(),
                     "nacos_auto_migrate");
         }
 
@@ -125,7 +125,7 @@ public void checkMigrateTag(String dataId, String group, String tenant, String t
                 return;
             }
             configInfoGrayPersistService.removeConfigInfoGray(dataId, group, tenant, TagGrayRule.TYPE_TAG + "_" + tag,
-                    NetUtils.localIP(), "nacos_auto_migrate");
+                    NetUtils.localIp(), "nacos_auto_migrate");
             return;
         }
         ConfigInfoGrayWrapper configInfo4Gray = configInfoGrayPersistService.findConfigInfo4Gray(dataId, group, tenant,
@@ -137,7 +137,7 @@ public void checkMigrateTag(String dataId, String group, String tenant, String t
             ConfigGrayPersistInfo localConfigGrayPersistInfo = new ConfigGrayPersistInfo(TagGrayRule.TYPE_TAG,
                     TagGrayRule.VERSION, configInfo4Tag.getTag(), TagGrayRule.PRIORITY);
             configInfoGrayPersistService.insertOrUpdateGray(configInfo4Tag, TagGrayRule.TYPE_TAG,
-                    GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo), NetUtils.localIP(),
+                    GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo), NetUtils.localIp(),
                     "nacos_auto_migrate");
         }
     }
@@ -171,7 +171,7 @@ private void doCheckMigrate() throws Exception {
                                     BetaGrayRule.PRIORITY);
                             configInfoGrayPersistService.insertOrUpdateGray(cf, BetaGrayRule.TYPE_BETA,
                                     GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo),
-                                    NetUtils.localIP(), "nacos_auto_migrate");
+                                    NetUtils.localIp(), "nacos_auto_migrate");
                             GRAY_MIGRATE_FLAG.set(false);
                         }
                     });
@@ -217,7 +217,7 @@ private void doCheckMigrate() throws Exception {
                             configInfoGrayPersistService.insertOrUpdateGray(cf,
                                     TagGrayRule.TYPE_TAG + "_" + cf.getTag(),
                                     GrayRuleManager.serializeConfigGrayPersistInfo(localConfigGrayPersistInfo),
-                                    NetUtils.localIP(), "nacos_auto_migrate");
+                                    NetUtils.localIp(), "nacos_auto_migrate");
                             GRAY_MIGRATE_FLAG.set(false);
                         }
                     });

diff --git a/...rc/main/java/com/alibaba/nacos/config/server/service/dump/DumpChangeGrayConfigWorker.java b/...rc/main/java/com/alibaba/nacos/config/server/service/dump/DumpChangeGrayConfigWorker.java
@@ -56,6 +56,7 @@ public DumpChangeGrayConfigWorker(ConfigInfoGrayPersistService configInfoGrayPer
     }
 
     @Override
+    @SuppressWarnings("PMD.MethodTooLongRule")
     public void run() {
         try {
             if (!PropertyUtil.isDumpChangeOn()) {

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java
@@ -142,7 +142,7 @@ void handleConfigDataChange(Event event) {
         if (event instanceof ConfigDataChangeEvent) {
             ConfigDataChangeEvent evt = (ConfigDataChangeEvent) event;
             DumpRequest dumpRequest = DumpRequest.create(evt.dataId, evt.group, evt.tenant, evt.lastModifiedTs,
-                    NetUtils.localIP());
+                    NetUtils.localIp());
             dumpRequest.setGrayName(evt.grayName);
             DumpService.this.dump(dumpRequest);
         }

diff --git a/...rc/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpAllProcessor.java b/...rc/main/java/com/alibaba/nacos/config/server/service/dump/processor/DumpAllProcessor.java
@@ -51,6 +51,7 @@ public DumpAllProcessor(ConfigInfoPersistService configInfoPersistService) {
     }
 
     @Override
+    @SuppressWarnings("PMD.MethodTooLongRule")
     public boolean process(NacosTask task) {
         if (!(task instanceof DumpAllTask)) {
             DEFAULT_LOG.error(

diff --git a/.../java/com/alibaba/nacos/config/server/service/query/ConfigQueryChainRequestExtractor.java b/.../java/com/alibaba/nacos/config/server/service/query/ConfigQueryChainRequestExtractor.java
@@ -19,31 +19,30 @@
 import com.alibaba.nacos.api.config.remote.request.ConfigQueryRequest;
 import com.alibaba.nacos.api.remote.request.RequestMeta;
 import com.alibaba.nacos.config.server.service.query.model.ConfigQueryChainRequest;
-
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Interface for extracting configuration query chain requests from different sources.
  *
  * @author Nacos
  */
 public interface ConfigQueryChainRequestExtractor {
-
+    
     /**
      * Gets the name of the current implementation.
      *
      * @return the name of the current implementation
      */
     String getName();
-
+    
     /**
      * Extracts a configuration query chain request from an HTTP request.
      *
      * @param request the HTTP request object
      * @return the extracted configuration query chain request
      */
     ConfigQueryChainRequest extract(HttpServletRequest request);
-
+    
     /**
      * Extracts a configuration query chain request from a configuration query request object.
      *

diff --git a/...main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java b/...main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java
@@ -23,8 +23,8 @@
 import com.alibaba.nacos.config.server.model.gray.TagGrayRule;
 import com.alibaba.nacos.config.server.service.query.model.ConfigQueryChainRequest;
 import com.alibaba.nacos.config.server.utils.RequestUtil;
+import jakarta.servlet.http.HttpServletRequest;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/Md5Comparator.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/Md5Comparator.java
@@ -16,8 +16,9 @@
 
 package com.alibaba.nacos.config.server.utils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import java.util.List;
 import java.util.Map;
 

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/Md5ComparatorDelegate.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/Md5ComparatorDelegate.java
@@ -19,11 +19,11 @@
 import com.alibaba.nacos.common.spi.NacosServiceLoader;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.sys.env.EnvUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/NacosMd5Comparator.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/NacosMd5Comparator.java
@@ -17,9 +17,9 @@
 package com.alibaba.nacos.config.server.utils;
 
 import com.alibaba.nacos.config.server.service.ConfigCacheService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;