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 3571ea4 Polish apache/incubator-dubbo#2235
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 (3571ea4)
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/ServiceBean.java | 56 +--
.../AbstractAnnotationConfigBeanBuilder.java | 9 +-
.../ReferenceAnnotationBeanPostProcessor.java | 505 ++++++++++++++++-----
.../factory/annotation/ReferenceBeanBuilder.java | 46 +-
.../ServiceAnnotationBeanPostProcessor.java | 22 +-
.../factory/annotation/ServiceBeanNameBuilder.java | 111 -----
.../context/event/ServiceBeanExportedEvent.java | 50 --
.../converter/StringArrayToMapConverter.java | 28 +-
.../converter/StringArrayToStringConverter.java} | 24 +-
.../dubbo/config/spring/util/AnnotationUtils.java | 44 +-
.../ReferenceAnnotationBeanPostProcessorTest.java | 128 +++---
.../ServiceAnnotationBeanPostProcessorTest.java | 45 +-
.../ServiceAnnotationTestConfiguration.java | 114 -----
.../annotation/ServiceBeanNameBuilderTest.java | 75 ---
.../converter/StringArrayToMapConverterTest.java | 90 ++--
.../StringArrayToStringConverterTest.java | 84 ++--
18 files changed, 661 insertions(+), 788 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%)
