You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2018/10/18 08:21:08 UTC
[incubator-dubbo] branch 2.6.x updated (b56980d -> 2e826a6)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
discard b56980d Fixed code-style and bugs
omit a874554 Polish apache/incubator-dubbo#2235 apache/incubator-dubbo#2251 apache/incubator-dubbo-spring-boot-project#243
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/2.6.x (2e826a6)
\
O -- O -- O (b56980d)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
dependencies-bom/pom.xml | 11 -
dubbo-config/dubbo-config-spring/pom.xml | 7 +-
.../alibaba/dubbo/config/spring/ReferenceBean.java | 1 -
.../alibaba/dubbo/config/spring/ServiceBean.java | 47 +-
.../AbstractAnnotationConfigBeanBuilder.java | 4 +-
.../DubboConfigBindingBeanPostProcessor.java | 1 -
.../ReferenceAnnotationBeanPostProcessor.java | 509 +++++++++++++++------
.../factory/annotation/ReferenceBeanBuilder.java | 47 +-
.../ServiceAnnotationBeanPostProcessor.java | 23 +-
.../factory/annotation/ServiceBeanNameBuilder.java | 112 -----
.../context/annotation/DubboComponentScan.java | 1 -
.../annotation/DubboComponentScanRegistrar.java | 1 -
.../annotation/DubboConfigBindingRegistrar.java | 13 +-
.../annotation/DubboConfigBindingsRegistrar.java | 1 -
.../annotation/DubboConfigConfiguration.java | 1 -
.../DubboConfigConfigurationSelector.java | 1 -
.../spring/context/annotation/EnableDubbo.java | 1 -
.../context/annotation/EnableDubboConfig.java | 1 -
.../annotation/EnableDubboConfigBinding.java | 1 -
.../context/event/ServiceBeanExportedEvent.java | 51 ---
.../converter/StringArrayToMapConverter.java | 28 +-
.../converter/StringArrayToStringConverter.java} | 24 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 46 +-
.../dubbo/config/spring/util/BeanFactoryUtils.java | 1 -
.../spring/action/DemoActionByAnnotation.java | 1 -
.../annotation/consumer/AnnotationAction.java | 1 -
.../AnnotationPropertyValuesAdapterTest.java | 1 -
.../DubboConfigBindingBeanPostProcessorTest.java | 1 -
.../ReferenceAnnotationBeanPostProcessorTest.java | 129 +++---
.../ServiceAnnotationBeanPostProcessorTest.java | 46 +-
.../ServiceAnnotationTestConfiguration.java | 115 -----
.../annotation/ServiceBeanNameBuilderTest.java | 75 ---
.../converter/StringArrayToMapConverterTest.java | 90 ++--
.../StringArrayToStringConverterTest.java | 84 ++--
34 files changed, 653 insertions(+), 823 deletions(-)
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilder.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/event/ServiceBeanExportedEvent.java
copy dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java => dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java (59%)
copy dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/{util/ObjectUtils.java => convert/converter/StringArrayToStringConverter.java} (59%)
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationTestConfiguration.java
delete mode 100644 dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceBeanNameBuilderTest.java
copy dubbo-container/dubbo-container-spring/src/test/java/com/alibaba/dubbo/container/spring/SpringContainerTest.java => dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java (54%)
copy dubbo-container/dubbo-container-spring/src/test/java/com/alibaba/dubbo/container/spring/SpringContainerTest.java => dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java (60%)