diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java b/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java index e2d14da88..56d96b712 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java @@ -21,7 +21,7 @@ import java.util.Properties; import com.alibaba.nacos.api.exception.NacosException; /** - * @author dungu.zpf + * @author nkorange */ public class NamingFactory { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java b/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java index f896ec5d7..3726e804f 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java @@ -24,7 +24,7 @@ import com.alibaba.nacos.api.naming.pojo.ServiceInfo; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public interface NamingService { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java b/api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java index 224d1ce60..f90c905fa 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java @@ -17,7 +17,7 @@ package com.alibaba.nacos.api.naming.listener; /** * event interface - * @author dungu.zpf + * @author nkorange */ public interface Event { } diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java b/api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java index 94b42a954..b62b5954f 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/listener/NamingEvent.java @@ -20,7 +20,7 @@ import java.util.List; import com.alibaba.nacos.api.naming.pojo.Instance; /** - * @author dungu.zpf + * @author nkorange */ public class NamingEvent implements Event { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java index b03fac9ec..911054602 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Objects; /** - * @author dungu.zpf + * @author nkorange */ public abstract class AbstractHealthChecker implements Cloneable { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java index 2d88353d4..3f599fa07 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class Cluster { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java index 2c7512513..2df1a2394 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class Instance { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ListView.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ListView.java index 985206bba..36490af3d 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ListView.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ListView.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSON; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public class ListView { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java index cc270b084..2f4734c0c 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class Service { diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java index 76fb2e3da..6e28473f4 100644 --- a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java +++ b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public class ServiceInfo { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java b/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java index 5cb6371ce..7620c08ef 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java @@ -42,7 +42,7 @@ import java.util.List; import java.util.Properties; /** - * @author dungu.zpf + * @author nkorange */ @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule") public class NacosNamingService implements NamingService { 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 10b7552c5..d67e6f4cb 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 @@ -33,7 +33,7 @@ import java.util.*; import java.util.concurrent.*; /** - * @author dungu.zpf + * @author nkorange */ public class FailoverReactor { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatInfo.java b/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatInfo.java index df4471696..2571723bc 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatInfo.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatInfo.java @@ -20,7 +20,7 @@ import com.alibaba.fastjson.JSON; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class BeatInfo { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java b/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java index 6fc5fa897..bf0476e10 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/cache/ConcurrentDiskUtil.java @@ -30,7 +30,7 @@ import com.alibaba.nacos.client.logger.Logger; import com.alibaba.nacos.client.naming.utils.LogUtils; /** - * @author dungu.zpf + * @author nkorange */ public class ConcurrentDiskUtil { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/core/ProtectMode.java b/client/src/main/java/com/alibaba/nacos/client/naming/core/ProtectMode.java index 5125c9cc0..e6dfc2333 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/core/ProtectMode.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/core/ProtectMode.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.client.naming.core; /** - * @author dungu.zpf + * @author nkorange */ public class ProtectMode { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java index 24b9836e5..2b72230b9 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java @@ -31,7 +31,7 @@ import java.util.*; import java.util.zip.GZIPInputStream; /** - * @author dungu.zpf + * @author nkorange */ public class HttpClient { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java index 7a3eaf4c0..193a74563 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java @@ -34,7 +34,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; /** - * @author dungu.zpf + * @author nkorange */ public class NamingProxy { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java index 3cc4a68c1..57daf6c71 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public class Chooser { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/GenericPoller.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/GenericPoller.java index b0fa0438f..5aeda3121 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/GenericPoller.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/GenericPoller.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; /** - * @author dungu.zpf + * @author nkorange */ public class GenericPoller implements Poller { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java index 1bb980277..13532a266 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.zip.GZIPInputStream; /** - * @author dungu.zpf + * @author nkorange */ public class IoUtils { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Pair.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Pair.java index d6616d9f3..81f6d99eb 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Pair.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Pair.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.client.naming.utils; /** - * @author dungu.zpf + * @author nkorange */ public class Pair { diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Poller.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Poller.java index 242e553f1..67d39b6ab 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Poller.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Poller.java @@ -18,7 +18,7 @@ package com.alibaba.nacos.client.naming.utils; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public interface Poller { /** diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/StringUtils.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/StringUtils.java index 59df2cd74..2cf03b01b 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/utils/StringUtils.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/utils/StringUtils.java @@ -22,7 +22,7 @@ import java.util.Collection; import java.util.Locale; /** - * @author dungu.zpf + * @author nkorange */ public class StringUtils { public static boolean isEmpty(String str) { diff --git a/client/src/test/java/com/alibaba/nacos/client/NamingTest.java b/client/src/test/java/com/alibaba/nacos/client/NamingTest.java index e5bbd9889..92fa569f1 100644 --- a/client/src/test/java/com/alibaba/nacos/client/NamingTest.java +++ b/client/src/test/java/com/alibaba/nacos/client/NamingTest.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class NamingTest { diff --git a/common/src/main/java/com/alibaba/nacos/common/util/SystemUtils.java b/common/src/main/java/com/alibaba/nacos/common/util/SystemUtils.java index c271cb697..37d435ac0 100644 --- a/common/src/main/java/com/alibaba/nacos/common/util/SystemUtils.java +++ b/common/src/main/java/com/alibaba/nacos/common/util/SystemUtils.java @@ -50,12 +50,12 @@ public class SystemUtils { /** * The System property name of prefer hostname over ip */ - public static final String PREFER_HOSTNAME_OVER_IP_PROPERTY_NAME ="nacos.preferHostnameOverIp"; + public static final String PREFER_HOSTNAME_OVER_IP_PROPERTY_NAME = "nacos.preferHostnameOverIp"; /** * Flag to say that, when guessing a hostname, the hostname of the server should be * used in preference to the IP address reported by the OS. */ - public static final boolean PREFER_HOSTNAME_OVER_IP=Boolean.getBoolean(PREFER_HOSTNAME_OVER_IP_PROPERTY_NAME); + public static final boolean PREFER_HOSTNAME_OVER_IP = Boolean.getBoolean(PREFER_HOSTNAME_OVER_IP_PROPERTY_NAME); /** * Standalone mode or not @@ -155,7 +155,7 @@ public class SystemUtils { public static List readClusterConf() throws IOException { List instanceList = new ArrayList(); List lines = IoUtils.readLines( - new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)), UTF_8)); + new InputStreamReader(new FileInputStream(new File(CLUSTER_CONF_FILE_PATH)), UTF_8)); String comment = "#"; for (String line : lines) { String instance = line.trim(); diff --git a/common/src/main/java/com/alibaba/nacos/common/util/UuidUtil.java b/common/src/main/java/com/alibaba/nacos/common/util/UuidUtil.java index ab20b6d0f..9f2020e14 100644 --- a/common/src/main/java/com/alibaba/nacos/common/util/UuidUtil.java +++ b/common/src/main/java/com/alibaba/nacos/common/util/UuidUtil.java @@ -18,7 +18,7 @@ package com.alibaba.nacos.common.util; import java.util.UUID; /** - * @author dungu.zpf + * @author nkorange */ public class UuidUtil { diff --git a/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java b/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java index 41660922e..f16a1289c 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java @@ -24,7 +24,7 @@ import javax.servlet.ServletContext; /** * Running config - * @author dungu.zpf + * @author nkorange */ @Component public class RunningConfigUtils implements ApplicationListener { diff --git a/example/src/main/java/com/alibaba/nacos/example/NamingExample.java b/example/src/main/java/com/alibaba/nacos/example/NamingExample.java index ab81bf392..fea23eb5d 100644 --- a/example/src/main/java/com/alibaba/nacos/example/NamingExample.java +++ b/example/src/main/java/com/alibaba/nacos/example/NamingExample.java @@ -25,7 +25,7 @@ import com.alibaba.nacos.api.naming.listener.EventListener; import com.alibaba.nacos.api.naming.listener.NamingEvent; /** - * @author dungu.zpf + * @author nkorange */ public class NamingExample { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthChecker.java b/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthChecker.java index ef8623e70..950d0d83c 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthChecker.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthChecker.java @@ -30,7 +30,7 @@ import java.security.AccessControlException; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ @Component public class AuthChecker { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthInfo.java b/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthInfo.java index 81557724f..8cc1c620a 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthInfo.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/acl/AuthInfo.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.acl; /** - * @author dungu.zpf + * @author nkorange */ public class AuthInfo { private String operator; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/boot/RunningConfig.java b/naming/src/main/java/com/alibaba/nacos/naming/boot/RunningConfig.java index 8c4f59a48..74994f327 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/boot/RunningConfig.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/boot/RunningConfig.java @@ -26,9 +26,8 @@ import org.springframework.stereotype.Component; import javax.servlet.ServletContext; /** - * @author dungu.zpf + * @author nkorange */ - @Component public class RunningConfig implements ApplicationListener { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java index 6b4d7f32d..97543735b 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java @@ -48,7 +48,7 @@ import java.util.List; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ @RestController diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java index c340984c1..c1a12af37 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; /** - * @author dungu.zpf + * @author nkorange */ @RestController @RequestMapping(UtilsAndCommons.NACOS_NAMING_CONTEXT + "/cluster") diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/CmdbController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/CmdbController.java index 0d1f27154..020859f34 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/CmdbController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/CmdbController.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.controllers; /** - * @author dungu.zpf + * @author nkorange */ public class CmdbController { } diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java index 563e0b14c..836107adb 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.controllers; /** - * @author dungu.zpf + * @author nkorange */ public class HealthController { } diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java index f60a91f45..dab3265a1 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ @RestController @RequestMapping(UtilsAndCommons.NACOS_NAMING_CONTEXT) diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java index 328af7279..0a1bd01b0 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.controllers; /** - * @author dungu.zpf + * @author nkorange */ public class OperatorController { } diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java index a6810e0fd..5c67cf988 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ @RestController @RequestMapping(UtilsAndCommons.NACOS_NAMING_CONTEXT + "/service") diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java index 27c6d46ff..f0172563e 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java @@ -30,7 +30,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** - * @author dungu.zpf + * @author nkorange */ public class Cluster extends com.alibaba.nacos.api.naming.pojo.Cluster implements Cloneable { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/DistroMapper.java b/naming/src/main/java/com/alibaba/nacos/naming/core/DistroMapper.java index 9d891cdba..82e091ee3 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/DistroMapper.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/DistroMapper.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; /** - * @author dungu.zpf + * @author nkorange */ public class DistroMapper { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Domain.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Domain.java index 17082e90c..23052a6d9 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/Domain.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/Domain.java @@ -18,7 +18,7 @@ package com.alibaba.nacos.naming.core; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public interface Domain { /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java index 3f9039caa..4281ac971 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java @@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; /** - * @author dungu.zpf + * @author nkorange */ @Component public class DomainsManager { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java b/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java index 8ae9ac859..ce0fcc5ff 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; /** * IP under domain * - * @author dungu.zpf + * @author nkorange */ public class IpAddress extends Instance implements Comparable { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java b/naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java index 4d832bea8..a80b9a632 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java @@ -40,7 +40,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** - * @author dungu.zpf + * @author nkorange */ public class VirtualClusterDomain implements Domain, RaftListener { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/exception/NacosException.java b/naming/src/main/java/com/alibaba/nacos/naming/exception/NacosException.java index 1ef6491e8..45d13c0c2 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/exception/NacosException.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/exception/NacosException.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.exception; /** - * @author dungu.zpf + * @author nkorange */ public class NacosException extends Exception { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java b/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java index b44146d44..13782e97c 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/exception/ResponseExceptionHandler.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; /** - * @author dungu.zpf + * @author nkorange */ @ControllerAdvice public class ResponseExceptionHandler { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java index aa9b195dd..c542c7c2a 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java @@ -29,7 +29,7 @@ import java.net.HttpURLConnection; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public class ClientBeatCheckTask implements Runnable { private VirtualClusterDomain domain; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java index 319462578..13d010ecb 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatProcessor.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * @author dungu.zpf + * @author nkorange */ public class ClientBeatProcessor implements Runnable { public static final long CLIENT_BEAT_TIMEOUT = TimeUnit.SECONDS.toMillis(15); diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckMode.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckMode.java index bda1cfdfa..ffc30e3aa 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckMode.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckMode.java @@ -18,7 +18,7 @@ package com.alibaba.nacos.naming.healthcheck; /** * Health check mode * - * @author dungu.zpf + * @author nkorange */ public enum HealthCheckMode { /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckType.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckType.java index fdd3c51e8..140fa81fe 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckType.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckType.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.healthcheck; /** - * @author dungu.zpf + * @author nkorange */ public enum HealthCheckType { /** diff --git a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/JsonAdapter.java b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/JsonAdapter.java index c45df2686..71e800873 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/JsonAdapter.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/healthcheck/JsonAdapter.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.lang.reflect.Type; /** - * @author dungu.zpf + * @author nkorange */ public class JsonAdapter implements ObjectDeserializer, ObjectSerializer { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java index 269feff88..eaee45c95 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchEntry.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.naming.misc; /** - * @author dungu.zpf + * @author nkorange */ public class SwitchEntry { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java b/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java index 06a3754dd..84edaddad 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java @@ -102,6 +102,10 @@ public class UtilsAndCommons { public static final String API_DOM = "/api/dom"; + public static final String INSTANCE_LIST_PERSISTED_PROPERTY_KEY = "nacos.instanceListPersisted"; + + public static final boolean INSTANCE_LIST_PERSISTED = Boolean.getBoolean(INSTANCE_LIST_PERSISTED_PROPERTY_KEY); + public static final ScheduledExecutorService SERVER_STATUS_EXECUTOR; public static final ScheduledExecutorService DOMAIN_SYNCHRONIZATION_EXECUTOR; diff --git a/naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java index c084d8cbf..38caa21a1 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java @@ -396,9 +396,10 @@ public class RaftCore { } // do apply - if (datum.key.startsWith(UtilsAndCommons.DOMAINS_DATA_ID)) { + if (datum.key.startsWith(UtilsAndCommons.DOMAINS_DATA_ID) || UtilsAndCommons.INSTANCE_LIST_PERSISTED) { RaftStore.write(datum); } + RaftCore.datums.put(datum.key, datum); if (datum.key.startsWith(UtilsAndCommons.DOMAINS_DATA_ID)) { @@ -797,7 +798,8 @@ public class RaftCore { continue; } - if (datum.key.startsWith(UtilsAndCommons.DOMAINS_DATA_ID)) { + if (datum.key.startsWith(UtilsAndCommons.DOMAINS_DATA_ID) || + UtilsAndCommons.INSTANCE_LIST_PERSISTED) { RaftStore.write(datum); } diff --git a/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceDetailView.java b/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceDetailView.java index 5bf677718..3d00d16af 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceDetailView.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceDetailView.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class ServiceDetailView { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceView.java b/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceView.java index f4fa7a2a6..b1c6f3dca 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceView.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/view/ServiceView.java @@ -18,7 +18,7 @@ package com.alibaba.nacos.naming.view; import com.alibaba.fastjson.JSON; /** - * @author dungu.zpf + * @author nkorange */ public class ServiceView { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/AuthFilter.java b/naming/src/main/java/com/alibaba/nacos/naming/web/AuthFilter.java index 2f769ab10..c605eafa9 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/web/AuthFilter.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/web/AuthFilter.java @@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** - * @author dungu.zpf + * @author nkorange */ public class AuthFilter implements Filter { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/MockHttpRequest.java b/naming/src/main/java/com/alibaba/nacos/naming/web/MockHttpRequest.java index 8cd1ff719..42e4391e2 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/web/MockHttpRequest.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/web/MockHttpRequest.java @@ -24,7 +24,7 @@ import java.security.Principal; import java.util.*; /** - * @author dungu.zpf + * @author nkorange */ public class MockHttpRequest implements HttpServletRequest { diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/NamingConfig.java b/naming/src/main/java/com/alibaba/nacos/naming/web/NamingConfig.java index e8b04a13a..858558711 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/web/NamingConfig.java +++ b/naming/src/main/java/com/alibaba/nacos/naming/web/NamingConfig.java @@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration; import javax.servlet.Filter; /** - * @author dungu.zpf + * @author nkorange */ @Configuration diff --git a/naming/src/test/java/com/alibaba/nacos/naming/BaseTest.java b/naming/src/test/java/com/alibaba/nacos/naming/BaseTest.java index ea4caa2d2..b1fc10a8b 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/BaseTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/BaseTest.java @@ -26,7 +26,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; /** - * @author dungu.zpf + * @author nkorange */ public class BaseTest { diff --git a/naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java b/naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java index 48c826e3f..51ae79f52 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/controllers/InstanceControllerTest.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.concurrent.locks.ReentrantLock; /** - * @author dungu.zpf + * @author nkorange */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MockServletContext.class) diff --git a/naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java b/naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java index c6a3db99e..0a06ff47c 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/core/ClusterTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ public class ClusterTest { diff --git a/naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java b/naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java index 1b36d7eaf..00c9a3b01 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/core/DomainTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class DomainTest { diff --git a/naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java b/naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java index c1b97c2f3..a28c84f46 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; /** - * @author dungu.zpf + * @author nkorange */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = MockServletContext.class) diff --git a/naming/src/test/java/com/alibaba/nacos/naming/core/IpAddressTest.java b/naming/src/test/java/com/alibaba/nacos/naming/core/IpAddressTest.java index 2fd21a688..6c0f5e214 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/core/IpAddressTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/core/IpAddressTest.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; /** - * @author dungu.zpf + * @author nkorange */ public class IpAddressTest { diff --git a/naming/src/test/java/com/alibaba/nacos/naming/misc/SwitchTest.java b/naming/src/test/java/com/alibaba/nacos/naming/misc/SwitchTest.java index 53f564d31..bb12837e1 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/misc/SwitchTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/misc/SwitchTest.java @@ -20,7 +20,7 @@ import org.junit.Before; import org.junit.Test; /** - * @author dungu.zpf + * @author nkorange */ public class SwitchTest { diff --git a/naming/src/test/java/com/alibaba/nacos/naming/raft/RaftStoreTest.java b/naming/src/test/java/com/alibaba/nacos/naming/raft/RaftStoreTest.java index 2ca84b35d..b1a347928 100644 --- a/naming/src/test/java/com/alibaba/nacos/naming/raft/RaftStoreTest.java +++ b/naming/src/test/java/com/alibaba/nacos/naming/raft/RaftStoreTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; /** - * @author dungu.zpf + * @author nkorange */ public class RaftStoreTest { diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java b/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java index a4c9c10e2..7c0fb47ed 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/NamingBase.java @@ -25,7 +25,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.Service; /** - * @author dungu.zpf + * @author nkorange */ public class NamingBase { diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/Params.java b/test/src/test/java/com/alibaba/nacos/test/naming/Params.java index cdeb36552..59524438a 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/Params.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/Params.java @@ -19,7 +19,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; /** - * @author dungu.zpf + * @author nkorange */ public class Params { diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java index 388620d89..1d1a500ee 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java @@ -41,7 +41,7 @@ import java.net.URL; import static org.junit.Assert.assertTrue; /** - * @author dungu.zpf + * @author nkorange */ @RunWith(SpringRunner.class) @SpringBootTest(classes = NamingApp.class, properties = {"server.servlet.context-path=/nacos", diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest.java b/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest.java index 1e2db2acd..cd7228585 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/ServiceListTest.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** - * @author dungu.zpf + * @author nkorange */ @RunWith(SpringRunner.class) @SpringBootTest(classes = NamingApp.class, properties = {"server.servlet.context-path=/nacos"}, diff --git a/test/src/test/java/com/alibaba/nacos/test/naming/Starter_ITCase.java b/test/src/test/java/com/alibaba/nacos/test/naming/Starter_ITCase.java index 4ce2b68d3..4fa50e81e 100644 --- a/test/src/test/java/com/alibaba/nacos/test/naming/Starter_ITCase.java +++ b/test/src/test/java/com/alibaba/nacos/test/naming/Starter_ITCase.java @@ -16,7 +16,7 @@ package com.alibaba.nacos.test.naming; /** - * @author dungu.zpf + * @author nkorange */ public class Starter_ITCase { }