[#3117]Just Sink the Notify implementation into common module and optimize some parts #3118

zongtanghu · 2020-06-19T02:34:56Z

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

Sink the Notify implementation into common module and optimize some parts

Brief changelog

Sink the Notify implementation into common module and optimize some parts.
And this pr is one part of another bigger pr.The link is #2859.

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

…ptimize some parts.

zongtanghu · 2020-06-19T02:36:55Z

这个PR的几个改造要点：

（1）：将原来core module里面的NofityCenter和DefaultPublisher等下沉至common的module中，同时由于common module本身只是支持 java 6的，所以我把原来Nofity里面涉及Lamba表达式和Java 8的东西，都替换掉了（其中为了去除原本java 8的default关键字，我用了abstract抽象类来代替；将BiFunction从JDK 8中剥离移到common module中），没有做实际的重构和改造，基本是保留原来春少的Nofity设计思路的；

（2）：对于“System.currentTimeMillis()”设置sequence的方法，采用“AtomicInteger或者AtomicLong，减少对系统时间的查询”

zongtanghu · 2020-06-19T02:37:29Z

Please help to review this pr, @yanlinly @KomachiSion @chuntaojun

common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java

common/src/main/java/com/alibaba/nacos/common/notify/Event.java

KomachiSion · 2020-06-19T03:43:54Z

common/src/main/java/com/alibaba/nacos/common/notify/Event.java

+ * @author <a href="mailto:[email protected]">liaochuntao</a>
+ * @author zongtanghu
+ */
+@SuppressWarnings("all")


If no special situation, please do not use SuppressWarnings

Okay I will fix this in next commit.

common/src/main/java/com/alibaba/nacos/common/utils/ClassUtils.java

common/src/main/java/com/alibaba/nacos/common/utils/BiFunction.java

common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java

common/src/main/java/com/alibaba/nacos/common/utils/ClassUtils.java

common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java

KomachiSion · 2020-06-19T12:21:09Z

common/src/main/java/com/alibaba/nacos/common/NotThreadSafe.java

+@Documented
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.SOURCE)
+public @interface NotThreadSafe {


I know you want to figure out some method may be not thread safe. But I want to know whether is project do like this? I think write some discription in Javadoc is enough.

Some open source project use this annotation to present unsafe method.

KomachiSion · 2020-06-19T12:24:40Z

common/src/main/java/com/alibaba/nacos/common/notify/Event.java

+@SuppressWarnings({"PMD.AbstractClassShouldStartWithAbstractNamingRule", "PMD.ConstantFieldShouldBeUpperCaseRule"})
+public abstract class Event implements Serializable {
+
+    private static final AtomicLong sequence = new AtomicLong(0);


I mean that no-->sequence the constant still is SEQUENCE.

Okay, sorry , I disunderstand what's your meaning.

I will fix this in next commit.

common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java

common/src/main/java/com/alibaba/nacos/common/utils/ClassUtils.java

common/src/main/java/com/alibaba/nacos/common/utils/BiFunction.java

common/src/main/java/com/alibaba/nacos/common/notify/listener/Subscriber.java

KomachiSion · 2020-06-21T01:45:55Z

common/src/main/java/com/alibaba/nacos/common/NotThreadSafe.java

+@Documented
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.SOURCE)
+public @interface NotThreadSafe {


chuntaojun · 2020-06-21T01:59:16Z

common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java

+    }
+
+    private boolean hasSubscriber() {
+        return CollectionUtils.isNotEmpty(subscribers) || CollectionUtils.isNotEmpty(SMART_SUBSCRIBERS);


Not being empty in the smartSubscribers collection does not imply that there are listeners interested in the event

Okay, this issue has already been resolved in this pr.

…and reformat.

chuntaojun · 2020-06-21T11:56:20Z

common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java

+        // If you want to listen to multiple events, you do it separately,
+        // based on subclass's subscribeTypes method return list, it can register to publisher.
+        if (consumer instanceof SmartSubscriber) {
+            EventPublisher.SMART_SUBSCRIBERS.add((SmartSubscriber) consumer);


delete SMART_SUBSCRIBERS

I will remove this in next commit.

chuntaojun · 2020-06-21T11:56:52Z

common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java

+    public static <T> void deregisterSubscriber(final Subscriber consumer) {
+        final Class<? extends Event> cls = consumer.subscribeType();
+        if (consumer instanceof SmartSubscriber) {
+            EventPublisher.SMART_SUBSCRIBERS.remove((SmartSubscriber) consumer);


delete SMART_SUBSCRIBERS

I will remove this in next commit.

yanlinly

后面建议把ut 也一起迁移下来。

zongtanghu · 2020-06-22T02:44:10Z

Hi @yanlinly，我再下一个pr里面把ut一起迁移到common库下面吧 [email protected] From: yanlinly Date: 2020-06-22 10:29 To: alibaba/nacos CC: Hu Zongtang; Author Subject: Re: [alibaba/nacos] [#3117]Just Sink the Notify implementation into common module and optimize some parts (#3118) @yanlinly commented on this pull request. 后面建议把ut 也一起迁移下来。 ― You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

[alibaba#3117]Sink the Notify implementation into common module and o…

b84cf02

…ptimize some parts.

[alibaba#3117]fix typo and reformat code styles.

99a7415

KomachiSion requested changes Jun 19, 2020

View reviewed changes

chuntaojun reviewed Jun 19, 2020

View reviewed changes

common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java Show resolved Hide resolved

common/src/main/java/com/alibaba/nacos/common/utils/ClassUtils.java Outdated Show resolved Hide resolved

chuntaojun reviewed Jun 19, 2020

View reviewed changes

common/src/main/java/com/alibaba/nacos/common/utils/MapUtils.java Show resolved Hide resolved

[alibaba#3117]fix typo and reformat code styles.

c5f7e6c

KomachiSion requested changes Jun 19, 2020

View reviewed changes

[alibaba#3118]fix typo and formate.

0517324

zongtanghu mentioned this pull request Jun 20, 2020

The notify implementation within nacos-common module radiates to all nacos modules #2859

Closed

KomachiSion previously approved these changes Jun 21, 2020

View reviewed changes

KomachiSion added kind/enhancement Category issues or prs related to enhancement. area/Nacos Core labels Jun 21, 2020

KomachiSion added this to the 1.4.0 milestone Jun 21, 2020

chuntaojun reviewed Jun 21, 2020

View reviewed changes

[alibaba#3118]Unify Subsciber and SmartSubscriber, and fix some typo …

85625cc

…and reformat.

zongtanghu dismissed KomachiSion’s stale review via 85625cc June 21, 2020 05:41

chuntaojun reviewed Jun 21, 2020

View reviewed changes

[alibaba#3118]fix some typo and reformat.

051dc70

chuntaojun approved these changes Jun 21, 2020

View reviewed changes

chuntaojun merged commit 1dc29f2 into alibaba:develop Jun 21, 2020

yanlinly reviewed Jun 22, 2020

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#3117]Just Sink the Notify implementation into common module and optimize some parts #3118

[#3117]Just Sink the Notify implementation into common module and optimize some parts #3118

zongtanghu commented Jun 19, 2020 •

edited

Loading

zongtanghu commented Jun 19, 2020

zongtanghu commented Jun 19, 2020

KomachiSion Jun 19, 2020

zongtanghu Jun 19, 2020

KomachiSion Jun 19, 2020

zongtanghu Jun 19, 2020

KomachiSion Jun 21, 2020

KomachiSion Jun 19, 2020

zongtanghu Jun 19, 2020

zongtanghu Jun 20, 2020

KomachiSion Jun 21, 2020

chuntaojun Jun 21, 2020

zongtanghu Jun 21, 2020

chuntaojun Jun 21, 2020

zongtanghu Jun 21, 2020

chuntaojun Jun 21, 2020

zongtanghu Jun 21, 2020

yanlinly left a comment

zongtanghu commented Jun 22, 2020 via email

[#3117]Just Sink the Notify implementation into common module and optimize some parts #3118

[#3117]Just Sink the Notify implementation into common module and optimize some parts #3118

Conversation

zongtanghu commented Jun 19, 2020 • edited Loading

What is the purpose of the change

Brief changelog

Verifying this change

zongtanghu commented Jun 19, 2020

zongtanghu commented Jun 19, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yanlinly left a comment

Choose a reason for hiding this comment

zongtanghu commented Jun 22, 2020 via email

zongtanghu commented Jun 19, 2020 •

edited

Loading