[ISSUE#12979]Correct serviceloader and fix pmd. (#13086)

renamed: client/src/main/resources/META-INF/services/com.alibaba.nacos.client.address.ServerListProvider -> client-basic/src/main/resources/META-INF/services/com.alibaba.nacos.client.address.ServerListProvider renamed: client/src/test/resources/META-INF/services/com.alibaba.nacos.client.address.ServerListProvider -> client-basic/src/test/resources/META-INF/services/com.alibaba.nacos.client.address.ServerListProvider modified: maintainer-client/pom.xml modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/NacosMaintainerFactory.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/address/DefaultServerListManager.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerFactory.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerService.java renamed: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/config/NacosConfigMaintainerService.java -> maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/config/NacosConfigMaintainerServiceImpl.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/model/core/ServerLoaderMetrics.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/model/naming/SwitchDomain.java renamed: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/naming/NacosNamingMaintainerService.java -> maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/naming/NacosNamingMaintainerServiceImpl.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/naming/NamingMaintainerFactory.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/naming/NamingMaintainerService.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/remote/ClientHttpProxy.java modified: maintainer-client/src/main/java/com/alibaba/nacos/maintainer/client/utils/ParamUtil.java modified: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerFactoryTest.java renamed: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/config/NacosConfigMaintainerServiceTest.java -> maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/config/NacosConfigMaintainerServiceImplTest.java renamed: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/naming/NacosNamingMaintainerServiceTest.java -> maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/naming/NacosNamingMaintainerServiceImplTest.java modified: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/naming/NamingMaintainerFactoryTest.java modified: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/remote/ClientHttpProxyTest.java new file: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/remote/mock/MockServerListProvider.java modified: maintainer-client/src/test/java/com/alibaba/nacos/maintainer/client/utils/ParamUtilTest.java new file: maintainer-client/src/test/resources/META-INF/services/com.alibaba.nacos.client.address.ServerListProvider
alibaba · Feb 7, 2025 · e4dfa2f · e4dfa2f
1 parent 1993d0d
commit e4dfa2f
Show file tree

Hide file tree

Showing 23 changed files with 579 additions and 652 deletions.
diff --git a/...a.nacos.client.address.ServerListProvider → ...a.nacos.client.address.ServerListProvider b/...a.nacos.client.address.ServerListProvider → ...a.nacos.client.address.ServerListProvider
diff --git a/...a.nacos.client.address.ServerListProvider → ...a.nacos.client.address.ServerListProvider b/...a.nacos.client.address.ServerListProvider → ...a.nacos.client.address.ServerListProvider
diff --git a/maintainer-client/pom.xml b/maintainer-client/pom.xml
@@ -40,10 +40,6 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-common</artifactId>

diff --git a/...iner-client/src/main/java/com/alibaba/nacos/maintainer/client/NacosMaintainerFactory.java b/...iner-client/src/main/java/com/alibaba/nacos/maintainer/client/NacosMaintainerFactory.java
@@ -29,8 +29,7 @@
  */
 public class NacosMaintainerFactory {
 
-    public static ConfigMaintainerService createConfigMaintainerService(String serverList)
-            throws NacosException, NacosException {
+    public static ConfigMaintainerService createConfigMaintainerService(String serverList) throws NacosException {
         return ConfigMaintainerFactory.createConfigMaintainerService(serverList);
     }
 

diff --git a/...t/src/main/java/com/alibaba/nacos/maintainer/client/address/DefaultServerListManager.java b/...t/src/main/java/com/alibaba/nacos/maintainer/client/address/DefaultServerListManager.java
@@ -24,7 +24,6 @@
 import com.alibaba.nacos.maintainer.client.remote.HttpClientManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,7 +36,6 @@
  *
  * @author Nacos
  */
-@Service
 public class DefaultServerListManager extends AbstractServerListManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultServerListManager.class);

diff --git a/...ent/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerFactory.java b/...ent/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerFactory.java
@@ -37,7 +37,7 @@ public class ConfigMaintainerFactory {
     public static ConfigMaintainerService createConfigMaintainerService(String serverList) throws NacosException {
         Properties properties = new Properties();
         properties.setProperty("serverAddr", serverList);
-        return new NacosConfigMaintainerService(properties);
+        return new NacosConfigMaintainerServiceImpl(properties);
     }
 
     /**
@@ -51,6 +51,6 @@ public static ConfigMaintainerService createConfigMaintainerService(Properties p
         if (properties == null) {
             throw new NacosException(NacosException.INVALID_PARAM, "Properties cannot be null");
         }
-        return new NacosConfigMaintainerService(properties);
+        return new NacosConfigMaintainerServiceImpl(properties);
     }
 }
diff --git a/...ent/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerService.java b/...ent/src/main/java/com/alibaba/nacos/maintainer/client/config/ConfigMaintainerService.java
diff --git a/.../config/NacosConfigMaintainerService.java → ...fig/NacosConfigMaintainerServiceImpl.java b/.../config/NacosConfigMaintainerService.java → ...fig/NacosConfigMaintainerServiceImpl.java
diff --git a/...ent/src/main/java/com/alibaba/nacos/maintainer/client/model/core/ServerLoaderMetrics.java b/...ent/src/main/java/com/alibaba/nacos/maintainer/client/model/core/ServerLoaderMetrics.java
@@ -19,6 +19,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * ServerLoaderMetrics.
+ *
+ * @author Nacos
+ */
 public class ServerLoaderMetrics {
 
     String address;

diff --git a/...r-client/src/main/java/com/alibaba/nacos/maintainer/client/model/naming/SwitchDomain.java b/...r-client/src/main/java/com/alibaba/nacos/maintainer/client/model/naming/SwitchDomain.java
@@ -17,7 +17,6 @@
 package com.alibaba.nacos.maintainer.client.model.naming;
 
 import com.alibaba.nacos.common.utils.JacksonUtils;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,7 +31,6 @@
  *
  * @author nacos
  */
-@Component
 @SuppressWarnings("PMD")
 public class SwitchDomain implements Record, Cloneable {
 

diff --git a/.../naming/NacosNamingMaintainerService.java → ...ing/NacosNamingMaintainerServiceImpl.java b/.../naming/NacosNamingMaintainerService.java → ...ing/NacosNamingMaintainerServiceImpl.java
diff --git a/...ent/src/main/java/com/alibaba/nacos/maintainer/client/naming/NamingMaintainerFactory.java b/...ent/src/main/java/com/alibaba/nacos/maintainer/client/naming/NamingMaintainerFactory.java
@@ -37,7 +37,7 @@ public class NamingMaintainerFactory {
     public static NamingMaintainerService createNamingMaintainerService(String serverList) throws NacosException {
         Properties properties = new Properties();
         properties.setProperty("serverAddr", serverList);
-        return new NacosNamingMaintainerService(properties);
+        return new NacosNamingMaintainerServiceImpl(properties);
     }
 
     /**
@@ -51,6 +51,6 @@ public static NamingMaintainerService createNamingMaintainerService(Properties p
         if (properties == null) {
             throw new NacosException(NacosException.INVALID_PARAM, "properties is null");
         }
-        return new NacosNamingMaintainerService(properties);
+        return new NacosNamingMaintainerServiceImpl(properties);
     }
 }