diff --git a/api/src/main/java/com/alibaba/nacos/api/NacosFactory.java b/client/src/main/java/com/alibaba/nacos/api/NacosFactory.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/NacosFactory.java rename to client/src/main/java/com/alibaba/nacos/api/NacosFactory.java diff --git a/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java b/client/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java rename to client/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java b/client/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java similarity index 64% rename from api/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java rename to client/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java index b3d4b5bc5b4..8da2a063ad8 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java @@ -15,11 +15,11 @@ */ package com.alibaba.nacos.api.config; -import java.lang.reflect.Constructor; import java.util.Properties; import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.exception.NacosException; +import com.alibaba.nacos.client.config.NacosConfigService; /** * Config Factory @@ -39,20 +39,13 @@ public class ConfigFactory { * Exception */ public static ConfigService createConfigService(Properties properties) throws NacosException { - try { - Class driverImplClass = Class.forName("com.alibaba.nacos.client.config.NacosConfigService"); - Constructor constructor = driverImplClass.getConstructor(Properties.class); - ConfigService vendorImpl = (ConfigService) constructor.newInstance(properties); - return vendorImpl; - } catch (Throwable e) { - throw new NacosException(-400, e.getMessage()); - } + return new NacosConfigService(properties); } /** * Create Config * - * @param ServerAddr + * @param serverAddr * serverlist * @return Config * @throws NacosException @@ -61,14 +54,7 @@ public static ConfigService createConfigService(Properties properties) throws Na public static ConfigService createConfigService(String serverAddr) throws NacosException { Properties properties = new Properties(); properties.put(PropertyKeyConst.SERVER_ADDR, serverAddr); - try { - Class driverImplClass = Class.forName("com.alibaba.nacos.client.config.NacosConfigService"); - Constructor constructor = driverImplClass.getConstructor(Properties.class); - ConfigService vendorImpl = (ConfigService) constructor.newInstance(properties); - return vendorImpl; - } catch (Throwable e) { - throw new NacosException(-400, e.getMessage()); - } + return new NacosConfigService(properties); } } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java b/client/src/main/java/com/alibaba/nacos/api/config/ConfigService.java similarity index 96% rename from api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java rename to client/src/main/java/com/alibaba/nacos/api/config/ConfigService.java index 0b759772fdc..9a96a528bef 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/ConfigService.java @@ -99,12 +99,5 @@ public interface ConfigService { * listener */ public void removeListener(String dataId, String group, Listener listener); - - /** - * server health info - * - * @return whether health - */ - public String getServerStatus(); } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigContext.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigContext.java similarity index 96% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigContext.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigContext.java index 2b26df8e4ca..83be4d6590e 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigContext.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigContext.java @@ -21,7 +21,7 @@ * @author Nacos * */ -public interface IConfigContext { +public interface ConfigContext { /** * get context by key * diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilter.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilter.java similarity index 88% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilter.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilter.java index e3007640808..685924a47f7 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilter.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilter.java @@ -23,14 +23,14 @@ * @author Nacos * */ -public interface IConfigFilter { +public interface ConfigFilter { /** * Init Fuction * * @param filterConfig * Filter Config */ - void init(IFilterConfig filterConfig); + void init(FilterConfig filterConfig); /** * do filter @@ -44,7 +44,7 @@ public interface IConfigFilter { * @throws NacosException * exception */ - void doFilter(IConfigRequest request, IConfigResponse response, IConfigFilterChain filterChain) + void doFilter(ConfigRequest request, ConfigResponse response, ConfigFilterChain filterChain) throws NacosException; /** diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilterChain.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilterChain.java similarity index 87% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilterChain.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilterChain.java index ac084d67e49..aaf63339add 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilterChain.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigFilterChain.java @@ -23,7 +23,7 @@ * @author Nacos * */ -public interface IConfigFilterChain { +public interface ConfigFilterChain { /** * Filter aciton * @@ -34,6 +34,6 @@ public interface IConfigFilterChain { * @throws NacosException * NacosException */ - public void doFilter(IConfigRequest request, IConfigResponse response) throws NacosException; + public void doFilter(ConfigRequest request, ConfigResponse response) throws NacosException; } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigRequest.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigRequest.java similarity index 92% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigRequest.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigRequest.java index 308fe06a6a8..7d7b1224207 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigRequest.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigRequest.java @@ -21,7 +21,7 @@ * @author Nacos * */ -public interface IConfigRequest { +public interface ConfigRequest { /** * get param * @@ -36,6 +36,6 @@ public interface IConfigRequest { * * @return */ - public IConfigContext getConfigContext(); + public ConfigContext getConfigContext(); } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigResponse.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigResponse.java similarity index 92% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigResponse.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigResponse.java index 69b5aca07e6..a6fba3c8526 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigResponse.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/ConfigResponse.java @@ -21,7 +21,7 @@ * @author Nacos * */ -public interface IConfigResponse { +public interface ConfigResponse { /** * get param * @@ -36,6 +36,6 @@ public interface IConfigResponse { * * @return configContext */ - public IConfigContext getConfigContext(); + public ConfigContext getConfigContext(); } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/filter/IFilterConfig.java b/client/src/main/java/com/alibaba/nacos/api/config/filter/FilterConfig.java similarity index 96% rename from api/src/main/java/com/alibaba/nacos/api/config/filter/IFilterConfig.java rename to client/src/main/java/com/alibaba/nacos/api/config/filter/FilterConfig.java index 55a931ba843..13c21aff150 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/filter/IFilterConfig.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/filter/FilterConfig.java @@ -19,7 +19,7 @@ * @author Nacos * */ -public interface IFilterConfig { +public interface FilterConfig { /** * get filter name diff --git a/api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java b/client/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java similarity index 98% rename from api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java rename to client/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java index 817e0c5c566..0316114306d 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java +++ b/client/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java @@ -29,6 +29,7 @@ public abstract class AbstractListener implements Listener { /** * use default Executor */ + @Override public Executor getExecutor() { return null; } diff --git a/api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractSharedListener.java b/client/src/main/java/com/alibaba/nacos/api/config/listener/AbstractSharedListener.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractSharedListener.java rename to client/src/main/java/com/alibaba/nacos/api/config/listener/AbstractSharedListener.java diff --git a/api/src/main/java/com/alibaba/nacos/api/config/listener/Listener.java b/client/src/main/java/com/alibaba/nacos/api/config/listener/Listener.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/config/listener/Listener.java rename to client/src/main/java/com/alibaba/nacos/api/config/listener/Listener.java diff --git a/api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java b/client/src/main/java/com/alibaba/nacos/api/exception/NacosException.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java rename to client/src/main/java/com/alibaba/nacos/api/exception/NacosException.java diff --git a/client/src/test/java/com/alibaba/nacos/client/NamingTest.java b/client/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java similarity index 62% rename from client/src/test/java/com/alibaba/nacos/client/NamingTest.java rename to client/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java index e876bf10307..2607f05d7b9 100644 --- a/client/src/test/java/com/alibaba/nacos/client/NamingTest.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java @@ -13,19 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.client; +package com.alibaba.nacos.api.naming; -import org.junit.Test; +import java.util.Properties; + +import com.alibaba.nacos.client.naming.NacosNamingService; /** * @author dungu.zpf */ -public class NamingTest { - - @Test - public void testServiceList() { - - } +public class NamingFactory { + public static NamingService createNamingService(String serverList) { + return new NacosNamingService(serverList); + } + public static NamingService createNamingService(Properties properties) { + return new NacosNamingService(properties); + } } diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java b/client/src/main/java/com/alibaba/nacos/api/naming/NamingService.java similarity index 88% rename from api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java rename to client/src/main/java/com/alibaba/nacos/api/naming/NamingService.java index f896ec5d7bb..a8f9763ae99 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/NamingService.java @@ -15,13 +15,11 @@ */ package com.alibaba.nacos.api.naming; +import java.util.List; + import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.listener.EventListener; import com.alibaba.nacos.api.naming.pojo.Instance; -import com.alibaba.nacos.api.naming.pojo.ListView; -import com.alibaba.nacos.api.naming.pojo.ServiceInfo; - -import java.util.List; /** * @author dungu.zpf @@ -74,7 +72,7 @@ public interface NamingService { * @param serviceName name of service * @param ip instance ip * @param port instance port - * @param clusterName instance cluster name + * @param clusterName instance cluster name * @throws NacosException */ void deregisterInstance(String serviceName, String ip, int port, String clusterName) throws NacosException; @@ -175,29 +173,4 @@ public interface NamingService { * @throws NacosException */ void unsubscribe(String serviceName, List clusters, EventListener listener) throws NacosException; - - /** - * Get all service names from server - * - * @param pageNo page index - * @param pageSize page size - * @return list of service names - * @throws NacosException - */ - ListView getServicesOfServer(int pageNo, int pageSize) throws NacosException; - - /** - * Get all subscribed services of current client - * - * @return subscribed services - * @throws NacosException - */ - List getSubscribeServices() throws NacosException; - - /** - * Get server health status - * - * @return is server healthy - */ - String getServerStatus(); } diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java b/client/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java rename to client/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/listener/EventListener.java b/client/src/main/java/com/alibaba/nacos/api/naming/listener/EventListener.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/naming/listener/EventListener.java rename to client/src/main/java/com/alibaba/nacos/api/naming/listener/EventListener.java diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java b/client/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java similarity index 100% rename from api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java rename to client/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java similarity index 87% rename from api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java rename to client/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java index b3988a05417..f6a46e57ded 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java @@ -15,6 +15,8 @@ */ package com.alibaba.nacos.api.naming.pojo; +import com.alibaba.nacos.client.naming.utils.StringUtils; + import java.util.Objects; /** @@ -35,8 +37,8 @@ public void setType(String type) { public static class Http extends AbstractHealthChecker { public static final String TYPE = "HTTP"; - private String path = ""; - private String headers = ""; + private String path = StringUtils.EMPTY; + private String headers = StringUtils.EMPTY; private int expectedResponseCode = 200; @@ -81,14 +83,14 @@ public boolean equals(Object obj) { Http other = (Http) obj; - if (!strEquals(type, other.getType())) { + if (!StringUtils.equals(type, other.getType())) { return false; } - if (!strEquals(path, other.getPath())) { + if (!StringUtils.equals(path, other.getPath())) { return false; } - if (!strEquals(headers, other.getHeaders())) { + if (!StringUtils.equals(headers, other.getHeaders())) { return false; } return expectedResponseCode == other.getExpectedResponseCode(); @@ -162,20 +164,16 @@ public boolean equals(Object obj) { Mysql other = (Mysql) obj; - if (!strEquals(user, other.getUser())) { + if (!StringUtils.equals(user, other.getUser())) { return false; } - if (!strEquals(pwd, other.getPwd())) { + if (!StringUtils.equals(pwd, other.getPwd())) { return false; } - return strEquals(cmd, other.getCmd()); + return StringUtils.equals(cmd, other.getCmd()); } } - - private static boolean strEquals(String str1, String str2) { - return str1 == null ? str2 == null : str1.equals(str2); - } } diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java similarity index 94% rename from api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java rename to client/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java index 1c667bc0cf7..eec4a3e1b05 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java @@ -15,6 +15,8 @@ */ package com.alibaba.nacos.api.naming.pojo; +import com.alibaba.nacos.client.naming.utils.StringUtils; + import java.util.HashMap; import java.util.Map; @@ -31,7 +33,7 @@ public class Cluster { /** * Name of cluster */ - private String name = ""; + private String name = StringUtils.EMPTY; /** * Health check config of this cluster @@ -54,7 +56,7 @@ public class Cluster { private boolean useIPPort4Check = true; - private Map metadata = new HashMap(); + private Map metadata = new HashMap<>(); public Cluster() { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java similarity index 84% rename from api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java rename to client/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java index 3232ca548f8..55ecfaa044d 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java @@ -17,7 +17,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.nacos.api.common.Constants; +import com.alibaba.nacos.client.naming.utils.StringUtils; import java.util.HashMap; import java.util.Map; @@ -68,7 +68,7 @@ public class Instance { /** * User extended attributes */ - private Map metadata = new HashMap(); + private Map metadata = new HashMap<>(); public String getInstanceId() { return instanceId; @@ -78,14 +78,6 @@ public void setInstanceId(String instanceId) { this.instanceId = instanceId; } - public String serviceName() { - String[] infos = instanceId.split(Constants.NAMING_INSTANCE_ID_SPLITTER); - if (infos.length < Constants.NAMING_INSTANCE_ID_SEG_COUNT) { - return null; - } - return infos[Constants.NAMING_INSTANCE_ID_SEG_COUNT - 1]; - } - public String getIp() { return ip; } @@ -163,7 +155,7 @@ public boolean equals(Object obj) { Instance host = (Instance) obj; - return strEquals(toString(), host.toString()); + return StringUtils.equals(toString(), host.toString()); } @Override @@ -171,8 +163,4 @@ public int hashCode() { return toString().hashCode(); } - private static boolean strEquals(String str1, String str2) { - return str1 == null ? str2 == null : str1.equals(str2); - } - } diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java similarity index 96% rename from api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java rename to client/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java index 2c952c6fcc5..e5274f1cb2d 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java +++ b/client/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java @@ -52,7 +52,7 @@ public Service(String name) { this.name = name; } - private Map metadata = new HashMap(); + private Map metadata = new HashMap<>(); public String getName() { return name; diff --git a/api/src/main/java/com/alibaba/nacos/api/common/Constants.java b/client/src/main/java/com/alibaba/nacos/client/config/common/Constants.java similarity index 95% rename from api/src/main/java/com/alibaba/nacos/api/common/Constants.java rename to client/src/main/java/com/alibaba/nacos/client/config/common/Constants.java index bb60772e746..6fe35f92315 100644 --- a/api/src/main/java/com/alibaba/nacos/api/common/Constants.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/common/Constants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.api.common; +package com.alibaba.nacos.client.config.common; /** * Constant @@ -39,6 +39,8 @@ public class Constants { public static final String DAILY_DOMAINNAME = "commonconfig.taobao.net"; + public static final int DEFAULT_PORT = 8080; + public static final String NULL = ""; public static final String DATAID = "dataId"; @@ -122,7 +124,4 @@ public class Constants { public static final String CLIENT_REQUEST_TOKEN_HEADER = "Client-RequestToken"; public static final int ATOMIC_MAX_SIZE = 1000; - - public static final String NAMING_INSTANCE_ID_SPLITTER = "#"; - public static final int NAMING_INSTANCE_ID_SEG_COUNT = 4; } diff --git a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigContext.java b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigContext.java index 23c65f6ec3e..a1a978aab02 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigContext.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigContext.java @@ -18,15 +18,13 @@ import java.util.HashMap; import java.util.Map; -import com.alibaba.nacos.api.config.filter.IConfigContext; - /** * Config Context * * @author Nacos * */ -public class ConfigContext implements IConfigContext { +public class ConfigContext implements com.alibaba.nacos.api.config.filter.ConfigContext { private Map param = new HashMap(); diff --git a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigFilterChainManager.java b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigFilterChainManager.java index 1566113ed80..a597ce1c8af 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigFilterChainManager.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigFilterChainManager.java @@ -17,10 +17,10 @@ import java.util.List; -import com.alibaba.nacos.api.config.filter.IConfigFilter; -import com.alibaba.nacos.api.config.filter.IConfigFilterChain; -import com.alibaba.nacos.api.config.filter.IConfigRequest; -import com.alibaba.nacos.api.config.filter.IConfigResponse; +import com.alibaba.nacos.api.config.filter.ConfigFilter; +import com.alibaba.nacos.api.config.filter.ConfigFilterChain; +import com.alibaba.nacos.api.config.filter.ConfigRequest; +import com.alibaba.nacos.api.config.filter.ConfigResponse; import com.alibaba.nacos.api.exception.NacosException; import com.google.common.collect.Lists; @@ -30,15 +30,15 @@ * @author Nacos * */ -public class ConfigFilterChainManager implements IConfigFilterChain { +public class ConfigFilterChainManager implements ConfigFilterChain { - private List filters = Lists.newArrayList(); + private List filters = Lists.newArrayList(); - public synchronized ConfigFilterChainManager addFilter(IConfigFilter filter) { + public synchronized ConfigFilterChainManager addFilter(ConfigFilter filter) { // 根据order大小顺序插入 int i = 0; while (i < this.filters.size()) { - IConfigFilter currentValue = this.filters.get(i); + ConfigFilter currentValue = this.filters.get(i); if (currentValue.getFilterName().equals(filter.getFilterName())) { break; } @@ -58,27 +58,27 @@ public synchronized ConfigFilterChainManager addFilter(IConfigFilter filter) { @Override - public void doFilter(IConfigRequest request, IConfigResponse response) throws NacosException { + public void doFilter(ConfigRequest request, ConfigResponse response) throws NacosException { new VirtualFilterChain(this.filters).doFilter(request, response); } - private static class VirtualFilterChain implements IConfigFilterChain { + private static class VirtualFilterChain implements ConfigFilterChain { - private final List additionalFilters; + private final List additionalFilters; private int currentPosition = 0; - public VirtualFilterChain(List additionalFilters) { + public VirtualFilterChain(List additionalFilters) { this.additionalFilters = additionalFilters; } @Override - public void doFilter(final IConfigRequest request, final IConfigResponse response) throws NacosException { + public void doFilter(final ConfigRequest request, final ConfigResponse response) throws NacosException { if (this.currentPosition == this.additionalFilters.size()) { return; } else { this.currentPosition++; - IConfigFilter nextFilter = this.additionalFilters.get(this.currentPosition - 1); + ConfigFilter nextFilter = this.additionalFilters.get(this.currentPosition - 1); nextFilter.doFilter(request, response, this); } } diff --git a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigRequest.java b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigRequest.java index 100b10d39c2..a27fc342f2b 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigRequest.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigRequest.java @@ -18,8 +18,7 @@ import java.util.HashMap; import java.util.Map; -import com.alibaba.nacos.api.config.filter.IConfigContext; -import com.alibaba.nacos.api.config.filter.IConfigRequest; +import com.alibaba.nacos.api.config.filter.ConfigContext; /** * Config Request @@ -27,11 +26,11 @@ * @author Nacos * */ -public class ConfigRequest implements IConfigRequest { +public class ConfigRequest implements com.alibaba.nacos.api.config.filter.ConfigRequest { private Map param = new HashMap(); - private IConfigContext configContext = new ConfigContext(); + private ConfigContext configContext = new com.alibaba.nacos.client.config.filter.impl.ConfigContext(); public String getTenant() { return (String) param.get("tenant"); @@ -71,7 +70,7 @@ public Object getParameter(String key) { } @Override - public IConfigContext getConfigContext() { + public ConfigContext getConfigContext() { return configContext; } diff --git a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponse.java b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponse.java index c864331cc6b..27b398c1f01 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponse.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponse.java @@ -18,8 +18,7 @@ import java.util.HashMap; import java.util.Map; -import com.alibaba.nacos.api.config.filter.IConfigContext; -import com.alibaba.nacos.api.config.filter.IConfigResponse; +import com.alibaba.nacos.api.config.filter.ConfigContext; /** * Config Response @@ -27,11 +26,11 @@ * @author Nacos * */ -public class ConfigResponse implements IConfigResponse { +public class ConfigResponse implements com.alibaba.nacos.api.config.filter.ConfigResponse { private Map param = new HashMap(); - private IConfigContext configContext = new ConfigContext(); + private ConfigContext configContext = new com.alibaba.nacos.client.config.filter.impl.ConfigContext(); public String getTenant() { return (String) param.get("tenant"); @@ -71,7 +70,7 @@ public Object getParameter(String key) { } @Override - public IConfigContext getConfigContext() { + public ConfigContext getConfigContext() { return configContext; } diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java index 9ca7822e9a9..fa8de599966 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java @@ -169,6 +169,7 @@ private void safeNotifyListener(final String dataId, final String group, final S final Listener listener = listenerWrap.listener; Runnable job = new Runnable() { + @Override public void run() { ClassLoader myClassLoader = Thread.currentThread().getContextClassLoader(); ClassLoader appClassLoader= listener.getClass().getClassLoader(); diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerHttpAgent.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerHttpAgent.java index 8bb2cb6dae8..9dfe28a29e6 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerHttpAgent.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerHttpAgent.java @@ -370,6 +370,7 @@ public String getCode() { return code; } + @Override public String toString() { return "STSCredential{" + "accessKeyId='" + accessKeyId + '\'' + diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java index ad94d5963dd..8e74d5c85ca 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java @@ -414,14 +414,17 @@ public ServerAddressIterator(List source) { iter = sorted.iterator(); } + @Override public boolean hasNext() { return iter.hasNext(); } + @Override public String next() { return iter.next().serverIp; } + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/TimerService.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/TimerService.java index 3140220ee79..91b553801e8 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/impl/TimerService.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/impl/TimerService.java @@ -37,6 +37,7 @@ static public ScheduledFuture scheduleWithFixedDelay(Runnable command, long i @SuppressWarnings("PMD.ThreadPoolCreationRule") static ScheduledExecutorService scheduledExecutor = Executors .newSingleThreadScheduledExecutor(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r); t.setName("com.alibaba.nacos.client.Timer"); diff --git a/client/src/main/java/com/alibaba/nacos/client/config/listener/impl/PropertiesListener.java b/client/src/main/java/com/alibaba/nacos/client/config/listener/impl/PropertiesListener.java index 72451803036..07181cc345a 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/listener/impl/PropertiesListener.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/listener/impl/PropertiesListener.java @@ -33,7 +33,8 @@ @SuppressWarnings("PMD.AbstractClassShouldStartWithAbstractNamingRule") public abstract class PropertiesListener extends AbstractListener { final static public Logger log = LogUtils.logger(PropertiesListener.class); - + + @Override public void receiveConfigInfo(String configInfo) { if (StringUtils.isEmpty(configInfo)) { return; diff --git a/client/src/main/java/com/alibaba/nacos/client/identify/CredentialService.java b/client/src/main/java/com/alibaba/nacos/client/identify/CredentialService.java index cf8f792ca72..2f21b0cfc55 100644 --- a/client/src/main/java/com/alibaba/nacos/client/identify/CredentialService.java +++ b/client/src/main/java/com/alibaba/nacos/client/identify/CredentialService.java @@ -85,6 +85,7 @@ public void free() { log.info(appName, this.getClass().getSimpleName() + " is freed"); } + @Override public Credentials getCredential() { Credentials localCredential = credentials; if (localCredential.valid()) { diff --git a/client/src/main/java/com/alibaba/nacos/client/identify/Credentials.java b/client/src/main/java/com/alibaba/nacos/client/identify/Credentials.java index f54100bf6b8..0f5acca0821 100644 --- a/client/src/main/java/com/alibaba/nacos/client/identify/Credentials.java +++ b/client/src/main/java/com/alibaba/nacos/client/identify/Credentials.java @@ -35,7 +35,8 @@ public Credentials(String accessKey, String secretKey) { public Credentials() { this(null, null); } - + + @Override public String getAccessKey() { return accessKey; } @@ -44,6 +45,7 @@ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } + @Override public String getSecretKey() { return secretKey; } diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONArray.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONArray.java index d14f47e7024..c9c22aa8fa5 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONArray.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONArray.java @@ -88,7 +88,8 @@ public static void writeJSONString(Collection collection, Writer out) throws IOE } out.write(']'); } - + + @Override public void writeJSONString(Writer out) throws IOException{ writeJSONString(this, out); } @@ -383,7 +384,8 @@ public static String toJSONString(Object[] array){ throw new RuntimeException(e); } } - + + @Override public String toJSONString(){ return toJSONString(this); } @@ -392,6 +394,7 @@ public String toJSONString(){ * Returns a string representation of this array. This is equivalent to * calling {@link JSONArray#toJSONString()}. */ + @Override public String toString() { return toJSONString(); } diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONObject.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONObject.java index 836aa2b69e7..bb05f3a4712 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONObject.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONObject.java @@ -88,6 +88,7 @@ public static void writeJSONString(Map map, Writer out) throws IOException { out.write('}'); } + @Override public void writeJSONString(Writer out) throws IOException{ writeJSONString(this, out); } @@ -112,11 +113,13 @@ public static String toJSONString(Map map){ throw new RuntimeException(e); } } - + + @Override public String toJSONString(){ return toJSONString(this); } - + + @Override public String toString(){ return toJSONString(); } diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONValue.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONValue.java index 47e15586aaf..36334947787 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONValue.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/JSONValue.java @@ -41,7 +41,7 @@ public class JSONValue { * Parse JSON text into java object from the input source. * Please use parseWithException() if you don't want to ignore the exception. * - * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader) + * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#parse(Reader) * @see #parseWithException(Reader) * * @param in @@ -71,7 +71,7 @@ public static Object parse(Reader in){ * Parse JSON text into java object from the given string. * Please use parseWithException() if you don't want to ignore the exception. * - * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader) + * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#parse(Reader) * @see #parseWithException(Reader) * * @param s @@ -95,7 +95,7 @@ public static Object parse(String s){ /** * Parse JSON text into java object from the input source. * - * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser + * @see com.alibaba.nacos.client.logger.json.parser.JSONParser * * @param in * @return Instance of the following: @@ -125,13 +125,12 @@ public static Object parseWithException(String s) throws ParseException{ * If this object is a Map or a List, and it's also a JSONStreamAware or a JSONAware, JSONStreamAware or JSONAware will be considered firstly. *

* DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or List) with - * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or JSONArray.writeJSONString(List, Writer) instead. - * - * @see com.alibaba.nacos.client.logger.jsonJSONObject#writeJSONString(Map, Writer) - * @see com.alibaba.nacos.client.logger.jsonJSONArray#writeJSONString(List, Writer) + * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) . * + * @see com.alibaba.nacos.client.logger.json.JSONObject#writeJSONString(Map, Writer) + * * @param value - * @param writer + * @param out */ public static void writeJSONString(Object value, Writer out) throws IOException { if(value == null){ diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java index bd8d02c2acc..391abd38643 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java @@ -82,7 +82,8 @@ public Object getUnexpectedObject() { public void setUnexpectedObject(Object unexpectedObject) { this.unexpectedObject = unexpectedObject; } - + + @Override public String getMessage() { StringBuffer sb = new StringBuffer(); diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yytoken.java b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yytoken.java index f07146f7ee9..31f3d924d4f 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yytoken.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yytoken.java @@ -45,7 +45,8 @@ public Yytoken(int type,Object value){ this.type=type; this.value=value; } - + + @Override public String toString(){ StringBuffer sb = new StringBuffer(); switch(type){ diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/nop/NopLogger.java b/client/src/main/java/com/alibaba/nacos/client/logger/nop/NopLogger.java index 48d12f69466..2b5e5d34b9a 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/nop/NopLogger.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/nop/NopLogger.java @@ -48,6 +48,7 @@ public void info(String context, String format, Object... args) { } + @Override public void warn(String message, Throwable t) { } diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/option/Logback918ActivateOption.java b/client/src/main/java/com/alibaba/nacos/client/logger/option/Logback918ActivateOption.java index 319f31a59db..4d0389c6fd6 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/option/Logback918ActivateOption.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/option/Logback918ActivateOption.java @@ -82,6 +82,7 @@ public void activateAsyncAppender(String productName, String file, String encodi activateAsyncAppender(productName, file, encoding, Integer.MIN_VALUE, Integer.MIN_VALUE); } + @Override public void activateAsyncAppender(String productName, String file, String encoding, int queueSize, int discardingThreshold) { activateAppender(productName, file, encoding); diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/option/LogbackActivateOption.java b/client/src/main/java/com/alibaba/nacos/client/logger/option/LogbackActivateOption.java index b217e9b6c2a..49c18999963 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/option/LogbackActivateOption.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/option/LogbackActivateOption.java @@ -39,6 +39,7 @@ public LogbackActivateOption(Object logger) { super(logger); } + @Override protected ch.qos.logback.core.Appender getLogbackDailyRollingFileAppender(String productName, String file, String encoding) { RollingFileAppender appender = new RollingFileAppender(); @@ -67,11 +68,14 @@ protected ch.qos.logback.core.Appender getLogbackDailyRollingFileAppender(String return appender; } + @Override protected ch.qos.logback.core.Appender getLogbackDailyAndSizeRollingFileAppender(String productName, String file, String encoding, String size) { return getLogbackDailyAndSizeRollingFileAppender(productName, file, encoding, size, "yyyy-MM-dd", -1); } + + @Override protected ch.qos.logback.core.Appender getLogbackDailyAndSizeRollingFileAppender(String productName, String file, String encoding, String size, String datePattern, @@ -112,6 +116,8 @@ protected ch.qos.logback.core.Appender getLogbackDailyAndSizeRollingFileAppender return appender; } + + @Override protected ch.qos.logback.core.Appender getSizeRollingAppender(String productName, String file, String encoding, String size, int maxBackupIndex) { RollingFileAppender appender = new RollingFileAppender(); diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/slf4j/Slf4jLoggerFactory.java b/client/src/main/java/com/alibaba/nacos/client/logger/slf4j/Slf4jLoggerFactory.java index 95484e1df5b..96f87e8b2c4 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/slf4j/Slf4jLoggerFactory.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/slf4j/Slf4jLoggerFactory.java @@ -31,6 +31,7 @@ public Slf4jLoggerFactory() throws ClassNotFoundException { Class.forName("org.slf4j.impl.StaticLoggerBinder"); } + @Override public Logger getLogger(String name) { try { return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(name)); @@ -40,6 +41,7 @@ public Logger getLogger(String name) { } } + @Override public Logger getLogger(Class clazz) { try { return new Slf4jLogger(org.slf4j.LoggerFactory.getLogger(clazz)); diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/support/LoggerSupport.java b/client/src/main/java/com/alibaba/nacos/client/logger/support/LoggerSupport.java index 6d459666b5e..1197c6707c1 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/support/LoggerSupport.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/support/LoggerSupport.java @@ -81,10 +81,13 @@ public void error(String errorCode, String format, Object... args) { error(null, errorCode, format, args); } + @Override public Object getDelegate() { return delegateLogger; } + + @Override public void activateConsoleAppender(String target, String encoding) { if (activateOption != null) { activateOption.activateConsoleAppender(target, encoding); diff --git a/client/src/main/java/com/alibaba/nacos/client/logger/util/MessageFormatter.java b/client/src/main/java/com/alibaba/nacos/client/logger/util/MessageFormatter.java index 0faa5c9d3c7..5f022809255 100644 --- a/client/src/main/java/com/alibaba/nacos/client/logger/util/MessageFormatter.java +++ b/client/src/main/java/com/alibaba/nacos/client/logger/util/MessageFormatter.java @@ -107,7 +107,7 @@ final public class MessageFormatter { * * @param messagePattern * The message pattern which will be parsed and formatted - * @param argument + * @param arg * The argument to be substituted in place of the formatting anchor * @return The formatted message */ diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/backups/FailoverReactor.java b/client/src/main/java/com/alibaba/nacos/client/naming/backups/FailoverReactor.java index 10b7552c5f8..1604d78d2aa 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/backups/FailoverReactor.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/backups/FailoverReactor.java @@ -209,6 +209,7 @@ public void run() { } class DiskFileWriter extends TimerTask { + @Override public void run() { Map map = hostReactor.getServiceInfoMap(); for (Map.Entry entry : map.entrySet()) { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java b/client/src/main/java/com/alibaba/nacos/client/naming/core/Domain.java similarity index 71% rename from api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java rename to client/src/main/java/com/alibaba/nacos/client/naming/core/Domain.java index 76fb2e3daa5..8241867a943 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/core/Domain.java @@ -13,21 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.api.naming.pojo; +package com.alibaba.nacos.client.naming.core; import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.nacos.api.naming.pojo.Instance; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; +import com.alibaba.nacos.client.naming.utils.StringUtils; +import com.alibaba.nacos.client.naming.utils.UtilAndComs; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** * @author dungu.zpf */ -public class ServiceInfo { - +public class Domain { @JSONField(serialize = false) - private String jsonFromServer = EMPTY; + private String jsonFromServer = StringUtils.EMPTY; public static final String SPLITER = "@@"; @JSONField(name = "dom") @@ -42,13 +44,13 @@ public class ServiceInfo { private long lastRefTime = 0L; - private String checksum = ""; + private String checksum = StringUtils.EMPTY; - private String env = ""; + private String env = StringUtils.EMPTY; private volatile boolean allIPs = false; - public ServiceInfo() { + public Domain() { } public boolean isAllIPs() { @@ -59,33 +61,33 @@ public void setAllIPs(boolean allIPs) { this.allIPs = allIPs; } - public ServiceInfo(String key) { + public Domain(String key) { int maxKeySectionCount = 4; int allIpFlagIndex = 3; int envIndex = 2; int clusterIndex = 1; - int serviceNameIndex = 0; + int domNameIndex = 0; String[] keys = key.split(SPLITER); if (keys.length >= maxKeySectionCount) { - this.name = keys[serviceNameIndex]; + this.name = keys[domNameIndex]; this.clusters = keys[clusterIndex]; this.env = keys[envIndex]; - if (strEquals(keys[allIpFlagIndex], ALL_IPS)) { + if (StringUtils.equals(keys[allIpFlagIndex], UtilAndComs.ALL_IPS)) { this.setAllIPs(true); } } else if (keys.length >= allIpFlagIndex) { - this.name = keys[serviceNameIndex]; + this.name = keys[domNameIndex]; this.clusters = keys[clusterIndex]; - if (strEquals(keys[envIndex], ALL_IPS)) { + if (StringUtils.equals(keys[envIndex], UtilAndComs.ALL_IPS)) { this.setAllIPs(true); } else { this.env = keys[envIndex]; } } else if (keys.length >= envIndex) { - this.name = keys[serviceNameIndex]; - if (strEquals(keys[clusterIndex], ALL_IPS)) { + this.name = keys[domNameIndex]; + if (StringUtils.equals(keys[clusterIndex], UtilAndComs.ALL_IPS)) { this.setAllIPs(true); } else { this.clusters = keys[clusterIndex]; @@ -95,11 +97,11 @@ public ServiceInfo(String key) { this.name = keys[0]; } - public ServiceInfo(String name, String clusters) { - this(name, clusters, EMPTY); + public Domain(String name, String clusters) { + this(name, clusters, StringUtils.EMPTY); } - public ServiceInfo(String name, String clusters, String env) { + public Domain(String name, String clusters, String env) { this.name = name; this.clusters = clusters; this.env = env; @@ -155,7 +157,7 @@ public void setCacheMillis(long cacheMillis) { public List getHosts() { - return new ArrayList(hosts); + return new ArrayList<>(hosts); } public boolean validate() { @@ -163,6 +165,10 @@ public boolean validate() { return true; } + if (CollectionUtils.isEmpty(hosts)) { + return false; + } + List validHosts = new ArrayList(); for (Instance host : hosts) { if (!host.isHealthy()) { @@ -174,6 +180,10 @@ public boolean validate() { } } + if (CollectionUtils.isEmpty(validHosts)) { + return false; + } + return true; } @@ -199,25 +209,25 @@ public static String getKey(String name, String clusters, String unit) { @JSONField(serialize = false) public static String getKey(String name, String clusters, String unit, boolean isAllIPs) { - if (isEmpty(unit)) { - unit = EMPTY; + if (StringUtils.isEmpty(unit)) { + unit = StringUtils.EMPTY; } - if (!isEmpty(clusters) && !isEmpty(unit)) { - return isAllIPs ? name + SPLITER + clusters + SPLITER + unit + SPLITER + ALL_IPS + if (!StringUtils.isEmpty(clusters) && !StringUtils.isEmpty(unit)) { + return isAllIPs ? name + SPLITER + clusters + SPLITER + unit + SPLITER + UtilAndComs.ALL_IPS : name + SPLITER + clusters + SPLITER + unit; } - if (!isEmpty(clusters)) { - return isAllIPs ? name + SPLITER + clusters + SPLITER + ALL_IPS : name + SPLITER + clusters; + if (!StringUtils.isEmpty(clusters)) { + return isAllIPs ? name + SPLITER + clusters + SPLITER + UtilAndComs.ALL_IPS : name + SPLITER + clusters; } - if (!isEmpty(unit)) { - return isAllIPs ? name + SPLITER + EMPTY + SPLITER + unit + SPLITER + ALL_IPS : - name + SPLITER + EMPTY + SPLITER + unit; + if (!StringUtils.isEmpty(unit)) { + return isAllIPs ? name + SPLITER + StringUtils.EMPTY + SPLITER + unit + SPLITER + UtilAndComs.ALL_IPS : + name + SPLITER + StringUtils.EMPTY + SPLITER + unit; } - return isAllIPs ? name + SPLITER + ALL_IPS : name; + return isAllIPs ? name + SPLITER + UtilAndComs.ALL_IPS : name; } @Override @@ -232,20 +242,4 @@ public String getChecksum() { public void setChecksum(String checksum) { this.checksum = checksum; } - - private static boolean isEmpty(String str) { - return str == null || str.length() == 0; - } - - private static boolean strEquals(String str1, String str2) { - return str1 == null ? str2 == null : str1.equals(str2); - } - - private static boolean isEmpty(Collection coll) { - return (coll == null || coll.isEmpty()); - } - - private static final String EMPTY = ""; - - private static final String ALL_IPS = "000--00-ALL_IPS--00--000"; } diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java index 71a8b578af3..b3b5c7d6e5f 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java @@ -82,6 +82,7 @@ public JvmRandom() { * @param seed ignored * @throws UnsupportedOperationException */ + @Override public synchronized void setSeed(long seed) { if (this.constructed) { throw new UnsupportedOperationException(); @@ -94,6 +95,7 @@ public synchronized void setSeed(long seed) { * @return Nothing, this method always throws an UnsupportedOperationException. * @throws UnsupportedOperationException */ + @Override public synchronized double nextGaussian() { throw new UnsupportedOperationException(); } @@ -104,6 +106,7 @@ public synchronized double nextGaussian() { * @param byteArray ignored * @throws UnsupportedOperationException */ + @Override public void nextBytes(byte[] byteArray) { throw new UnsupportedOperationException(); } @@ -117,6 +120,7 @@ public void nextBytes(byte[] byteArray) { *

* @return the random int */ + @Override public int nextInt() { return nextInt(Integer.MAX_VALUE); } @@ -130,6 +134,7 @@ public int nextInt() { * @return the random int * @throws IllegalArgumentException when n <= 0 */ + @Override public int nextInt(int n) { return SHARED_RANDOM.nextInt(n); } @@ -143,6 +148,7 @@ public int nextInt(int n) { *

* @return the random long */ + @Override public long nextLong() { return nextLong(Long.MAX_VALUE); } @@ -187,6 +193,7 @@ public static long nextLong(long n) { * * @return the random boolean */ + @Override public boolean nextBoolean() { return SHARED_RANDOM.nextBoolean(); } @@ -198,6 +205,7 @@ public boolean nextBoolean() { * * @return the random float */ + @Override public float nextFloat() { return SHARED_RANDOM.nextFloat(); } @@ -207,6 +215,7 @@ public float nextFloat() { * * @return the random double */ + @Override public double nextDouble() { return SHARED_RANDOM.nextDouble(); } diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/ThreadLocalRandom.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/ThreadLocalRandom.java index ee41f3ee742..a709e65121a 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/ThreadLocalRandom.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/ThreadLocalRandom.java @@ -146,6 +146,7 @@ private static long newSeed() { * The actual ThreadLocal */ private static final ThreadLocal localRandom = new ThreadLocal() { + @Override protected ThreadLocalRandom initialValue() { return new ThreadLocalRandom(); } @@ -166,6 +167,7 @@ public static ThreadLocalRandom current() { * @throws UnsupportedOperationException * always */ + @Override public void setSeed(long seed) { if (initialized) { throw new UnsupportedOperationException(); @@ -173,6 +175,8 @@ public void setSeed(long seed) { rnd = (seed ^ multiplier) & mask; } + + @Override protected int next(int bits) { rnd = (rnd * multiplier + addend) & mask; return (int) (rnd >>> (48 - bits));