date:20180330

[incubator-dubbo] branch 2.5.x updated (1e5b28f -> 4f34540)

2018-03-30 Thread mercyblitz

This is an automated email from the ASF dual-hosted git repository.

mercyblitz pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


 discard 1e5b28f  Polish alibaba/dubbo#1306

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/2.5.x (4f34540)
\
 O -- O -- O   (1e5b28f)

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:
 .../AnnotationPropertyValuesAdapter.java   |  92 
 .../DubboConfigBindingBeanPostProcessor.java   | 115 +++
 .../ReferenceAnnotationBeanPostProcessor.java  | 161 -
 .../factory/annotation/ReferenceBeanBuilder.java   |  26 +---
 .../ServiceAnnotationBeanPostProcessor.java|  49 ---
 .../annotation/DubboConfigBindingRegistrar.java|  64 +---
 .../properties/AbstractDubboConfigBinder.java  |  69 -
 .../properties/DefaultDubboConfigBinder.java   |  46 --
 .../context/properties/DubboConfigBinder.java  |  58 
 .../converter/StringArrayToMapConverter.java   |  38 -
 .../converter/StringArrayToStringConverter.java|  37 -
 .../dubbo/config/spring/util/AnnotationUtils.java  |  89 
 .../dubbo/config/spring/util/ObjectUtils.java  |  37 -
 .../config/spring/util/PropertySourcesUtils.java   |  18 +--
 .../annotation/provider/AnnotationServiceImpl.java |   2 +-
 .../AnnotationPropertyValuesAdapterTest.java   | 158 
 .../DubboConfigBindingBeanPostProcessorTest.java   |  66 -
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  95 ++--
 .../ServiceAnnotationBeanPostProcessorTest.java|   3 +-
 .../properties/DefaultDubboConfigBinderTest.java   |  56 ---
 .../converter/StringArrayToMapConverterTest.java   |  52 ---
 .../StringArrayToStringConverterTest.java  |  46 --
 22 files changed, 136 insertions(+), 1241 deletions(-)
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/AbstractDubboConfigBinder.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinder.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/context/properties/DubboConfigBinder.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverter.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverter.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/AnnotationUtils.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/util/ObjectUtils.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java
 delete mode 100644 
dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java

-- 
To stop receiving notification emails like this one, please contact
mercybl...@apache.org.

[incubator-dubbo] branch 2.5.x updated: Polish alibaba/dubbo#1306

2018-03-30 Thread mercyblitz

This is an automated email from the ASF dual-hosted git repository.

mercyblitz pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.5.x by this push:
 new 1e5b28f  Polish alibaba/dubbo#1306
1e5b28f is described below

commit 1e5b28f458ee5bb9ea3cb656fc5932e1296b3ee4
Author: mercyblitz 
AuthorDate: Fri Mar 30 23:33:37 2018 +0800

Polish alibaba/dubbo#1306
---
 .../AnnotationPropertyValuesAdapter.java   |  92 
 .../DubboConfigBindingBeanPostProcessor.java   | 115 ---
 .../ReferenceAnnotationBeanPostProcessor.java  | 161 +
 .../factory/annotation/ReferenceBeanBuilder.java   |  26 +++-
 .../ServiceAnnotationBeanPostProcessor.java|  49 +++
 .../annotation/DubboConfigBindingRegistrar.java|  64 +++-
 .../properties/AbstractDubboConfigBinder.java  |  69 +
 .../properties/DefaultDubboConfigBinder.java   |  46 ++
 .../context/properties/DubboConfigBinder.java  |  58 
 .../converter/StringArrayToMapConverter.java}  |  75 +-
 .../converter/StringArrayToStringConverter.java}   |  74 +-
 .../dubbo/config/spring/util/AnnotationUtils.java  |  89 
 .../dubbo/config/spring/util/ObjectUtils.java} |  74 +-
 .../config/spring/util/PropertySourcesUtils.java   |  18 ++-
 .../annotation/provider/AnnotationServiceImpl.java |   2 +-
 .../AnnotationPropertyValuesAdapterTest.java   | 158 
 .../DubboConfigBindingBeanPostProcessorTest.java   |  66 +
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  95 ++--
 .../ServiceAnnotationBeanPostProcessorTest.java|   3 +-
 .../properties/DefaultDubboConfigBinderTest.java   |  56 +++
 .../converter/StringArrayToMapConverterTest.java}  |  89 +++-
 .../StringArrayToStringConverterTest.java} |  83 ++-
 22 files changed, 1241 insertions(+), 321 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
new file mode 100644
index 000..751399f
--- /dev/null
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapter.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.dubbo.config.spring.beans.factory.annotation;
+
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.PropertyValues;
+import org.springframework.core.env.PropertyResolver;
+
+import java.lang.annotation.Annotation;
+
+import static 
com.alibaba.dubbo.config.spring.util.AnnotationUtils.getAttributes;
+
+/**
+ * {@link Annotation} {@link PropertyValues} Adapter
+ *
+ * @see Annotation
+ * @see PropertyValues
+ * @since 2.5.11
+ */
+class AnnotationPropertyValuesAdapter implements PropertyValues {
+
+private final Annotation annotation;
+
+private final PropertyResolver propertyResolver;
+
+private final boolean ignoreDefaultValue;
+
+private final PropertyValues delegate;
+
+public AnnotationPropertyValuesAdapter(Annotation annotation, 
PropertyResolver propertyResolver, boolean ignoreDefaultValue, String... 
ignoreAttributeNames) {
+this.annotation = annotation;
+this.propertyResolver = propertyResolver;
+this.ignoreDefaultValue = ignoreDefaultValue;
+this.delegate = adapt(annotation, ignoreDefaultValue, 
ignoreAttributeNames);
+}
+
+public AnnotationPropertyValuesAdapter(Annotation annotation, 
PropertyResolver propertyResolver, String... ignoreAttributeNames) {
+this(annotation, propertyResolver, true, ignoreAttributeNames);
+}
+
+private PropertyValues adapt(Annotation annotation, boolean 
ignoreDefaultValue, String... ignoreAttributeNames) {
+return new

[incubator-dubbo] branch 2.5.x updated (6e38481 -> 4f34540)

2018-03-30 Thread mercyblitz

This is an automated email from the ASF dual-hosted git repository.

mercyblitz pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


omit 6e38481  Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
omit 661ca74  Polish alibaba/dubbo #1317
omit a95b118  Polish alibaba/dubbo #1317
omit b5f7afe  Merge remote-tracking branch 'origin/2.5.11' into 2.5.11
omit 51c29ba  Test
omit c2ae82a  Polish alibaba/dubbo #1277
omit 8681ad7  Update version to be 2.5.11
omit 8a0ce5e  Polish alibaba/dubbo #1464
omit bb4651e  Merge upstream/2.5.x
omit 3364f42  Merge remote-tracking branch 'upstream/2.5.x' into 2.5.11
omit 562ce4f  Merge branch 'master' of https://github.com/mercyblitz/dubbo
omit b9b1f15  Upgrade spring xsd version from 2.5 to 4.3
omit 5dd8ddc  Fix typo (#1424)
omit 6a5281e  fix heartbeat spelling error (#1451)
omit 1f22f56  Add unit test for ExtensionLoader
omit 2308427  Add .script route rules back for UT
omit c94198b  Fix UT problems after structure change
omit 4a5c5e2  Merge pull request #1389, refactor dubbo deployment process
omit b626432  clean up imports for CacheTest
omit d770d92  [Dubbo-#1362] cache provider always lru cache (#1396)
omit 3d4f2fc  Remove author info and add apache license
omit 6dff137  Fix "promoteTransitiveDependencies=false" of 
maven-shade-plugin
omit 0423219  #1411: Locale deserialize 'zh-hant_CN'
omit 3be23d9  update README format
omit 8bd9e9d  update readme to add some details (#1403)
omit 91f9250  fix number type is lost in yaml config file (#1401)
omit 84124c4  Merge branch '2.5.x' of https://github.com/alibaba/dubbo
omit 7faa3f0  Merge pull request #1391, fix typo of method name in qos 
module.
omit d47d22b  Fix time unit problem related with FutureAdapter in UT
omit d7a78c3  Fix time unit problem in UT
omit 5d7b316  Fixed #1398, revert bugs introduced from #1375
omit d8f3dd3  Change Mailing list address
omit 4bbc0dd  Merge pull request #1242, remove redundant null check.
omit b52879c  Merge pull request #1040, refactor: replace some deprecated 
methods related with jedis.
omit c7170d5  Merge pull request #1384, fix build string bug.
omit c7197b0  Merge pull request #1376, do not instantiate load balance if 
there is no invokers
omit ace2f4f  Merge pull request #1331, add optional parameter to support 
hessian protocol method overload and request protocol version.
omit ddb677b  Merge pull request #1375, remove unnecessary boxing.
omit fddedf6  Merge pull request #1378, replace StringBuider with simple 
string concatenation in log.
omit 59ca32a  Merge branch '2.5.x'
omit a582764  Merge pull request #1377, remove redundant arguments for 
StatItem.isAllowable()
omit 2c20d99  fixed travis-ci failed because of test cases. (#1370)
omit 16bac78  Merge pull request #1353, fix oninvoke injection failure
omit 8b352ef  update README
omit 25dfe1c  Merge pull request #912, reducing search times in 
selectForKey(hash)
omit 9c2e2fa  add javadoc for setAttachments in order to clarify issue#1166
omit c56d192  Merge pull request #1249, channel.close() in netty4 is async, 
so reconnect() don't connected
omit 61ba25b  Merge pull request #1291, allow @Reference to support custom 
annotations
omit d129f10  Collection.isEmpty() should be used to test for emptiness 
(#1315)
omit d388735  [Dubbo-1283] Ensure we can build Dubbo on Java 9  (#1345)
omit 720dff8  Merge pull request #1319, add unit test for jetty http binder 
and tomcat http binder
omit 456edf1  [Dubbo-1284] Fix UT warning message when running on Java 9 
(#1323)
omit 61d7178  Merge pull request #1333, remove unnecessary maven 
wrapper(fixes #1167)
omit 98c548a  add config for travis ci fail when test case fail (#1264)
omit daac568  Remove slf4j-log4j12 dependency
omit 9ca9bb0  Fix typo #1260
omit 2f7f91c  Remove unnecessary transitive dependencies
omit d1292c2  Add "source" configuration to JdkCompiler
omit a4632da  Merge branch '2.5.x'
omit 5b0ab11  remove hot symbol
omit 74f7074  add dubbo-ops link
omit 2108d8f  Update README.md
omit 8eb0d6f  Remove useless dependencies
omit c7cd889  Merge pull request #1236, fix typo in FailbackRegistry.
omit 09722e3  Remove unnecessary dependencies
omit 9cb9426  Add comment
omit 6160d3e  Fixed #1226, enhance netty support for rest protocol
omit 267292e  Fixed #1186, change the default ZK client from `zkclient` to 
`curator`
omit 77f03a5  add javadoc.opts to adapt java7 and java 8
omit 5c3c29b  recover -Xdoclint:none temperary
omit 4a5b189  Merge branch 'master' of https://github.com/alibaba/dubbo
omit 8031ba6  获取Serializer和Deserializer时，高并发情况下线程block (#1196)
omit 7cfa205  Merge pull request from #1170, fix typo of SUFFIXES.
omit 926a719  Remove useless

[incubator-dubbo] branch 2.5.x updated (4f34540 -> 6e38481)

2018-03-30 Thread mercyblitz

This is an automated email from the ASF dual-hosted git repository.

mercyblitz pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


from 4f34540  Manually merge pull request #1486, to make travis ci and 
codecov work after apache incubator transition.
 add ab8af67  Merge pull request from #1001, merge dubbox branch
 add 20fff01  Upgrade serialization integration of kryo and fst
 add f4dfc6e  Revert modification of core dubbo RPC protocol
 add 17aa99e  Upgrade rest integration
 add 0602317  Add apache license and remove author info
 add c805904  Remove useless container integration
 add cf3a54e  Add test example for rest
 add 12e4d1c  Add service level `serialization` config
 add 75ed5f5  Delete OptimizedSerialization
 add e0a9cbf  Adjust dependencies in pom.xml relating with rest
 add 8ad8757  Upgrade netty4 version
 add 739a61e  Upgrade version to 2.6.0
 add eae1367  Add version for resteasy dependency
 add 5f02aa6  Degrade the resteasy and netty version for jdk1.7 
compatibility.
 add 7e59712  Fix typo
 add 22bb9cb  Fix typo of resteasy version in dubbo-maven
 add 26f39d5  Refactor project structure using maven
 add 9893bd6  Change module name
 add da3783e  Upgrade version to 2.6.1
 add e62d3ff  Remove classes related with "dubbo-monitor"
 add 9871e6a  Upgrade version to 2.6.1
 add 4413886  Remove maven "provided" config in pom.xml of sub-modules
 add ca11537  Remove dubbo-admin, why it appears?
 add 926a719  Remove useless readme.md
 add 7cfa205  Merge pull request from #1170, fix typo of SUFFIXES.
 add 8031ba6  获取Serializer和Deserializer时，高并发情况下线程block (#1196)
 add 4a5b189  Merge branch 'master' of https://github.com/alibaba/dubbo
 add 5c3c29b  recover -Xdoclint:none temperary
 add 77f03a5  add javadoc.opts to adapt java7 and java 8
 add 267292e  Fixed #1186, change the default ZK client from `zkclient` to 
`curator`
 add 6160d3e  Fixed #1226, enhance netty support for rest protocol
 add 9cb9426  Add comment
 add 09722e3  Remove unnecessary dependencies
 add c7cd889  Merge pull request #1236, fix typo in FailbackRegistry.
 add 8eb0d6f  Remove useless dependencies
 add 2108d8f  Update README.md
 add 74f7074  add dubbo-ops link
 add 5b0ab11  remove hot symbol
 add a4632da  Merge branch '2.5.x'
 add d1292c2  Add "source" configuration to JdkCompiler
 add 2f7f91c  Remove unnecessary transitive dependencies
 add 9ca9bb0  Fix typo #1260
 add daac568  Remove slf4j-log4j12 dependency
 add 98c548a  add config for travis ci fail when test case fail (#1264)
 add 61d7178  Merge pull request #1333, remove unnecessary maven 
wrapper(fixes #1167)
 add 456edf1  [Dubbo-1284] Fix UT warning message when running on Java 9 
(#1323)
 add 720dff8  Merge pull request #1319, add unit test for jetty http binder 
and tomcat http binder
 add d388735  [Dubbo-1283] Ensure we can build Dubbo on Java 9  (#1345)
 add d129f10  Collection.isEmpty() should be used to test for emptiness 
(#1315)
 add 61ba25b  Merge pull request #1291, allow @Reference to support custom 
annotations
 add c56d192  Merge pull request #1249, channel.close() in netty4 is async, 
so reconnect() don't connected
 add 9c2e2fa  add javadoc for setAttachments in order to clarify issue#1166
 add 25dfe1c  Merge pull request #912, reducing search times in 
selectForKey(hash)
 add 8b352ef  update README
 add 16bac78  Merge pull request #1353, fix oninvoke injection failure
 add 2c20d99  fixed travis-ci failed because of test cases. (#1370)
 add a582764  Merge pull request #1377, remove redundant arguments for 
StatItem.isAllowable()
 add 59ca32a  Merge branch '2.5.x'
 add fddedf6  Merge pull request #1378, replace StringBuider with simple 
string concatenation in log.
 add ddb677b  Merge pull request #1375, remove unnecessary boxing.
 add ace2f4f  Merge pull request #1331, add optional parameter to support 
hessian protocol method overload and request protocol version.
 add c7197b0  Merge pull request #1376, do not instantiate load balance if 
there is no invokers
 add c7170d5  Merge pull request #1384, fix build string bug.
 add b52879c  Merge pull request #1040, refactor: replace some deprecated 
methods related with jedis.
 add 4bbc0dd  Merge pull request #1242, remove redundant null check.
 add d8f3dd3  Change Mailing list address
 add 5d7b316  Fixed #1398, revert bugs introduced from #1375
 add d7a78c3  Fix time unit problem in UT
 add d47d22b  Fix time unit problem related with FutureAdapter in UT
 add 7faa3f0  Merge pull request #1391, fix typo of method name in qos 
module.
 add 84124c4  Merge branch '2.5.x' of https://github.com/alibaba/dubbo
 add 91f9250  fix number type is lost in yaml config file (#1401)
 add

[incubator-dubbo-ops] branch master updated (158ee09 -> a09f3b3)

2018-03-30 Thread huxing

This is an automated email from the ASF dual-hosted git repository.

huxing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git.


from 158ee09  Always check authority
 add cb126ce  add description for how to use it
 new a09f3b3  Add description for how to use it

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md | 21 +
 1 file changed, 21 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
hux...@apache.org.

[incubator-dubbo-ops] 01/01: Add description for how to use it

2018-03-30 Thread huxing

This is an automated email from the ASF dual-hosted git repository.

huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git

commit a09f3b3b8b3948c1201324f81494e653283797e9
Merge: 158ee09 cb126ce
Author: Huxing Zhang 
AuthorDate: Fri Mar 30 15:44:10 2018 +0800

Add description for how to use it

 README.md | 21 +
 1 file changed, 21 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
hux...@apache.org.

[incubator-dubbo] branch 2.5.x updated (1e5b28f -> 4f34540)

[incubator-dubbo] branch 2.5.x updated: Polish alibaba/dubbo#1306

[incubator-dubbo] branch 2.5.x updated (6e38481 -> 4f34540)

[incubator-dubbo] branch 2.5.x updated (4f34540 -> 6e38481)

[incubator-dubbo-ops] branch master updated (158ee09 -> a09f3b3)

[incubator-dubbo-ops] 01/01: Add description for how to use it

6 matches

Site Navigation

Mail list logo

Footer information