Merge pull request alibaba#3305 from zongtanghu/feature_notifycenter_…

…replace_v2

[ISSUE#3179]Replace the NotifyCenter with new refactor in the config and test module.

config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigOpsController.java

@@ -19,6 +19,7 @@
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.Objects;
+import com.alibaba.nacos.common.notify.NotifyCenter;
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.model.event.DerbyImportEvent;
 import com.alibaba.nacos.config.server.service.datasource.DynamicDataSource;
@@ -30,7 +31,6 @@
 import com.alibaba.nacos.config.server.utils.PropertyUtil;
 import com.alibaba.nacos.core.auth.ActionTypes;
 import com.alibaba.nacos.core.auth.Secured;
-import com.alibaba.nacos.core.notify.NotifyCenter;
 import com.alibaba.nacos.core.utils.ApplicationUtils;
 import com.alibaba.nacos.core.utils.WebUtils;
 import org.apache.commons.lang3.StringUtils;

config/src/main/java/com/alibaba/nacos/config/server/filter/CurcuitFilter.java

@@ -17,6 +17,9 @@
 package com.alibaba.nacos.config.server.filter;
 
 import com.alibaba.nacos.common.utils.ExceptionUtil;
+import com.alibaba.nacos.common.notify.Event;
+import com.alibaba.nacos.common.notify.NotifyCenter;
+import com.alibaba.nacos.common.notify.listener.SmartSubscriber;
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.model.event.RaftDbErrorEvent;
 import com.alibaba.nacos.config.server.model.event.RaftDbErrorRecoverEvent;
@@ -26,9 +29,6 @@
 import com.alibaba.nacos.core.cluster.MemberMetaDataConstants;
 import com.alibaba.nacos.core.cluster.ServerMemberManager;
 import com.alibaba.nacos.core.code.ControllerMethodsCache;
-import com.alibaba.nacos.core.notify.Event;
-import com.alibaba.nacos.core.notify.NotifyCenter;
-import com.alibaba.nacos.core.notify.listener.SmartSubscribe;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;
@@ -41,6 +41,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.AccessControlException;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -119,7 +120,7 @@ private void listenerSelfInCluster() {
     }
 
     private void registerSubscribe() {
-        NotifyCenter.registerSubscribe(new SmartSubscribe() {
+        NotifyCenter.registerSubscriber(new SmartSubscriber() {
 
             @Override
             public void onEvent(Event event) {
@@ -135,8 +136,8 @@ public void onEvent(Event event) {
             }
 
             @Override
-            public boolean canNotify(Event event) {
-                return (event instanceof RaftDbErrorEvent) || (event instanceof RaftDbErrorRecoverEvent);
+            public List<Class<? extends Event>> subscribeTypes() {
+                return Arrays.asList(RaftDbErrorRecoverEvent.class, RaftDbErrorEvent.class);
             }
         });
     }

config/src/main/java/com/alibaba/nacos/config/server/model/event/ConfigDumpEvent.java

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.config.server.model.event;
 
-import com.alibaba.nacos.core.notify.Event;
+import com.alibaba.nacos.common.notify.Event;
 
 /**
  * ConfigDumpEvent.
  *
  * @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
  */
-public class ConfigDumpEvent implements Event {
+public class ConfigDumpEvent extends Event {
 
     private static final long serialVersionUID = -8776888606458370294L;
 
@@ -222,7 +222,7 @@ public ConfigDumpEventBuilder lastModifiedTs(long lastModifiedTs) {
             this.lastModifiedTs = lastModifiedTs;
             return this;
         }
-
+        
         /**
          * Build a configDumpEvent.
          *

config/src/main/java/com/alibaba/nacos/config/server/model/event/DerbyImportEvent.java

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.config.server.model.event;
 
-import com.alibaba.nacos.core.notify.SlowEvent;
+import com.alibaba.nacos.common.notify.SlowEvent;
 
 /**
  * Data import event.
  *
  * @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
  */
-public class DerbyImportEvent implements SlowEvent {
+public class DerbyImportEvent extends SlowEvent {
 
     private static final long serialVersionUID = 3299565864352399053L;
 

config/src/main/java/com/alibaba/nacos/config/server/model/event/DerbyLoadEvent.java

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.config.server.model.event;
 
-import com.alibaba.nacos.core.notify.SlowEvent;
+import com.alibaba.nacos.common.notify.SlowEvent;
 
 /**
  * DerbyLoadEvent.
  *
  * @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
  */
-public class DerbyLoadEvent implements SlowEvent {
+public class DerbyLoadEvent extends SlowEvent {
 
     public static final DerbyLoadEvent INSTANCE = new DerbyLoadEvent();
 

config/src/main/java/com/alibaba/nacos/config/server/model/event/RaftDbErrorEvent.java

@@ -16,14 +16,14 @@
 
 package com.alibaba.nacos.config.server.model.event;
 
-import com.alibaba.nacos.core.notify.SlowEvent;
+import com.alibaba.nacos.common.notify.SlowEvent;
 
 /**
  * RaftDBErrorEvent.
  *
  * @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
  */
-public class RaftDbErrorEvent implements SlowEvent {
+public class RaftDbErrorEvent extends SlowEvent {
 
     private static final long serialVersionUID = 101591819161802336L;
 

config/src/main/java/com/alibaba/nacos/config/server/model/event/RaftDbErrorRecoverEvent.java

@@ -17,14 +17,14 @@
 package com.alibaba.nacos.config.server.model.event;
 
 import com.alibaba.nacos.common.JustForTest;
-import com.alibaba.nacos.core.notify.Event;
+import com.alibaba.nacos.common.notify.Event;
 
 /**
  * RaftDBErrorRecoverEvent.
  *
  * @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
  */
 @JustForTest
-public class RaftDbErrorRecoverEvent implements Event {
+public class RaftDbErrorRecoverEvent extends Event {
 
 }

config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpConfigHandler.java

@@ -17,28 +17,27 @@
 package com.alibaba.nacos.config.server.service.dump;
 
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.alibaba.nacos.common.notify.Event;
+import com.alibaba.nacos.common.notify.listener.Subscriber;
 import com.alibaba.nacos.config.server.model.event.ConfigDumpEvent;
 import com.alibaba.nacos.config.server.service.AggrWhitelist;
 import com.alibaba.nacos.config.server.service.ClientIpWhiteList;
 import com.alibaba.nacos.config.server.service.ConfigCacheService;
 import com.alibaba.nacos.config.server.service.SwitchService;
 import com.alibaba.nacos.config.server.service.trace.ConfigTraceService;
-import com.alibaba.nacos.core.notify.Event;
-import com.alibaba.nacos.core.notify.listener.Subscribe;
 
 /**
  * Dump config subscriber.
  *
  * @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
  */
-public class DumpConfigHandler implements Subscribe<ConfigDumpEvent> {
+public class DumpConfigHandler extends Subscriber<ConfigDumpEvent> {
 
     /**
      * trigger config dump event.
      *
      * @param event {@link ConfigDumpEvent}
-     * @return {@code true} if the config dump task success , else
-     *         {@code false}
+     * @return {@code true} if the config dump task success , else {@code false}
      */
     public static boolean configDump(ConfigDumpEvent event) {
         final String dataId = event.getDataId();

config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DerbySnapshotOperation.java

@@ -16,6 +16,7 @@
 
 package com.alibaba.nacos.config.server.service.repository.embedded;
 
+import com.alibaba.nacos.common.notify.NotifyCenter;
 import com.alibaba.nacos.config.server.model.event.DerbyLoadEvent;
 import com.alibaba.nacos.config.server.service.datasource.DataSourceService;
 import com.alibaba.nacos.config.server.service.datasource.DynamicDataSource;
@@ -27,7 +28,6 @@
 import com.alibaba.nacos.consistency.snapshot.Writer;
 import com.alibaba.nacos.core.distributed.raft.utils.RaftExecutor;
 import com.alibaba.nacos.core.utils.DiskUtils;
-import com.alibaba.nacos.core.notify.NotifyCenter;
 import com.alibaba.nacos.core.utils.ApplicationUtils;
 import com.alibaba.nacos.core.utils.TimerContext;
 import com.alipay.sofa.jraft.util.CRC64;

config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DistributedDatabaseOperateImpl.java

@@ -21,6 +21,9 @@
 import com.alibaba.nacos.common.JustForTest;
 import com.alibaba.nacos.common.model.RestResult;
 import com.alibaba.nacos.common.model.RestResultUtils;
+import com.alibaba.nacos.common.notify.Event;
+import com.alibaba.nacos.common.notify.NotifyCenter;
+import com.alibaba.nacos.common.notify.listener.Subscriber;
 import com.alibaba.nacos.common.utils.ExceptionUtil;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.common.utils.LoggerUtils;
@@ -53,9 +56,6 @@
 import com.alibaba.nacos.consistency.snapshot.SnapshotOperation;
 import com.alibaba.nacos.core.cluster.ServerMemberManager;
 import com.alibaba.nacos.core.distributed.ProtocolManager;
-import com.alibaba.nacos.core.notify.Event;
-import com.alibaba.nacos.core.notify.NotifyCenter;
-import com.alibaba.nacos.core.notify.listener.Subscribe;
 import com.alibaba.nacos.core.utils.ClassUtils;
 import com.alibaba.nacos.core.utils.DiskUtils;
 import com.alibaba.nacos.core.utils.GenericType;
@@ -190,7 +190,7 @@ protected void init() throws Exception {
         // Register the snapshot load event
         NotifyCenter.registerToSharePublisher(DerbyLoadEvent.class);
 
-        NotifyCenter.registerSubscribe(new Subscribe<RaftDbErrorEvent>() {
+        NotifyCenter.registerSubscriber(new Subscriber<RaftDbErrorEvent>() {
             @Override
             public void onEvent(RaftDbErrorEvent event) {
                 dataSourceService.setHealthStatus("DOWN");
@@ -202,8 +202,8 @@ public Class<? extends Event> subscribeType() {
             }
         });
 
-        NotifyCenter.registerToPublisher(ConfigDumpEvent.class, NotifyCenter.RING_BUFFER_SIZE);
-        NotifyCenter.registerSubscribe(new DumpConfigHandler());
+        NotifyCenter.registerToPublisher(ConfigDumpEvent.class, NotifyCenter.ringBufferSize);
+        NotifyCenter.registerSubscriber(new DumpConfigHandler());
 
         this.protocol.addLogProcessors(Collections.singletonList(this));
         LogUtil.DEFAULT_LOG.info("use DistributedTransactionServicesImpl");

config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/EmbeddedStoragePersistServiceImpl.java

@@ -18,6 +18,7 @@
 
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.common.utils.MD5Utils;
+import com.alibaba.nacos.common.notify.NotifyCenter;
 import com.alibaba.nacos.config.server.configuration.ConditionOnEmbeddedStorage;
 import com.alibaba.nacos.config.server.constant.Constants;
 import com.alibaba.nacos.config.server.enums.FileTypeEnum;
@@ -48,7 +49,6 @@
 import com.alibaba.nacos.config.server.utils.LogUtil;
 import com.alibaba.nacos.config.server.utils.ParamUtils;
 import com.alibaba.nacos.core.distributed.id.IdGeneratorManager;
-import com.alibaba.nacos.core.notify.NotifyCenter;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;