2.6.x Spring Event & Bugfix #2256

mercyblitz · 2018-08-14T02:04:21Z

What is the purpose of the change

New Features

Introduce a new Spring ApplicationEvent for ServiceBean exporting
- Refer to com.alibaba.dubbo.config.spring.context.event.ServiceBeanExportedEvent

Enhancement

Reactor the generation rule for @Service Bean name
- Refer to com.alibaba.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder

Fixed Bugs

@Reference field can't refer its' @Service Bean in same JVM
- Re-run Test case ReferenceAnnotationBeanPostProcessorTest

Update

…v work after apache incubator transition.

2.5.x merge to master

Remove invalid JavaDoc

mercyblitz · 2018-08-14T02:30:52Z

Please focus on code review since those commits have some break update.

codecov-io · 2018-08-14T02:56:19Z

Codecov Report

Merging #2256 into 2.6.x will decrease coverage by 0.1%.
The diff coverage is 91.33%.

@@             Coverage Diff              @@
##              2.6.x    #2256      +/-   ##
============================================
- Coverage     47.32%   47.21%   -0.11%     
+ Complexity     4264     4263       -1     
============================================
  Files           557      558       +1     
  Lines         24397    24352      -45     
  Branches       4342     4324      -18     
============================================
- Hits          11546    11499      -47     
- Misses        11048    11071      +23     
+ Partials       1803     1782      -21

Impacted Files	Coverage Δ	Complexity Δ
...ans/factory/annotation/ServiceBeanNameBuilder.java	`100% <100%> (ø)`	`12 <12> (?)`
...a/com/alibaba/dubbo/config/spring/ServiceBean.java	`55.86% <100%> (+2.92%)`	`45 <4> (+4)`	⬆️
...g/context/properties/DefaultDubboConfigBinder.java	`100% <100%> (ø)`	`2 <0> (ø)`	⬇️
...annotation/ServiceAnnotationBeanPostProcessor.java	`83.08% <100%> (-1.74%)`	`31 <1> (-3)`
...nnotation/AbstractAnnotationConfigBeanBuilder.java	`93.33% <100%> (ø)`	`9 <0> (ø)`	⬇️
...ontext/annotation/DubboConfigBindingRegistrar.java	`92.72% <100%> (ø)`	`15 <6> (ø)`	⬇️
...spring/context/event/ServiceBeanExportedEvent.java	`100% <100%> (ø)`	`2 <2> (?)`
...baba/dubbo/config/spring/util/AnnotationUtils.java	`61.11% <44.44%> (-16.67%)`	`9 <4> (+4)`
...notation/ReferenceAnnotationBeanPostProcessor.java	`98.59% <98.33%> (+21.31%)`	`25 <24> (+1)`	⬆️
.../spring/schema/AnnotationBeanDefinitionParser.java	`9.09% <0%> (-81.82%)`	`1% <0%> (-3%)`
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bbfcb41...c0928d8. Read the comment docs.

diecui1202 · 2018-08-17T02:37:08Z

dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java

-import com.alibaba.dubbo.config.ProviderConfig;
-import com.alibaba.dubbo.config.RegistryConfig;
-import com.alibaba.dubbo.config.ServiceConfig;
+import com.alibaba.dubbo.config.*;


make sure not add import *

Ok, it requires change IDEA Template

Code style template: https://github.com/apache/incubator-dubbo/blob/master/codestyle/dubbo_codestyle_for_idea.xml

zonghaishang · 2018-08-20T02:24:02Z

dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java

-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationListener;
+import org.springframework.context.*;


make sure not add import * , same as @diecui1202 said.

zonghaishang · 2018-08-20T02:25:25Z

...in/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java

+/**
+ * Dubbo {@link Service @Service} Bean Builder
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>


@author should be removed ?

zonghaishang · 2018-08-20T02:30:11Z

.../dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java

+            throws IllegalStateException {
+
+        String interfaceName;
+        if (!"".equals(service.interfaceName())) {


use com.alibaba.dubbo.common.utils.StringUtils#isNotEmpty more better ?

zonghaishang · 2018-08-20T02:32:51Z

.../dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java

+            throws IllegalStateException {
+
+        String interfaceName;
+        if (!"".equals(reference.interfaceName())) {


use com.alibaba.dubbo.common.utils.StringUtils#isNotEmpty more better ?

zonghaishang · 2018-08-20T02:37:55Z

.../java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java

+        Assert.assertEquals(true, referenceBean.isGeneric());
+        Assert.assertEquals(true, referenceBean.isInjvm());
+        Assert.assertEquals(false, referenceBean.isCheck());
+        Assert.assertEquals(null, referenceBean.isInit());


#line 53 init = false, Assert.assertEquals(null, referenceBean.isInit()) should be Assert.assertEquals(false, referenceBean.isInit()) ?

zonghaishang · 2018-08-20T02:39:48Z

...alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationTestConfiguration.java

+/**
+ * {@link Service} Bean
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>


@author should be removed ?

zonghaishang

More confused, too many commits are difficult to find bug fix code for both service and reference in the same project

zonghaishang

1.com.alibaba.spring.beans.factory.annotation.AnnotationInjectedBeanPostProcessor#findFieldAnnotationMetadata and findMethodAnnotationMetadata will cache all the fields or methods that have been annotated with dubbo. The application startup will not be used again.

Dubbo's referenceConfig has been added proxy (spi), you add a another layer of proxy (jdk) here, just solve the same jvm refer to consume the service in advance, this is no problem, after the success of the references should be removing proxy

diecui1202 · 2018-09-05T04:13:34Z

@mercyblitz Pls. check the ci failure.

mercyblitz and others added 27 commits November 6, 2017 10:29

Merge pull request #15 from alibaba/master

562a126

Update

Merge remote-tracking branch 'upstream/master'

926baab

Merge branch 'master' of https://github.com/mercyblitz/dubbo

562ce4f

Manually merge pull request apache#1486, to make travis ci and codeco…

4f34540

…v work after apache incubator transition.

Polish apache#1306

1e5b28f

Merge remote-tracking branch 'dubbo_remote/master'

24ebffc

Merge branch 'master' into 2.5.x

4239a19

Merge branch 'master' into 2.5.x

0a570b7

Merge pull request #21 from mercyblitz/2.5.x

feac608

2.5.x merge to master

Optimize imports

93591f0

Optimize imports

d57343e

Remove invalid JavaDoc

d428f5f

Update DubboConfigBinder.java

5d72ddf

Remove invalid JavaDoc

Merge remote-tracking branch 'origin/master'

a7d176f

Merge remote-tracking branch 'upstream/master'

4d6b1fa

Fix apache#1653

5bab141

Merge remote-tracking branch 'upstream/master'

677be3b

Merge branch 'master' of https://github.com/alibaba/dubbo into 2.6.x

37293eb

Fixed apache#1772

31acca8

Merge branch 'master' of https://github.com/alibaba/dubbo into 2.6.x

fd1c5f3

Merge remote-tracking branch 'upstream/master' into 2.6.x

43e6952

Merge remote-tracking branch 'dubbo_remote/2.6.x' into 2.6.x

d26978d

Reactor ReferenceAnnotationBeanPostProcessor

185545e

Fixed incubator-dubbo-spring-boot-project#243

3f99fe1

Add ServiceBeanNameBuilder

b066ccf

Polish apache/incubator-dubbo/apache#2235

80b6277

Polish incubator-dubbo#2251

cac7021

mercyblitz requested a review from chickenlj August 14, 2018 02:04

mercyblitz added this to the 2.6.4 milestone Aug 14, 2018

mercyblitz closed this Aug 14, 2018

Update spring-context-supprt version to be release

a8f4f73

mercyblitz reopened this Aug 14, 2018

Rename ServiceBeanExportEvent to be ServiceBeanExportedEvent

593ce64

mercyblitz requested a review from zonghaishang August 14, 2018 02:39

mercyblitz added 2 commits August 14, 2018 18:46

Poblish apache#2297

c0928d8

Polish apache#2301

cba31b9

diecui1202 reviewed Aug 17, 2018

View reviewed changes

Polish apache#2315

9d7fe24

zonghaishang reviewed Aug 20, 2018

View reviewed changes

diecui1202 modified the milestones: 2.6.4, 2.6.5 Sep 14, 2018

mercyblitz closed this Oct 15, 2018

cvictory mentioned this pull request Oct 19, 2018

issues list of 2.6.5 #2663

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2.6.x Spring Event & Bugfix #2256

2.6.x Spring Event & Bugfix #2256

mercyblitz commented Aug 14, 2018 •

edited

mercyblitz commented Aug 14, 2018

codecov-io commented Aug 14, 2018 •

edited

diecui1202 Aug 17, 2018

mercyblitz Aug 17, 2018

zonghaishang Aug 20, 2018

zonghaishang Aug 20, 2018

zonghaishang Aug 20, 2018

mercyblitz Oct 11, 2018

zonghaishang Aug 20, 2018

zonghaishang Aug 20, 2018

zonghaishang Aug 20, 2018

zonghaishang Aug 20, 2018

zonghaishang left a comment

zonghaishang left a comment

diecui1202 commented Sep 5, 2018

2.6.x Spring Event & Bugfix #2256

2.6.x Spring Event & Bugfix #2256

Conversation

mercyblitz commented Aug 14, 2018 • edited

What is the purpose of the change

New Features

Enhancement

Fixed Bugs

mercyblitz commented Aug 14, 2018

codecov-io commented Aug 14, 2018 • edited

Codecov Report

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

zonghaishang left a comment

Choose a reason for hiding this comment

zonghaishang left a comment

Choose a reason for hiding this comment

diecui1202 commented Sep 5, 2018

mercyblitz commented Aug 14, 2018 •

edited

codecov-io commented Aug 14, 2018 •

edited