[dubbo] branch 3.0 updated: Inefficient Usages of Java Collections (#8784)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 914c377 Inefficient Usages of Java Collections (#8784)
914c377 is described below
commit 914c3777bb4a8b6f7835dc6eb99d3f9dc17f459d
Author: DittoTool <90056662+dittot...@users.noreply.github.com>
AuthorDate: Tue Sep 14 13:58:18 2021 +0800
Inefficient Usages of Java Collections (#8784)
* Transform two LinkedHashMap objs to HashMap objs
* Transform a LinkedHashMap obj to HashMap obj
The map object is actually not used.
* Transform a LinkedHashMap obj to HashMap obj
* Transform a LinkedHashMap obj to HashMap obj
* Transform a LinkedHashSet obj to HashSet obj
* Transform a LinkedHashSet obj to HashSet obj
* Transform a LinkedList obj to ArrayList obj
* Transform an ArrayList obj to HashSet obj
* Transform two ArrayList objs to LinkedList objs
* Transform an ArrayList obj to LinkedList obj
* Fix a compile error
* Update FileSystemDynamicConfiguration.java
* Update FileSystemDynamicConfiguration.java
---
.../rpc/cluster/router/mesh/rule/VsDestinationGroup.java| 6 +++---
.../configcenter/file/FileSystemDynamicConfiguration.java | 5 ++---
.../org/apache/dubbo/common/extension/ExtensionLoader.java | 13 +++--
.../main/java/org/apache/dubbo/common/utils/TypeUtils.java | 3 ++-
.../org/apache/dubbo/config/bootstrap/DubboBootstrap.java | 1 -
.../processing/rest/DefaultServiceRestMetadataResolver.java | 4 ++--
.../src/main/java/org/apache/dubbo/qos/textui/TLadder.java | 4 ++--
.../common/serialize/support/SerializableClassRegistry.java | 4 ++--
.../actuate/endpoint/metadata/DubboReferencesMetadata.java | 5 +++--
.../factory/config/ServiceBeanIdConflictProcessor.java | 4 ++--
10 files changed, 25 insertions(+), 24 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java
index 1d310ee..a5db532 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/mesh/rule/VsDestinationGroup.java
@@ -20,14 +20,14 @@ package org.apache.dubbo.rpc.cluster.router.mesh.rule;
import
org.apache.dubbo.rpc.cluster.router.mesh.rule.destination.DestinationRule;
import
org.apache.dubbo.rpc.cluster.router.mesh.rule.virtualservice.VirtualServiceRule;
-import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
public class VsDestinationGroup {
private String appName;
-private List virtualServiceRuleList = new
ArrayList<>();
-private List destinationRuleList = new ArrayList<>();
+private List virtualServiceRuleList = new
LinkedList<>();
+private List destinationRuleList = new LinkedList<>();
public String getAppName() {
return appName;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
index 2dcf71d..fa7467c 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
@@ -44,7 +44,6 @@ import java.nio.file.WatchService;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -201,7 +200,7 @@ public class FileSystemDynamicConfiguration extends
TreePathDynamicConfiguration
this.rootDirectory = rootDirectory;
this.encoding = encoding;
this.processingDirectories = initProcessingDirectories();
-this.listenersRepository = new LinkedHashMap<>();
+this.listenersRepository = new HashMap<>();
registerDubboShutdownHook();
}
@@ -214,7 +213,7 @@ public class FileSystemDynamicConfiguration extends
TreePathDynamicConfiguration
this.rootDirectory = rootDirectory;
this.encoding = encoding;
this.processingDirectories = initProcessingDirectories();
-this.listenersRepository = new LinkedHashMap<>();
+this.listenersRepository = new HashMap<>();
this.scopeModel = scopeModel;
registerDubboShutdownHook();
}
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoade
[dubbo] branch master updated: fix-#6778. modify the method description, unhealthy -> enable (#6779)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new cd20009 fix-#6778. modify the method description, unhealthy -> enable
(#6779)
cd20009 is described below
commit cd20009336a94963e89d0ec9a713dee68c844699
Author: 赵延 <1060026...@qq.com>
AuthorDate: Mon Sep 28 14:09:19 2020 +0800
fix-#6778. modify the method description, unhealthy -> enable (#6779)
---
.../org/apache/dubbo/registry/nacos/NacosRegistry.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index c34eac8..743551f 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -513,19 +513,19 @@ public class NacosRegistry extends FailbackRegistry {
}
/**
- * Notify the Healthy {@link Instance instances} to subscriber.
+ * Notify the Enabled {@link Instance instances} to subscriber.
*
* @param url {@link URL}
* @param listener {@link NotifyListener}
* @param instances all {@link Instance instances}
*/
private void notifySubscriber(URL url, NotifyListener listener,
Collection instances) {
-List healthyInstances = new LinkedList<>(instances);
-if (healthyInstances.size() > 0) {
-// Healthy Instances
-filterHealthyInstances(healthyInstances);
+List enabledInstances = new LinkedList<>(instances);
+if (enabledInstances.size() > 0) {
+// Instances
+filterEnabledInstances(enabledInstances);
}
-List urls = toUrlWithEmpty(url, healthyInstances);
+List urls = toUrlWithEmpty(url, enabledInstances);
NacosRegistry.this.notify(url, listener, urls);
}
@@ -588,7 +588,7 @@ public class NacosRegistry extends FailbackRegistry {
}
}
-private void filterHealthyInstances(Collection instances) {
+private void filterEnabledInstances(Collection instances) {
filterData(instances, Instance::isEnabled);
}
[dubbo-spring-boot-project] branch 2.7.x updated (0da9e97 -> ec32800)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 0da9e97 2.7.x (#742) add c1ff0a2 Merge to master (#724) add ec32800 Merge branch 'master' into 2.7.x No new revisions were added by this update. Summary of changes: .../config/ServiceBeanIdConflictProcessor.java | 115 + .../servlet-container-samples/pom.xml | 1 + 2 files changed, 116 insertions(+) create mode 100644 dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java
[dubbo-spring-boot-project] tag 2.7.8 created (now 0da9e97)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.8 in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. at 0da9e97 (commit) No new revisions were added by this update.
[dubbo-spring-boot-project] branch 2.7.x updated (2dffff8 -> 0da9e97)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 2d8 2.7.9 Release (#741) add 0da9e97 2.7.x (#742) No new revisions were added by this update. Summary of changes: .../consumer-sample/src/main/resources/application.yml | 6 -- .../provider-sample/src/main/resources/application.properties | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-)
svn commit: r40816 - in /dev/dubbo/dubbo-spring-boot/2.7.8: ./ apache-dubbo-spring-boot-project-2.7.8-source-release.zip apache-dubbo-spring-boot-project-2.7.8-source-release.zip.asc apache-dubbo-spri
Author: mercyblitz Date: Mon Aug 3 03:09:41 2020 New Revision: 40816 Log: Prepare for Dubbo Spring Boot 2.7.8 RC1 Added: dev/dubbo/dubbo-spring-boot/2.7.8/ dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip (with props) dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.asc dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.sha512 Added: dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.asc == --- dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.asc (added) +++ dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.asc Mon Aug 3 03:09:41 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAl8nfrIACgkQp/UI79po +tPXnMg//ZMC1pQwKy4yfOUqmK173v9b/Gf9a9WFAuM6X/RnSUnOqxqwzcYIWs74m +YX121Luk3u0HCwRH1uvmBXGmpEAz5hbuAlBVGBsv++x42o53K7xhLpxyC6z8Ypj3 +JtiaeBj35aYweJypXspamKZFbh0cN6JKK5iAfbS1XzWyAYlz/aehgMu6IwSlUl5A +Ug3Was83BBz7tLdAwhaX/pnJxZZKmINPhjCqfzg1gPQ0FL7pQzUBcDxsV9g65jWI +PqDDLu4+coCdQDZzHk5LBxxcwZW0OfBnz3FTT1Pbr3aVMriGlSGmyI1YNkcaPaPU ++0w9Lz2he52AOw3HIf004/smMBDSveXt5KgRInx4GU27Ahzf6pvA2Ahk5G5R+7x6 +MuDkJR4MP4knUw9HjX4WkXB2iDUWSoLQMGBynjtu/mhjoAhy1WMoWpjkz9Ca7Leh +xxEuHNBwtE0IKpKcZNqWe2M/V726QFz99B/YYIG10K53Pv6CfTS5XAdG2g8HRu1u +Oso7wbbUPaNcf09W+4xWwnw52K+ODEKUYkOpPtidS1K9fH/cKtQqtxsxuQPeb0NS +msyePebeicM5y1DfCRZqEZHb8DWR+Cjh5e9zzilFQWl6G/vb2vX1i4vVd+LfBGvc +qbIznr0jm8yIzdvC4fyPZhe6FW+isFztWuLDHxS0imYVLELctG8= +=dNwo +-END PGP SIGNATURE- Added: dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.sha512 == --- dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.sha512 (added) +++ dev/dubbo/dubbo-spring-boot/2.7.8/apache-dubbo-spring-boot-project-2.7.8-source-release.zip.sha512 Mon Aug 3 03:09:41 2020 @@ -0,0 +1 @@ +7ac6eb7db036a80ad4f8baacaf1d7aa944cf3007074299b8f00dfe5ce8726341f724977ca72166a24d3e0484cde6cbb2b2bfb3da289bfc6e9abb76b7f0ddfc51 apache-dubbo-spring-boot-project-2.7.8-source-release.zip
svn commit: r40814 - in /release/dubbo/2.7.8: ./ apache-dubbo-2.7.8-source-release.zip apache-dubbo-2.7.8-source-release.zip.asc apache-dubbo-2.7.8-source-release.zip.sha512
Author: mercyblitz Date: Mon Aug 3 03:00:25 2020 New Revision: 40814 Log: Apache Dubbo 2.7.8 Added: release/dubbo/2.7.8/ release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip (with props) release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 Added: release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip == Binary file - no diff available. Propchange: release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip -- svn:mime-type = application/octet-stream Added: release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc == --- release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc (added) +++ release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc Mon Aug 3 03:00:25 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAl8VClsACgkQp/UI79po +tPXKyA/+JrBgEC8W9yf9Tb1IxD7PZ80W+dR7mJvbjfGoNRWXfNf3EvFcb9Bc040k +Apj1n5GKCRT41MwHfMJpVgP4Dng7SXnFYsT9C0gCmT0Vn8g/apjCpI15pQEEVMNr +d3QfuhTPx7muTTmIwjg4WyFOIa3hbafl66zZxkA3yttngCDbKscD+fKBoAse8ba/ +DHRYI8po5w8BrZZqNeJF/K0Gi2/AFOQJpMzTC6mOExB4BMS60nktZMHP0bFeTdEs +Vmd8TaQ6epLL+IHuYwG8jkKT0F7zXCgGayenhUb0rYKEyEbFh3AHBql6l8zvfC1Z +CHE4nDOOdYcmQLZx99v6tDXXrAeyrgsr0KnPsl9vLqGU9b0Cx/wE5Ss/FyTi4xve +ghazPcPD3BeQH0aFvXoTd5YLp6Bs24EOMjM2H2UR3SCZoRZH6hj90wuCWlk3B5qW +FGSKDCeX4rUvnf4TLfffd0d1mSw8XNMQ/LcSb+liOm6DvIZbBrwn5M1EFbyV7g/O +akdjpNHXiZwk+a2blJn05/Y7SoEXGreRdejGKtIFnQaGtKDjO1Ff1FXC/aaGexQM +BCunMpLdXul1iFnkegyEoTATo36c+w8/cdfw6cZJYx9/xWzAOFtPxPL4k8j4go0m +Bmj4ugS+ku8Z7HksuXTbwilXrTcu25GcPE8gNl8Ejkd9jCo0KqU= +=fuEv +-END PGP SIGNATURE- Added: release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 == --- release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 (added) +++ release/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 Mon Aug 3 03:00:25 2020 @@ -0,0 +1 @@ +3cb559c507fb72bc15a02b3478b2a3cd80fae75ea8f0d600d3c1150bda87ec1746c96a186a6264ef551a70676f581a1153ccd879d0cc5fbad27799deae5ab32b *apache-dubbo-2.7.8-source-release.zip
[dubbo-spring-boot-project] branch 2.7.x updated: 2.7.9 Release (#741)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/2.7.x by this push: new 2d8 2.7.9 Release (#741) 2d8 is described below commit 2d833da105cb7c265d579a238f0dd5de409f Author: Mercy Ma AuthorDate: Mon Aug 3 10:12:49 2020 +0800 2.7.9 Release (#741) * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#685 : Dubbo2.7.5: Duplicate ServiceBean found * To fix the declaration of years * Polish apache/dubbo-spring-boot-project#733 : Upgrading the dependencies * Polish apache/dubbo-spring-boot-project#734 : [Samples] Upgrading the latest Service-Introspection features * Polish apache/dubbo-spring-boot-project#736 : Duplicate RegistryConfig found, there already has one default RegistryConfig or more than two RegistryConfigs have the same id * Polish apache/dubbo-spring-boot-project#734 : [Samples] Upgrading the latest Service-Introspection features * Revert "Polish apache/dubbo-spring-boot-project#734 : [Samples] Upgrading the latest Service-Introspection features" This reverts commit 3e57fbe9ee87bbcd0de6c39d1f9e0b5ab4fc6f1f. * Polish apache/dubbo-spring-boot-project#736 : Duplicate RegistryConfig found, there already has one default RegistryConfig or more than two RegistryConfigs have the same id * Polish apache/dubbo-spring-boot-project#728 : When openfeign and dubbo coexist, DubboAutoConfiguration.primaryPropertyResolver configuration causes openfeign call to fail * Polish apache/dubbo-spring-boot-project#728 : Refactor * Bugfix test-cases * Bugfix build errors * Bugfix test-cases * Bugfix test-cases --- ...bboEndpointAnnotationAutoConfigurationTest.java | 13 +++ .../boot/actuate/endpoint/DubboEndpointTest.java | 16 +++ .../autoconfigure/DelegatingPropertyResolver.java | 83 -- .../DubboRelaxedBinding2AutoConfiguration.java | 23 +++- .../DubboRelaxedBinding2AutoConfigurationTest.java | 22 ++-- .../AwaitingNonWebApplicationListenerTest.java | 57 -- dubbo-spring-boot-compatible/autoconfigure/pom.xml | 7 ++ .../boot/autoconfigure/DubboAutoConfiguration.java | 105 - .../DubboConfigurationProperties.java | 2 +- .../DubboRelaxedBindingAutoConfiguration.java | 21 +++- .../factory/config/DubboConfigBeanCustomizer.java | 67 --- ...DubboConfigBeanDefinitionConflictProcessor.java | 125 - ...verrideBeanDefinitionRegistryPostProcessor.java | 43 --- .../config/ServiceBeanIdConflictProcessor.java | 115 --- .../DubboApplicationContextInitializer.java| 6 +- .../event/AwaitingNonWebApplicationListener.java | 31 +++-- .../apache/dubbo/spring/boot/util/DubboUtils.java | 18 +++ .../CompatibleDubboAutoConfigurationTest.java | 8 +- ...ubboAutoConfigurationTestWithoutProperties.java | 14 +++ ...DubboAutoConfigurationOnMultipleConfigTest.java | 31 +++-- .../DubboAutoConfigurationOnSingleConfigTest.java | 36 +++--- .../RelaxedDubboConfigBinderTest.java | 13 +++ ...oConfigBeanDefinitionConflictProcessorTest.java | 109 -- .../AwaitingNonWebApplicationListenerTest.java | 45 +--- ...nDefinitionConflictApplicationListenerTest.java | 10 +- ...eDubboConfigApplicationListenerDisableTest.java | 15 ++- ...OverrideDubboConfigApplicationListenerTest.java | 9 ++ dubbo-spring-boot-parent/pom.xml | 6 +- .../nacos-samples/consumer-sample/pom.xml | 6 - .../nacos-samples/provider-sample/pom.xml | 6 - .../src/main/resources/application.yml | 6 +- .../src/main/resources/application.properties | 6 + .../servlet-container-samples/pom.xml | 25 + pom.xml| 2 +- 34 files changed, 330 insertions(+), 771 deletions(-) diff --git a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java index 51f4e03..44e8b4a 100644 --- a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/aut
[dubbo] branch master updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 418e056 Update README.md 418e056 is described below commit 418e056aaa4472b15a087984e3b15af12489f029 Author: Mercy Ma AuthorDate: Tue Jul 28 10:29:43 2020 +0800 Update README.md Update the Dubbo 2.7.8 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78514ef..153121d 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ There's a [README](https://github.com/apache/dubbo-samples/tree/master/java/dubb ```xml -2.7.7 +2.7.8
[dubbo] tag dubbo-2.7.8 created (now 0be2a1b)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag dubbo-2.7.8 in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 0be2a1b (commit) No new revisions were added by this update.
svn commit: r40561 - in /dev/dubbo/dubbo/2.7.8: ./ apache-dubbo-2.7.8-source-release.zip apache-dubbo-2.7.8-source-release.zip.asc apache-dubbo-2.7.8-source-release.zip.sha512
Author: mercyblitz Date: Mon Jul 20 03:12:11 2020 New Revision: 40561 Log: Prepare for Apache Dubbo 2.7.8 RC1 Added: dev/dubbo/dubbo/2.7.8/ dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip (with props) dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 Added: dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc == --- dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc (added) +++ dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.asc Mon Jul 20 03:12:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAl8VClsACgkQp/UI79po +tPXKyA/+JrBgEC8W9yf9Tb1IxD7PZ80W+dR7mJvbjfGoNRWXfNf3EvFcb9Bc040k +Apj1n5GKCRT41MwHfMJpVgP4Dng7SXnFYsT9C0gCmT0Vn8g/apjCpI15pQEEVMNr +d3QfuhTPx7muTTmIwjg4WyFOIa3hbafl66zZxkA3yttngCDbKscD+fKBoAse8ba/ +DHRYI8po5w8BrZZqNeJF/K0Gi2/AFOQJpMzTC6mOExB4BMS60nktZMHP0bFeTdEs +Vmd8TaQ6epLL+IHuYwG8jkKT0F7zXCgGayenhUb0rYKEyEbFh3AHBql6l8zvfC1Z +CHE4nDOOdYcmQLZx99v6tDXXrAeyrgsr0KnPsl9vLqGU9b0Cx/wE5Ss/FyTi4xve +ghazPcPD3BeQH0aFvXoTd5YLp6Bs24EOMjM2H2UR3SCZoRZH6hj90wuCWlk3B5qW +FGSKDCeX4rUvnf4TLfffd0d1mSw8XNMQ/LcSb+liOm6DvIZbBrwn5M1EFbyV7g/O +akdjpNHXiZwk+a2blJn05/Y7SoEXGreRdejGKtIFnQaGtKDjO1Ff1FXC/aaGexQM +BCunMpLdXul1iFnkegyEoTATo36c+w8/cdfw6cZJYx9/xWzAOFtPxPL4k8j4go0m +Bmj4ugS+ku8Z7HksuXTbwilXrTcu25GcPE8gNl8Ejkd9jCo0KqU= +=fuEv +-END PGP SIGNATURE- Added: dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 == --- dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 (added) +++ dev/dubbo/dubbo/2.7.8/apache-dubbo-2.7.8-source-release.zip.sha512 Mon Jul 20 03:12:11 2020 @@ -0,0 +1 @@ +3cb559c507fb72bc15a02b3478b2a3cd80fae75ea8f0d600d3c1150bda87ec1746c96a186a6264ef551a70676f581a1153ccd879d0cc5fbad27799deae5ab32b *apache-dubbo-2.7.8-source-release.zip
[dubbo] branch master updated (8091c02 -> fb57616)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 8091c02 2.7.8 release (#6467) add fb57616 Issue #6476 (#6478) No new revisions were added by this update. Summary of changes: .../dubbo/config/bootstrap/DubboBootstrap.java | 26 +- .../ZookeeperDubboServiceProviderBootstrap.java| 2 +- 2 files changed, 22 insertions(+), 6 deletions(-)
[dubbo] branch 2.7.8-release updated: 2.7.8 release (#6466)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new 292a2c6 2.7.8 release (#6466) 292a2c6 is described below commit 292a2c6e04dd820227ef315b41046df8751cf362 Author: Mercy Ma AuthorDate: Thu Jul 16 01:26:46 2020 +0800 2.7.8 release (#6466) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - Zookeeper
[dubbo] branch 2.7.8-release updated: [Dependency] Upgrade com.alibaba.spring:spring-context-support to be 1.0.8 (#6457)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new 4e32083 [Dependency] Upgrade com.alibaba.spring:spring-context-support to be 1.0.8 (#6457) 4e32083 is described below commit 4e32083df6a353e328318932c871a0c58b48dd50 Author: Mercy Ma AuthorDate: Tue Jul 14 17:34:41 2020 +0800 [Dependency] Upgrade com.alibaba.spring:spring-context-support to be 1.0.8 (#6457) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of Metada
[dubbo] branch 2.7.8-release updated: 2.7.8 Bugfix (#6452)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new 836a0fe 2.7.8 Bugfix (#6452) 836a0fe is described below commit 836a0fe6e892c284601957692769ad599845bef2 Author: Mercy Ma AuthorDate: Mon Jul 13 12:16:00 2020 +0800 2.7.8 Bugfix (#6452) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - Zookeeper
[dubbo] branch 2.7.8-release updated: 2.7.8 release (#6437)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new d55a8d5 2.7.8 release (#6437) d55a8d5 is described below commit d55a8d51fb7cacb92e700f35301262b547fd0674 Author: Mercy Ma AuthorDate: Thu Jul 9 14:09:34 2020 +0800 2.7.8 release (#6437) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - Zookeeper
[dubbo] branch master updated: check invoker available status after proxy created. (#6435)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 58d5e51 check invoker available status after proxy created. (#6435)
58d5e51 is described below
commit 58d5e519af824f7d08dfa5c68e0403546f1fba9f
Author: ken.lj
AuthorDate: Thu Jul 9 11:21:48 2020 +0800
check invoker available status after proxy created. (#6435)
---
.../java/org/apache/dubbo/config/ReferenceConfig.java | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 570f7a4..7bcc6ea 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -303,6 +303,8 @@ public class ReferenceConfig extends
ReferenceConfigBase {
initialized = true;
+checkInvokerAvailable();
+
// dispatch a ReferenceConfigInitializedEvent since 2.7.4
dispatch(new ReferenceConfigInitializedEvent(this, invoker));
}
@@ -377,6 +379,14 @@ public class ReferenceConfig extends
ReferenceConfigBase {
}
}
+if (logger.isInfoEnabled()) {
+logger.info("Refer dubbo service " + interfaceClass.getName() + "
from url " + invoker.getUrl());
+}
+// create service proxy
+return (T) PROXY_FACTORY.getProxy(invoker,
ProtocolUtils.isGeneric(generic));
+}
+
+private void checkInvokerAvailable() throws IllegalStateException {
if (shouldCheck() && !invoker.isAvailable()) {
invoker.destroy();
throw new IllegalStateException("Failed to check the status of the
service "
@@ -390,11 +400,6 @@ public class ReferenceConfig extends
ReferenceConfigBase {
+ " to the consumer "
+ NetUtils.getLocalHost() + " use dubbo version " +
Version.getVersion());
}
-if (logger.isInfoEnabled()) {
-logger.info("Refer dubbo service " + interfaceClass.getName() + "
from url " + invoker.getUrl());
-}
-// create service proxy
-return (T) PROXY_FACTORY.getProxy(invoker,
ProtocolUtils.isGeneric(generic));
}
/**
[dubbo] branch master updated: add @SPI annotation (#6436)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 40d03b0 add @SPI annotation (#6436)
40d03b0 is described below
commit 40d03b081e8a8f74fb5092163e51bdd17842cb5a
Author: ken.lj
AuthorDate: Thu Jul 9 10:42:51 2020 +0800
add @SPI annotation (#6436)
---
.../main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
index 9c8599b..bc0f0b2 100644
---
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
+++
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java
@@ -16,7 +16,10 @@
*/
package com.alibaba.dubbo.common.extension;
+import org.apache.dubbo.common.extension.SPI;
+
@Deprecated
+@SPI
public interface ExtensionFactory extends
org.apache.dubbo.common.extension.ExtensionFactory {
}
[dubbo] tag dubbo-2.7.8 created (now ed9cb95)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag dubbo-2.7.8 in repository https://gitbox.apache.org/repos/asf/dubbo.git. at ed9cb95 (commit) No new revisions were added by this update.
[dubbo] branch master updated: 2.7.8 release (#6430)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new a243906 2.7.8 release (#6430) a243906 is described below commit a243906127849791c8412ac1c136078e76b20279 Author: Mercy Ma AuthorDate: Wed Jul 8 16:38:10 2020 +0800 2.7.8 release (#6430) * Upgrade the release version to be 2.7.8 (#6411) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure
[dubbo] branch 2.7.8-release updated: [2.7.8] Migration the latest Nacos registry implementation to upstream (#6417)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new ed9cb95 [2.7.8] Migration the latest Nacos registry implementation to upstream (#6417) ed9cb95 is described below commit ed9cb9550c96b8878a83b902f6a605f5e4a94ef6 Author: Mercy Ma AuthorDate: Wed Jul 8 14:07:04 2020 +0800 [2.7.8] Migration the latest Nacos registry implementation to upstream (#6417) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of Metada
[dubbo] branch master updated: Update @Service And @Reference with @DubboService and @DubboReference (#6355)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new f798140 Update @Service And @Reference with @DubboService and
@DubboReference (#6355)
f798140 is described below
commit f798140392a32b562fd159fd1762efa628d3304f
Author: Lei Jiang <53557551+lad...@users.noreply.github.com>
AuthorDate: Wed Jul 8 14:01:05 2020 +0800
Update @Service And @Reference with @DubboService and @DubboReference
(#6355)
---
.../org/apache/dubbo/demo/consumer/comp/DemoServiceComponent.java | 4 ++--
.../src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/java/org/apache/dubbo/demo/consumer/comp/DemoServiceComponent.java
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/java/org/apache/dubbo/demo/consumer/comp/DemoServiceComponent.java
index bed7c0d..fbfcd9e 100644
---
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/java/org/apache/dubbo/demo/consumer/comp/DemoServiceComponent.java
+++
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/src/main/java/org/apache/dubbo/demo/consumer/comp/DemoServiceComponent.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.demo.consumer.comp;
-import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.demo.DemoService;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture;
@Component("demoServiceComponent")
public class DemoServiceComponent implements DemoService {
-@Reference
+@DubboReference
private DemoService demoService;
@Override
diff --git
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
index c49920a..5f223ce 100644
---
a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
+++
b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java
@@ -16,7 +16,7 @@
*/
package org.apache.dubbo.demo.provider;
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.demo.DemoService;
import org.apache.dubbo.rpc.RpcContext;
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
import java.util.concurrent.CompletableFuture;
-@Service
+@DubboService
public class DemoServiceImpl implements DemoService {
private static final Logger logger =
LoggerFactory.getLogger(DemoServiceImpl.class);
[dubbo] branch master updated: fix bug: Rest Protocol can't work when use Tomcat as WebContainer (#6402)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 44345d5 fix bug: Rest Protocol can't work when use Tomcat as
WebContainer (#6402)
44345d5 is described below
commit 44345d5d6a49a7996641129bdbbf812c8263411b
Author: 星尘
AuthorDate: Wed Jul 8 11:39:30 2020 +0800
fix bug: Rest Protocol can't work when use Tomcat as WebContainer (#6402)
Co-authored-by: 01376420 <1qaz!QAZ>
---
.../java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java
b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java
index 167653a..954259b 100755
---
a/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java
+++
b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java
@@ -51,14 +51,13 @@ public class TomcatHttpServer extends AbstractHttpServer {
String baseDir = new
File(System.getProperty("java.io.tmpdir")).getAbsolutePath();
tomcat = new Tomcat();
-Connector connector = new
Connector("org.apache.coyote.http11.Http11NioProtocol");
+Connector connector = tomcat.getConnector();
connector.setPort(url.getPort());
connector.setProperty("maxThreads",
String.valueOf(url.getParameter(THREADS_KEY, DEFAULT_THREADS)));
connector.setProperty("maxConnections",
String.valueOf(url.getParameter(ACCEPTS_KEY, -1)));
connector.setProperty("URIEncoding", "UTF-8");
connector.setProperty("connectionTimeout", "6");
connector.setProperty("maxKeepAliveRequests", "-1");
-tomcat.setConnector(connector);
tomcat.setBaseDir(baseDir);
tomcat.setPort(url.getPort());
[dubbo] branch 2.7.8-release updated (6c113a7 -> d2e9baf)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch 2.7.8-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 6c113a7 Upgrade the release version to be 2.7.8 (#6411)
add d2e9baf Hessian2 whitelist (#6378) (#6415)
No new revisions were added by this update.
Summary of changes:
.../dubbo/config/bootstrap/DubboBootstrap.java | 10 ++-
.../spring/context/annotation/EnableDubbo.java | 2 +-
.../context/annotation/EnableDubboConfig.java | 2 +-
dubbo-dependencies-bom/pom.xml | 2 +-
.../serialize/hessian2/Hessian2ObjectInput.java| 3 +-
.../serialize/hessian2/Hessian2ObjectOutput.java | 3 +-
.../hessian2/Hessian2SerializerFactory.java| 4 +-
.../AbstractHessian2FactoryInitializer.java} | 21 +++---
.../DefaultHessian2FactoryInitializer.java}| 17 ++---
.../hessian2/dubbo/Hessian2FactoryInitializer.java | 82 --
.../dubbo/WhitelistHessian2FactoryInitializer.java | 50 +
...alize.hessian2.dubbo.Hessian2FactoryInitializer | 2 +
12 files changed, 128 insertions(+), 70 deletions(-)
copy
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/{Hessian2SerializerFactory.java
=> dubbo/AbstractHessian2FactoryInitializer.java} (61%)
copy
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/{Hessian2SerializerFactory.java
=> dubbo/DefaultHessian2FactoryInitializer.java} (70%)
copy
dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/SpiExtensionFactory.java
=>
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/Hessian2FactoryInitializer.java
(50%)
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/WhitelistHessian2FactoryInitializer.java
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.hessian2.dubbo.Hessian2FactoryInitializer
[dubbo] branch 2.7.8-release updated (6c113a7 -> d2e9baf)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a change to branch 2.7.8-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 6c113a7 Upgrade the release version to be 2.7.8 (#6411)
add d2e9baf Hessian2 whitelist (#6378) (#6415)
No new revisions were added by this update.
Summary of changes:
.../dubbo/config/bootstrap/DubboBootstrap.java | 10 ++-
.../spring/context/annotation/EnableDubbo.java | 2 +-
.../context/annotation/EnableDubboConfig.java | 2 +-
dubbo-dependencies-bom/pom.xml | 2 +-
.../serialize/hessian2/Hessian2ObjectInput.java| 3 +-
.../serialize/hessian2/Hessian2ObjectOutput.java | 3 +-
.../hessian2/Hessian2SerializerFactory.java| 4 +-
.../AbstractHessian2FactoryInitializer.java} | 21 +++---
.../DefaultHessian2FactoryInitializer.java}| 17 ++---
.../hessian2/dubbo/Hessian2FactoryInitializer.java | 82 --
.../dubbo/WhitelistHessian2FactoryInitializer.java | 50 +
...alize.hessian2.dubbo.Hessian2FactoryInitializer | 2 +
12 files changed, 128 insertions(+), 70 deletions(-)
copy
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/{Hessian2SerializerFactory.java
=> dubbo/AbstractHessian2FactoryInitializer.java} (61%)
copy
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/{Hessian2SerializerFactory.java
=> dubbo/DefaultHessian2FactoryInitializer.java} (70%)
copy
dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/SpiExtensionFactory.java
=>
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/Hessian2FactoryInitializer.java
(50%)
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/dubbo/WhitelistHessian2FactoryInitializer.java
create mode 100644
dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.hessian2.dubbo.Hessian2FactoryInitializer
[dubbo] branch 2.7.8-release updated: Upgrade the release version to be 2.7.8 (#6411)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-release by this push: new 6c113a7 Upgrade the release version to be 2.7.8 (#6411) 6c113a7 is described below commit 6c113a7e6af001327d40a356035f408ad84f2a1a Author: Mercy Ma AuthorDate: Fri Jul 3 16:31:09 2020 +0800 Upgrade the release version to be 2.7.8 (#6411) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * 2.7.8 service introspection (#6300) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * 2.7.8 service introspection update (#6308) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * 2.7.8 service introspection (#6317) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure
[dubbo] branch 2.7.x created (now 4aaaea4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 4aaaea4 2.7.8 Rlease (#6398) No new revisions were added by this update.
[dubbo] branch 2.7.8-release created (now 4aaaea4)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.8-release in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 4aaaea4 2.7.8 Rlease (#6398) No new revisions were added by this update.
[dubbo] branch 2.7.8-dev updated: 2.7.8 release (#6407)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-dev in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-dev by this push: new 173df9a 2.7.8 release (#6407) 173df9a is described below commit 173df9a471b08ff0dacd6405c684b751740eeb21 Author: Mercy Ma AuthorDate: Thu Jul 2 17:08:14 2020 +0800 2.7.8 release (#6407) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Correct words * sync wait netty server to finish shutdown (#6281) * Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation of Service Instance registration instead of the event * maybe we can remove null judge in this case (#6321) * update * update * Polish apache/dubbo#6336 : [Refactor] org.apache.dubbo.metadata.ServiceNameMapping * Polish apache/dubbo#6170 : [Feature] Introducing the externalized configuration for ServiceNameMapping * Polish apache/dubbo#6342 : [Enhancement] Introducing the composite ServiceNameMapping * Refactor * fix method name typo in JValidator.java (#6344) * [Dubbo-6340]fix application cannot exit when use consul registry (#6341) * fix application cannot exit when use consul registry * make consul registry suppor ACL (#6313) * make consul registry suppor ACL * Polish apache/dubbo#6172 : [Feature] Adding the "services" attribute methods into @DubboReference * Polish apache/dubbo#6173 : [Feature] Adding the "services" attribute into element * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * fix publish null value when use consul config center (#6351) * fix publish null value when use consul config center * Polish apache/dubbo#6252 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6224 : Filter chain was not invoked with local calls since v2.7.6 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : Adding META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataServiceExporter * fix the priority of ListenableRouter were not effective (#6148) fixes #4822 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * when the url is generic, the log level should be info (#6363) * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring
[dubbo] branch 2.7.8-dev updated: 2.7.8 release (#6403)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.8-dev in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.7.8-dev by this push: new bc48b41 2.7.8 release (#6403) bc48b41 is described below commit bc48b4145d6b796ad938c3099e5b90b02234809e Author: Mercy Ma AuthorDate: Wed Jul 1 15:45:00 2020 +0800 2.7.8 release (#6403) * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection * Polish apache/dubbo#6171 : [Feature] Introducing the composite implementation of MetadataService * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" This reverts commit 91989cae508f8482f31ac335879da4a5975661c8. * Revert the MetadataReport * Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig publish the ServiceDefinition based on the Dubbo Event * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6310 : Refactoring MetadataReport's methods * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6198 : [Issue] Fixing NacosDynamicConfiguration#publishConfig bug * Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of MetadataReport based on The Config-Center infrastructure Deprecated List : - NacosMetadataReport - ZookeeperMetadataReport * Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by TreePathDynamicConfiguration * Polish apache/dubbo#6315 : Reset the config base path to be "metadata" for ConfigCenterBasedMetadataReportFactory * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Bugfix * Polish apache/dubbo#6315 : Correct words * sync wait netty server to finish shutdown (#6281) * Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation of Service Instance registration instead of the event * maybe we can remove null judge in this case (#6321) * update * update * Polish apache/dubbo#6336 : [Refactor] org.apache.dubbo.metadata.ServiceNameMapping * Polish apache/dubbo#6170 : [Feature] Introducing the externalized configuration for ServiceNameMapping * Polish apache/dubbo#6342 : [Enhancement] Introducing the composite ServiceNameMapping * Refactor * fix method name typo in JValidator.java (#6344) * [Dubbo-6340]fix application cannot exit when use consul registry (#6341) * fix application cannot exit when use consul registry * make consul registry suppor ACL (#6313) * make consul registry suppor ACL * Polish apache/dubbo#6172 : [Feature] Adding the "services" attribute methods into @DubboReference * Polish apache/dubbo#6173 : [Feature] Adding the "services" attribute into element * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * Polish apache/dubbo#6346 : [Issue] Merging all subscribied URLs from the multiple services * fix publish null value when use consul config center (#6351) * fix publish null value when use consul config center * Polish apache/dubbo#6252 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6356 & apache/dubbo#6171 * Polish apache/dubbo#6224 : Filter chain was not invoked with local calls since v2.7.6 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * Polish apache/dubbo#6322 : Adding META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataServiceExporter * fix the priority of ListenableRouter were not effective (#6148) fixes #4822 * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring * when the url is generic, the log level should be info (#6363) * Polish apache/dubbo#6322 : [Enhancement] Fix the issues of test-cases after refactoring
[dubbo] branch 2.7.8-dev updated: Fixes the issue of merging code in Github
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new 6ae8c0e Fixes the issue of merging code in Github
6ae8c0e is described below
commit 6ae8c0e037428b272826fa5f9100648b850445d9
Author: mercyblitz
AuthorDate: Tue Jun 30 14:11:25 2020 +0800
Fixes the issue of merging code in Github
---
.../src/main/java/org/apache/dubbo/config/context/ConfigManager.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 4bc1660..868fadc 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -522,9 +522,4 @@ public class ConfigManager extends LifecycleAdapter
implements FrameworkExt {
.filter(ConfigManager::isDefaultConfig)
.collect(Collectors.toList());
}
-
-@Override
-public void destroy() throws IllegalStateException {
-clear();
-}
}
[dubbo] branch 2.7.8-dev updated: 2.7.8 Test Cases (#6384)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new 11b2f35 2.7.8 Test Cases (#6384)
11b2f35 is described below
commit 11b2f3530e9f3e79b26f7e35b2f54a07091dd12c
Author: Mercy Ma
AuthorDate: Mon Jun 29 17:49:09 2020 +0800
2.7.8 Test Cases (#6384)
* Polish apache/dubbo#6152
* Polish apache/dubbo#6174 : [Enhancement] Registering the common beans for
Spring XML meta-configuration
* Polish apache/dubbo#6174 : Fixing the test-cases
* Polish apache/dubbo#6174 : Fixing the test-cases
* Add the test-case for multiple services with MethodConfigs
---
.../apache/dubbo/config/context/ConfigManager.java | 5 +++
.../schema/AnnotationBeanDefinitionParser.java | 10 +++--
.../spring/schema/DubboBeanDefinitionParser.java | 45 --
.../ReferenceAnnotationBeanPostProcessorTest.java | 13 +++
.../annotation/ReferenceBeanBuilderTest.java | 11 ++
.../ServiceAnnotationBeanPostProcessorTest.java| 13 +++
.../annotation/ServiceClassPostProcessorTest.java | 13 +++
.../MultipleServicesWithMethodConfigsTest.java}| 30 ++-
.../properties/DefaultDubboConfigBinderTest.java | 13 +++
.../config/spring/schema/GenericServiceTest.java | 13 +++
.../spring/multiple-services-with-methods.xml | 45 ++
11 files changed, 168 insertions(+), 43 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 4545221..07647bf 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -522,4 +522,9 @@ public class ConfigManager extends LifecycleAdapter
implements FrameworkExt {
.filter(ConfigManager::isDefaultConfig)
.collect(Collectors.toList());
}
+
+@Override
+public void destroy() throws IllegalStateException {
+clear();
+}
}
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java
index bcc16bf..05d9027 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java
@@ -25,7 +25,6 @@ import
org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import static
org.apache.dubbo.config.spring.util.DubboBeanUtils.registerCommonBeans;
import static
org.springframework.util.StringUtils.commaDelimitedListToStringArray;
import static org.springframework.util.StringUtils.trimArrayElements;
@@ -58,8 +57,13 @@ public class AnnotationBeanDefinitionParser extends
AbstractSingleBeanDefinition
builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-// @since 2.7.6 Register the common beans
-registerCommonBeans(parserContext.getRegistry());
+/**
+ * @since 2.7.6 Register the common beans
+ * @since 2.7.8 comment this code line, and migrated to
+ * @see DubboNamespaceHandler#parse(Element, ParserContext)
+ * @see https://github.com/apache/dubbo/issues/6174
+ */
+// registerCommonBeans(parserContext.getRegistry());
}
@Override
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 31b299a..084479a 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -29,14 +29,13 @@ import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
-import
org.apache.dubbo.config.spring.beans.factory.annotation.DubboConfigAliasPostProcessor;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import
[dubbo] branch master updated: fix #6306. support TypeBuilder sort (#6365)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 80acc24 fix #6306. support TypeBuilder sort (#6365)
80acc24 is described below
commit 80acc241da3dd50f4eb66cc1b8ae7e2a88d9fe2c
Author: cvictory
AuthorDate: Mon Jun 29 14:42:23 2020 +0800
fix #6306. support TypeBuilder sort (#6365)
* fix #6306. support TypeBuilder sort
* fix #6306. support TypeBuilder sort
* fix #6306. support TypeBuilder sort
* remove unused import
* add license for test file
---
.../metadata/definition/TypeDefinitionBuilder.java | 10 +++
.../metadata/definition/builder/TypeBuilder.java | 3 ++-
.../metadata/definition/Test3TypeBuilder.java} | 30 +++--
.../metadata/definition/TestTypeBuilder.java} | 30 +++--
.../definition/TypeDefinitionBuilderTest.java} | 31 +-
...e.dubbo.metadata.definition.builder.TypeBuilder | 2 ++
6 files changed, 52 insertions(+), 54 deletions(-)
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
index d1275e7..fe99d2e 100755
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/TypeDefinitionBuilder.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static org.apache.dubbo.common.utils.ClassUtils.isSimpleType;
@@ -36,15 +37,12 @@ import static
org.apache.dubbo.common.utils.ClassUtils.isSimpleType;
*/
public class TypeDefinitionBuilder {
private static final Logger logger =
LoggerFactory.getLogger(TypeDefinitionBuilder.class);
-private static final List BUILDERS;
+static final List BUILDERS;
static {
-List builders = new ArrayList<>();
ExtensionLoader extensionLoader =
ExtensionLoader.getExtensionLoader(TypeBuilder.class);
-for (String extensionName : extensionLoader.getSupportedExtensions()) {
-builders.add(extensionLoader.getExtension(extensionName));
-}
-BUILDERS = builders;
+Set tbs =
extensionLoader.getSupportedExtensionInstances();
+BUILDERS = new ArrayList<>(tbs);
}
public static TypeDefinition build(Type type, Class clazz,
Map, TypeDefinition> typeCache) {
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
index d7022bd..57673fe 100755
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.metadata.definition.builder;
import org.apache.dubbo.common.extension.SPI;
+import org.apache.dubbo.common.lang.Prioritized;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;
import java.lang.reflect.Type;
@@ -26,7 +27,7 @@ import java.util.Map;
* 2015/1/27.
*/
@SPI
-public interface TypeBuilder {
+public interface TypeBuilder extends Prioritized {
/**
* Whether the build accept the type or class passed in.
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/definition/Test3TypeBuilder.java
old mode 100755
new mode 100644
similarity index 63%
copy from
dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
copy to
dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/definition/Test3TypeBuilder.java
index d7022bd..075a69e
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/definition/builder/TypeBuilder.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/test/java/org/apache/dubbo/metadata/definition/Test3TypeBuilder.java
@@ -14,28 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.metadata.definition.builder;
+package org.apache.dubbo.metadata.definition;
-import org.apache.dubbo.common.extension.SPI;
+import org.apache.dubbo.metadata.definition.builder.TypeBuilder;
import org.apache.dubbo.metadata.definition.model.TypeDefini
[dubbo] branch master updated (b8b42b1 -> 6478ac9)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from b8b42b1 fix the priority of ListenableRouter were not effective (#6148) add 6478ac9 when the url is generic, the log level should be info (#6363) No new revisions were added by this update. Summary of changes: .../apache/dubbo/metadata/store/InMemoryWritableMetadataService.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[dubbo] branch 2.7.8-dev updated: 2.7.8 service introspection (#6337)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new e65f81f 2.7.8 service introspection (#6337)
e65f81f is described below
commit e65f81f26da226fd352daff4feac38a82b873e09
Author: Mercy Ma
AuthorDate: Wed Jun 17 11:02:48 2020 +0800
2.7.8 service introspection (#6337)
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6171 : [Feature] Introducing the composite
implementation of MetadataService
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert the MetadataReport
* Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig
publish the ServiceDefinition based on the Dubbo Event
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6310 : Refactoring MetadataReport's methods
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6198 : [Issue] Fixing
NacosDynamicConfiguration#publishConfig bug
* Polish apache/dubbo#6315 : [Refactor] Refactoring the implementation of
MetadataReport based on The Config-Center infrastructure
Deprecated List :
- NacosMetadataReport
- ZookeeperMetadataReport
* Polish apache/dubbo#6315 : Refactoring by TreePathDynamicConfiguration
* Polish apache/dubbo#6315 : Refactoring ConsulDynamicConfiguration by
TreePathDynamicConfiguration
* Polish apache/dubbo#6315 : Reset the config base path to be "metadata"
for ConfigCenterBasedMetadataReportFactory
* Polish apache/dubbo#6315 : Bugfix
* Polish apache/dubbo#6315 : Bugfix
* Polish apache/dubbo#6315 : Correct words
* Polish apache/dubbo#6333 : [Refactor] Using mandatory implementation of
Service Instance registration instead of the event
* Polish apache/dubbo#6336 : [Refactor]
org.apache.dubbo.metadata.ServiceNameMapping
---
.../dubbo/config/bootstrap/DubboBootstrap.java | 29
.../event/listener/ServiceNameMappingListener.java | 8 +-
.../DynamicConfigurationServiceNameMapping.java| 18 +++--
.../apache/dubbo/metadata/ServiceNameMapping.java | 31 +++---
...DynamicConfigurationServiceNameMappingTest.java | 25 ++---
.../CustomizableServiceInstanceListener.java | 2 ++
.../metadata/ServiceInstanceMetadataUtils.java | 4 +--
.../internal/org.apache.dubbo.event.EventListener | 5 +++-
8 files changed, 104 insertions(+), 18 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index 16d331c..863e834 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -66,6 +66,7 @@ import
org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceDiscovery;
import org.apache.dubbo.registry.client.ServiceDiscoveryRegistry;
import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
import org.apache.dubbo.registry.support.AbstractRegistryFactory;
import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -1085,9 +1086,37 @@ public class DubboBootstrap extends GenericEventListener
{
ServiceInstance serviceInstance = createServiceInstance(serviceName,
host, port);
+preRegisterServiceInstance(serviceInstance);
+
getServiceDiscoveries().forEach(serviceDiscovery ->
serviceDiscovery.register(serviceInstance));
}
+/**
+ * Pre-register {@link ServiceInstance the service instance}
+ *
+ * @param serviceInstance {@link ServiceInstance the service instance}
+ * @since 2.7.8
+ */
+private void preRegisterServiceInstance(ServiceInstance serviceInstance) {
+customizeServiceInstance(serviceInstance);
+}
+
+/**
+ * Customize {@link ServiceInstance the service instance}
+
[dubbo] branch 2.7.8-dev updated: 2.7.8 service introspection update (#6308)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new 2a0d015 2.7.8 service introspection update (#6308)
2a0d015 is described below
commit 2a0d015ac220a1e869c8aaf44aebdcef624e193f
Author: Mercy Ma
AuthorDate: Thu Jun 11 17:16:00 2020 +0800
2.7.8 service introspection update (#6308)
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6171 : [Feature] Introducing the composite
implementation of MetadataService
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
* Revert the MetadataReport
* Polish apache/dubbo#6305 : [Refactor] ServiceConfig and ReferenceConfig
publish the ServiceDefinition based on the Dubbo Event
---
.../org/apache/dubbo/config/ReferenceConfig.java | 21 +-
.../org/apache/dubbo/config/ServiceConfig.java | 16 -
.../PublishingServiceDefinitionListener.java | 74 ++
.../dubbo/config/utils/ConfigValidationUtils.java | 5 +-
.../internal/org.apache.dubbo.event.EventListener | 4 +-
.../DynamicConfigurationServiceNameMapping.java| 5 +-
6 files changed, 85 insertions(+), 40 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 138a68e..f03d49f 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -34,7 +34,6 @@ import
org.apache.dubbo.config.event.ReferenceConfigInitializedEvent;
import org.apache.dubbo.config.utils.ConfigValidationUtils;
import org.apache.dubbo.event.Event;
import org.apache.dubbo.event.EventDispatcher;
-import org.apache.dubbo.metadata.WritableMetadataService;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.ProxyFactory;
@@ -62,20 +61,16 @@ import static
org.apache.dubbo.common.constants.CommonConstants.ANY_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.CLUSTER_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.COMMA_SEPARATOR;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
-import static
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_METADATA_STORAGE_TYPE;
import static org.apache.dubbo.common.constants.CommonConstants.INTERFACE_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.LOCALHOST_VALUE;
-import static org.apache.dubbo.common.constants.CommonConstants.METADATA_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.METHODS_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.MONITOR_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.PROXY_CLASS_REF;
-import static
org.apache.dubbo.common.constants.CommonConstants.REMOTE_METADATA_STORAGE_TYPE;
import static org.apache.dubbo.common.constants.CommonConstants.REVISION_KEY;
import static
org.apache.dubbo.common.constants.CommonConstants.SEMICOLON_SPLIT_PATTERN;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.utils.NetUtils.isInvalidLocalHost;
import static org.apache.dubbo.config.Constants.DUBBO_IP_TO_REGISTRY;
-import static org.apache.dubbo.registry.Constants.CONSUMER_PROTOCOL;
import static org.apache.dubbo.registry.Constants.REGISTER_IP_KEY;
import static org.apache.dubbo.rpc.Constants.LOCAL_PROTOCOL;
import static org.apache.dubbo.rpc.cluster.Constants.REFER_KEY;
@@ -221,10 +216,6 @@ public class ReferenceConfig extends
ReferenceConfigBase {
// appendParameters(map, consumer, Constants.DEFAULT_KEY);
AbstractConfig.appendParameters(map, consumer);
AbstractConfig.appendParameters(map, this);
-MetadataReportConfig metadataReportConfig = getMetadataReportConfig();
-if (metadataReportConfig != null && metadataReportConfig.isValid()) {
-map.putIfAbsent(METADATA_KEY, REMOTE_METADATA_STORAGE_TYPE);
-}
Map attributes = null;
if (CollectionUtils.isNotEmpty(getMethods())) {
attributes =
[dubbo] 02/03: Merge branch 'master' of github.com:apache/dubbo
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git commit e400898e601c6fb86fd01ccf832d8a4f0661a515 Merge: c39eeb5 450c7cd Author: mercyblitz AuthorDate: Wed Jun 10 17:29:37 2020 +0800 Merge branch 'master' of github.com:apache/dubbo .../dubbo/metadata/report/MetadataReport.java | 53 ++ 1 file changed, 53 insertions(+)
[dubbo] branch master updated (450c7cd -> 0743042)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 450c7cd Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" new c39eeb5 Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)" new e400898 Merge branch 'master' of github.com:apache/dubbo new 0743042 Revert the MetadataReport The 3 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: .../dubbo/metadata/report/MetadataReport.java | 61 ++ 1 file changed, 4 insertions(+), 57 deletions(-)
[dubbo] 03/03: Revert the MetadataReport
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 074304237e9b166270c6a4e8efcde45b430b43ec
Author: mercyblitz
AuthorDate: Wed Jun 10 17:30:14 2020 +0800
Revert the MetadataReport
---
.../dubbo/metadata/report/MetadataReport.java | 61 ++
1 file changed, 4 insertions(+), 57 deletions(-)
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
index 35fa401..e5fc587 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
@@ -17,21 +17,16 @@
package org.apache.dubbo.metadata.report;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.metadata.URLRevisionResolver;
import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
import
org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.apache.dubbo.rpc.model.ApplicationModel.getName;
-
/**
*
*/
@@ -52,52 +47,4 @@ public interface MetadataReport {
List getSubscribedURLs(SubscriberMetadataIdentifier
subscriberMetadataIdentifier);
String getServiceDefinition(MetadataIdentifier metadataIdentifier);
-
-/**
- * Save the exported {@link URL urls} in bulk.
- *
- * @param exportedURLs the exported {@link URL urls}
- * @return If successful, return true, or false
- * @since 2.7.8
- */
-default boolean saveExportedURLs(Collection exportedURLs) {
-return saveExportedURLs(getName(), exportedURLs);
-}
-
-/**
- * Save the exported {@link URL urls} in bulk.
- *
- * @param serviceName the specified Dubbo service name
- * @param exportedURLs the exported {@link URL urls}
- * @return If successful, return true, or false
- * @since 2.7.8
- */
-default boolean saveExportedURLs(String serviceName, Collection
exportedURLs) {
-return saveExportedURLs(serviceName, new
URLRevisionResolver().resolve(exportedURLs), exportedURLs);
-}
-
-/**
- * Save the exported {@link URL urls} in bulk.
- *
- * @param serviceName the specified Dubbo service name
- * @param exportedServicesRevision the revision of the exported Services
- * @param exportedURLs the exported {@link URL urls}
- * @return If successful, return true, or false
- * @since 2.7.8
- */
-default boolean saveExportedURLs(String serviceName, String
exportedServicesRevision, Collection exportedURLs) {
-return true;
-}
-
-/**
- * Get the {@link URL#toFullString() strings} presenting the {@link URL
URLs} that were exported by the provider
- *
- * @param serviceName the specified Dubbo service name
- * @param exportedServicesRevision the revision of the exported Services
- * @return non-null
- * @since 2.7.8
- */
-default List getExportedURLs(String serviceName, String
exportedServicesRevision) {
-return Collections.emptyList();
-}
}
[dubbo] 01/03: Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)"
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit c39eeb57aef6d2cb046a031a47dbd37e43b4b056
Author: mercyblitz
AuthorDate: Wed Jun 10 17:29:01 2020 +0800
Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
---
.../java/org/apache/dubbo/config/utils/ConfigValidationUtils.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
index f9b0e35..ba8b9a7 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
@@ -297,6 +297,7 @@ public class ConfigValidationUtils {
checkExtension(ProxyFactory.class, PROXY_KEY, config.getProxy());
checkExtension(Cluster.class, CLUSTER_KEY, config.getCluster());
checkMultiExtension(Filter.class, FILE_KEY, config.getFilter());
+checkMultiExtension(InvokerListener.class, LISTENER_KEY,
config.getListener());
checkNameHasSymbol(LAYER_KEY, config.getLayer());
List methods = config.getMethods();
@@ -311,7 +312,7 @@ public class ConfigValidationUtils {
checkName(TOKEN_KEY, config.getToken());
checkPathName(PATH_KEY, config.getPath());
-checkMultiExtension(ExporterListener.class, LISTENER_KEY,
config.getListener());
+checkMultiExtension(ExporterListener.class, "listener",
config.getListener());
validateAbstractInterfaceConfig(config);
@@ -336,7 +337,7 @@ public class ConfigValidationUtils {
}
public static void validateReferenceConfig(ReferenceConfig config) {
-checkMultiExtension(InvokerListener.class, LISTENER_KEY,
config.getListener());
+checkMultiExtension(InvokerListener.class, "listener",
config.getListener());
checkKey(VERSION_KEY, config.getVersion());
checkKey(GROUP_KEY, config.getGroup());
checkName(CLIENT_KEY, config.getClient());
[dubbo] branch master updated: Revert "fix wrong check of InvokerListener when export a service (fix issue_6269) (#6271)"
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 450c7cd Revert "fix wrong check of InvokerListener when export a
service (fix issue_6269) (#6271)"
450c7cd is described below
commit 450c7cd33f86c482e2fb8402d436673c9b814f2b
Author: mercyblitz
AuthorDate: Wed Jun 10 16:30:31 2020 +0800
Revert "fix wrong check of InvokerListener when export a service (fix
issue_6269) (#6271)"
This reverts commit 91989cae508f8482f31ac335879da4a5975661c8.
---
.../java/org/apache/dubbo/config/utils/ConfigValidationUtils.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
index f9b0e35..ba8b9a7 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
@@ -297,6 +297,7 @@ public class ConfigValidationUtils {
checkExtension(ProxyFactory.class, PROXY_KEY, config.getProxy());
checkExtension(Cluster.class, CLUSTER_KEY, config.getCluster());
checkMultiExtension(Filter.class, FILE_KEY, config.getFilter());
+checkMultiExtension(InvokerListener.class, LISTENER_KEY,
config.getListener());
checkNameHasSymbol(LAYER_KEY, config.getLayer());
List methods = config.getMethods();
@@ -311,7 +312,7 @@ public class ConfigValidationUtils {
checkName(TOKEN_KEY, config.getToken());
checkPathName(PATH_KEY, config.getPath());
-checkMultiExtension(ExporterListener.class, LISTENER_KEY,
config.getListener());
+checkMultiExtension(ExporterListener.class, "listener",
config.getListener());
validateAbstractInterfaceConfig(config);
@@ -336,7 +337,7 @@ public class ConfigValidationUtils {
}
public static void validateReferenceConfig(ReferenceConfig config) {
-checkMultiExtension(InvokerListener.class, LISTENER_KEY,
config.getListener());
+checkMultiExtension(InvokerListener.class, "listener",
config.getListener());
checkKey(VERSION_KEY, config.getVersion());
checkKey(GROUP_KEY, config.getGroup());
checkName(CLIENT_KEY, config.getClient());
[dubbo] branch 2.7.8-dev updated: 2.7.8 service introspection (#6300)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.8-dev
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.7.8-dev by this push:
new b086a95 2.7.8 service introspection (#6300)
b086a95 is described below
commit b086a95419e5aa1e0c072a07aa816c3f48a9659d
Author: Mercy Ma
AuthorDate: Wed Jun 10 16:28:10 2020 +0800
2.7.8 service introspection (#6300)
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection
* Polish apache/dubbo#6171 : [Feature] Introducing the composite
implementation of MetadataService
---
.../java/org/apache/dubbo/event/EventListener.java | 2 +-
.../dubbo/config/bootstrap/DubboBootstrap.java | 126
.../ZookeeperDubboServiceConsumerBootstrap.java| 6 +-
.../ZookeeperDubboServiceProviderBootstrap.java| 6 +-
.../apache/dubbo/metadata/MetadataConstants.java | 25 ++-
.../org/apache/dubbo/metadata/MetadataService.java | 7 +-
.../org/apache/dubbo/metadata/MetadataUtil.java| 49 -
.../dubbo}/metadata/URLRevisionResolver.java | 69 +--
.../dubbo/metadata/WritableMetadataService.java| 18 +-
.../dubbo/metadata/report/MetadataReport.java | 18 +-
.../AbstractAbstractWritableMetadataService.java | 71 +++
.../store/BaseWritableMetadataService.java | 73 ---
.../store/InMemoryWritableMetadataService.java | 62 +++---
.../store/RemoteWritableMetadataService.java | 125 +++-
.../RemoteWritableMetadataServiceDelegate.java | 100 --
...g.apache.dubbo.metadata.WritableMetadataService | 2 +-
.../dubbo}/metadata/URLRevisionResolverTest.java | 17 +-
.../store/InMemoryWritableMetadataServiceTest.java | 20 +-
.../store/RemoteWritableMeatadataServiceTest.java | 12 +-
.../RemoteWritableMetadataServiceDelegateTest.java | 216 -
.../store/zookeeper/ZookeeperMetadataReport.java | 32 +++
.../dubbo/registry/client/ServiceInstance.java | 22 +++
.../listener/PublishingRemoteMetadataListener.java | 64 ++
...ExportedServicesRevisionMetadataCustomizer.java | 1 +
.../metadata/RefreshServiceMetadataCustomizer.java | 47 -
.../StandardMetadataServiceURLBuilder.java | 1 +
...bscribedServicesRevisionMetadataCustomizer.java | 1 +
.../proxy/BaseMetadataServiceProxyFactory.java | 3 +
.../metadata/proxy/RemoteMetadataServiceProxy.java | 52 +++--
.../internal/org.apache.dubbo.event.EventListener | 4 +-
...dubbo.registry.client.ServiceInstanceCustomizer | 3 +-
31 files changed, 518 insertions(+), 736 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java
b/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java
index 06c6f6a..bb36c77 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/event/EventListener.java
@@ -56,7 +56,7 @@ public interface EventListener extends
java.util.EventListener,
* The comparison rule , refer to {@link #compareTo}.
*/
default int getPriority() {
-return MIN_PRIORITY;
+return NORMAL_PRIORITY;
}
/**
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index cd92fe5..16d331c 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -101,9 +101,9 @@ import static
org.apache.dubbo.remoting.Constants.CLIENT_KEY;
/**
* See {@link ApplicationModel} and {@link ExtensionLoader} for why this class
is designed to be singleton.
- *
+ *
* The bootstrap class of Dubbo
- *
+ *
* Get singleton instance by calling static method {@link #getInstance()}.
* Designed as singleton because some classes inside Dubbo, such as
ExtensionLoader, are designed only for one instance per process.
*
@@ -509,12 +509,13 @@ public class DubboBootstrap extends GenericEventListener {
startConfigCenter();
-useRegistryAsConfigCenterIfNecessary();
-
loadRemoteConfigs();
checkGlobalConfigs();
+// @since 2.7.8
+startMetadataCenter();
+
initMetadataService();
initEventListener();
@@ -583,6 +584,9 @@ public class DubboBootstrap extends GenericEventListener {
}
private void startConfigCenter() {
+
+useRegistryAsConfigCenterIfNecessary();
+
Collection configCenters
[dubbo] branch 2.7.8-dev created (now 951955a)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.8-dev in repository https://gitbox.apache.org/repos/asf/dubbo.git. at 951955a Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection (#6299) No new revisions were added by this update.
[dubbo] branch master updated: Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to manipulate the exported URLs for service introspection (#6299)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 951955a Polish apache/dubbo#6296 : Adding the new methods into
MetadataReport to manipulate the exported URLs for service introspection (#6299)
951955a is described below
commit 951955ad51c602a51b4ac6ada7344eef9ee1c195
Author: Mercy Ma
AuthorDate: Wed Jun 10 14:59:01 2020 +0800
Polish apache/dubbo#6296 : Adding the new methods into MetadataReport to
manipulate the exported URLs for service introspection (#6299)
---
.../dubbo/metadata/report/MetadataReport.java | 53 ++
1 file changed, 53 insertions(+)
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
index 90ca45a..35fa401 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReport.java
@@ -18,15 +18,20 @@ package org.apache.dubbo.metadata.report;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.metadata.URLRevisionResolver;
import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
import
org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import static org.apache.dubbo.rpc.model.ApplicationModel.getName;
+
/**
*
*/
@@ -47,4 +52,52 @@ public interface MetadataReport {
List getSubscribedURLs(SubscriberMetadataIdentifier
subscriberMetadataIdentifier);
String getServiceDefinition(MetadataIdentifier metadataIdentifier);
+
+/**
+ * Save the exported {@link URL urls} in bulk.
+ *
+ * @param exportedURLs the exported {@link URL urls}
+ * @return If successful, return true, or false
+ * @since 2.7.8
+ */
+default boolean saveExportedURLs(Collection exportedURLs) {
+return saveExportedURLs(getName(), exportedURLs);
+}
+
+/**
+ * Save the exported {@link URL urls} in bulk.
+ *
+ * @param serviceName the specified Dubbo service name
+ * @param exportedURLs the exported {@link URL urls}
+ * @return If successful, return true, or false
+ * @since 2.7.8
+ */
+default boolean saveExportedURLs(String serviceName, Collection
exportedURLs) {
+return saveExportedURLs(serviceName, new
URLRevisionResolver().resolve(exportedURLs), exportedURLs);
+}
+
+/**
+ * Save the exported {@link URL urls} in bulk.
+ *
+ * @param serviceName the specified Dubbo service name
+ * @param exportedServicesRevision the revision of the exported Services
+ * @param exportedURLs the exported {@link URL urls}
+ * @return If successful, return true, or false
+ * @since 2.7.8
+ */
+default boolean saveExportedURLs(String serviceName, String
exportedServicesRevision, Collection exportedURLs) {
+return true;
+}
+
+/**
+ * Get the {@link URL#toFullString() strings} presenting the {@link URL
URLs} that were exported by the provider
+ *
+ * @param serviceName the specified Dubbo service name
+ * @param exportedServicesRevision the revision of the exported Services
+ * @return non-null
+ * @since 2.7.8
+ */
+default List getExportedURLs(String serviceName, String
exportedServicesRevision) {
+return Collections.emptyList();
+}
}
[dubbo] branch master updated: Polish apache/dubbo#6275 : DubboNamespaceHandler 注册监听方法 registerApplicationListeners (#6288)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 27aac3a Polish apache/dubbo#6275 : DubboNamespaceHandler 注册监听方法
registerApplicationListeners (#6288)
27aac3a is described below
commit 27aac3a0528d5afd787c4fc066594ebd8894b27b
Author: Mercy Ma
AuthorDate: Mon Jun 8 14:40:28 2020 +0800
Polish apache/dubbo#6275 : DubboNamespaceHandler 注册监听方法
registerApplicationListeners (#6288)
---
.../spring/schema/DubboNamespaceHandler.java | 25 ++
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
index 924d70a..a747e00 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandler.java
@@ -31,19 +31,15 @@ import org.apache.dubbo.config.spring.ConfigCenterBean;
import org.apache.dubbo.config.spring.ReferenceBean;
import org.apache.dubbo.config.spring.ServiceBean;
import
org.apache.dubbo.config.spring.beans.factory.config.ConfigurableSourceBeanMetadataElement;
-import
org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener;
-import
org.apache.dubbo.config.spring.context.DubboLifecycleComponentApplicationListener;
-import com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.AnnotationConfigUtils;
import org.w3c.dom.Element;
-import static
com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static
org.apache.dubbo.config.spring.util.DubboBeanUtils.registerCommonBeans;
/**
* DubboNamespaceHandler
@@ -86,26 +82,17 @@ public class DubboNamespaceHandler extends
NamespaceHandlerSupport implements Co
public BeanDefinition parse(Element element, ParserContext parserContext) {
BeanDefinitionRegistry registry = parserContext.getRegistry();
registerAnnotationConfigProcessors(registry);
-registerApplicationListeners(registry);
+/**
+ * @since 2.7.8
+ * issue : https://github.com/apache/dubbo/issues/6275
+ */
+registerCommonBeans(registry);
BeanDefinition beanDefinition = super.parse(element, parserContext);
setSource(beanDefinition);
return beanDefinition;
}
/**
- * Register {@link ApplicationListener ApplicationListeners} as a Spring
Bean
- *
- * @param registry {@link BeanDefinitionRegistry}
- * @see ApplicationListener
- * @see
AnnotatedBeanDefinitionRegistryUtils#registerBeans(BeanDefinitionRegistry,
Class[])
- * @since 2.7.5
- */
-private void registerApplicationListeners(BeanDefinitionRegistry registry)
{
-registerBeans(registry,
DubboLifecycleComponentApplicationListener.class);
-registerBeans(registry, DubboBootstrapApplicationListener.class);
-}
-
-/**
* Register the processors for the Spring Annotation-Driven features
*
* @param registry {@link BeanDefinitionRegistry}
[dubbo] branch master updated: add visual-studio-code ignore (#6221) (#6287)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new e4c7330 add visual-studio-code ignore (#6221) (#6287) e4c7330 is described below commit e4c7330d9834f48351963b92fa2257796140f2b3 Author: Mercy Ma AuthorDate: Mon Jun 8 11:02:41 2020 +0800 add visual-studio-code ignore (#6221) (#6287) (cherry picked from commit 83afabeda133a4cac2e4e0a55c8b4d69b2b9f4aa) Co-authored-by: oaoit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 15002c4..47be2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ target/ *.iml *.iws +# visual-studio-code ignore +.vscode/ + # temp ignore *.log *.cache
[dubbo] branch master updated (5ba121d -> da6c3eb)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 5ba121d Revert "add visual-studio-code ignore (#6221)" add da6c3eb Revert "Polish apache/dubbo#6261 : Migration the latest Nacos registry implementation to upstream" No new revisions were added by this update. Summary of changes: .../dubbo/registry/nacos/NacosServiceName.java | 4 +- .../nacos/util/NacosNamingServiceUtils.java| 105 + 2 files changed, 47 insertions(+), 62 deletions(-)
[dubbo] branch master updated: Revert "add visual-studio-code ignore (#6221)"
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 5ba121d Revert "add visual-studio-code ignore (#6221)" 5ba121d is described below commit 5ba121de082c84bb413c70cf672b31f9b2114b88 Author: mercyblitz AuthorDate: Thu Jun 4 16:31:37 2020 +0800 Revert "add visual-studio-code ignore (#6221)" This reverts commit 83afabeda133a4cac2e4e0a55c8b4d69b2b9f4aa. --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47be2ad..15002c4 100644 --- a/.gitignore +++ b/.gitignore @@ -19,9 +19,6 @@ target/ *.iml *.iws -# visual-studio-code ignore -.vscode/ - # temp ignore *.log *.cache
[dubbo] branch master updated: Polish apache/dubbo#6261 : Migration the latest Nacos registry implementation to upstream
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 3ceb4a4 Polish apache/dubbo#6261 : Migration the latest Nacos
registry implementation to upstream
3ceb4a4 is described below
commit 3ceb4a4ea452ac78eacaa91c01d8c21372e9d10b
Author: mercyblitz
AuthorDate: Thu Jun 4 15:28:45 2020 +0800
Polish apache/dubbo#6261 : Migration the latest Nacos registry
implementation to upstream
---
.../dubbo/registry/nacos/NacosServiceName.java | 4 +-
.../nacos/util/NacosNamingServiceUtils.java| 105 -
2 files changed, 62 insertions(+), 47 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
index 27c45ee..39603ef 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosServiceName.java
@@ -85,8 +85,8 @@ public class NacosServiceName {
/**
* Build an instance of {@link NacosServiceName}
*
- * @param url
- * @return
+ * @param url {@link URL}
+ * @return {@link NacosServiceName} instance
*/
public static NacosServiceName valueOf(URL url) {
return new NacosServiceName(url);
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
index 789adee..6b80999 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
@@ -19,40 +19,30 @@ package org.apache.dubbo.registry.nacos.util;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.registry.client.DefaultServiceInstance;
import org.apache.dubbo.registry.client.ServiceInstance;
import com.alibaba.nacos.api.NacosFactory;
+import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import com.alibaba.nacos.api.naming.utils.NamingUtils;
+import java.lang.reflect.Field;
+import java.util.Objects;
import java.util.Properties;
+import java.util.stream.Stream;
-import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY;
-import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME;
-import static com.alibaba.nacos.api.PropertyKeyConst.CONFIG_LONG_POLL_TIMEOUT;
-import static com.alibaba.nacos.api.PropertyKeyConst.CONFIG_RETRY_TIME;
-import static com.alibaba.nacos.api.PropertyKeyConst.CONTEXT_PATH;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENABLE_REMOTE_SYNC_CONFIG;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENCODE;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT;
-import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT_PORT;
-import static
com.alibaba.nacos.api.PropertyKeyConst.IS_USE_CLOUD_NAMESPACE_PARSING;
-import static
com.alibaba.nacos.api.PropertyKeyConst.IS_USE_ENDPOINT_PARSING_RULE;
-import static com.alibaba.nacos.api.PropertyKeyConst.MAX_RETRY;
-import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE;
-import static
com.alibaba.nacos.api.PropertyKeyConst.NAMING_CLIENT_BEAT_THREAD_COUNT;
import static
com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START;
-import static
com.alibaba.nacos.api.PropertyKeyConst.NAMING_POLLING_THREAD_COUNT;
-import static com.alibaba.nacos.api.PropertyKeyConst.RAM_ROLE_NAME;
-import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
import static
com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
+import static java.lang.reflect.Modifier.isFinal;
+import static java.lang.reflect.Modifier.isPublic;
+import static java.lang.reflect.Modifier.isStatic;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
+import static org.apache.dubbo.common.utils.StringUtils.isEmpty;
+import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty;
/**
* The utilities class for {@link NamingService}
@@ -63,6 +53,33 @@ public class NacosNamingServiceUtils {
private
[dubbo-spring-boot-project] branch 2.7.x updated: 2.7.x (#722)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/2.7.x by this push: new bbc35a7 2.7.x (#722) bbc35a7 is described below commit bbc35a7a10254ef1c1659d88712f78c1a062c9e8 Author: Mercy Ma AuthorDate: Tue Jun 2 15:08:34 2020 +0800 2.7.x (#722) * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the samples deployed the external Servlet container * Polish apache/dubbo-spring-boot-project#685 : Dubbo2.7.5: Duplicate ServiceBean found * To fix the declaration of years --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 070eb57..e02ff73 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Dubbo -Copyright 2018-2019 The Apache Software Foundation +Copyright 2018-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file
[dubbo] branch master updated: add visual-studio-code ignore (#6221)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 83afabe add visual-studio-code ignore (#6221) 83afabe is described below commit 83afabeda133a4cac2e4e0a55c8b4d69b2b9f4aa Author: oaoit AuthorDate: Tue Jun 2 11:32:12 2020 +0800 add visual-studio-code ignore (#6221) --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 15002c4..47be2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ target/ *.iml *.iws +# visual-studio-code ignore +.vscode/ + # temp ignore *.log *.cache
[dubbo] branch master updated (0791c7c -> 6a45acb)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from 0791c7c fix-6231 (#6253) add 6a45acb fix(registry-nacos):fix nacos service name associated with group name (#6227) No new revisions were added by this update. Summary of changes: .../org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[dubbo] branch 2.6.x updated: upgrade fastjson to 1.2.70 (#6255)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/2.6.x by this push: new 59320a9 upgrade fastjson to 1.2.70 (#6255) 59320a9 is described below commit 59320a9eeb6511407cf9cd4033f5d0621b60e94f Author: 祁晓波 AuthorDate: Mon Jun 1 17:50:20 2020 +0800 upgrade fastjson to 1.2.70 (#6255) https://help.aliyun.com/noticelist/articleid/1060343604.html?spm=a2c4g.789004748.n2.6.3f576141SGmGhG 漏洞描述 fastjson采用黑白名单的方法来防御反序列化漏洞，导致当黑客不断发掘新的反序列化Gadgets类时，在autoType关闭的情况下仍然可能可以绕过黑白名单防御机制，造成远程命令执行漏洞。经研究，该漏洞利用门槛较低，可绕过autoType限制，风险影响较大。阿里云应急响应中心提醒fastjson用户尽快采取安全措施阻止漏洞攻击。 影响版本 fastjson <=1.2.68 fastjson sec版本 <= sec9 安全版本 fastjson >=1.2.69 fastjson sec版本 >= sec10 --- dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 39f45ec..50e78e2 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -94,7 +94,7 @@ 1.1.7 2.1.4 4.5.3 -1.2.67 +1.2.70 3.4.9 0.2 2.12.0
[dubbo] branch master updated: fix-6231 (#6253)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 0791c7c fix-6231 (#6253)
0791c7c is described below
commit 0791c7c8e1e0c3e2e50f7fa67eadfe795dfee60d
Author: kexianjun
AuthorDate: Mon Jun 1 17:48:55 2020 +0800
fix-6231 (#6253)
---
.../spring/beans/factory/annotation/ServiceClassPostProcessor.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
index ed73be4..b1c9a30 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
@@ -68,7 +68,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import static
com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans;
+import static com.alibaba.spring.util.BeanRegistrar.registerInfrastructureBean;
import static com.alibaba.spring.util.ObjectUtils.of;
import static java.util.Arrays.asList;
import static
org.apache.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder.create;
@@ -126,7 +126,7 @@ public class ServiceClassPostProcessor implements
BeanDefinitionRegistryPostProc
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry
registry) throws BeansException {
// @since 2.7.5
-registerBeans(registry, DubboBootstrapApplicationListener.class);
+registerInfrastructureBean(registry,
DubboBootstrapApplicationListener.BEAN_NAME,
DubboBootstrapApplicationListener.class);
Set resolvedPackagesToScan =
resolvePackagesToScan(packagesToScan);
svn commit: r39816 - in /dev/dubbo/dubbo-spring-boot/2.7.7: ./ apache-dubbo-spring-boot-project-2.7.7-source-release.zip apache-dubbo-spring-boot-project-2.7.7-source-release.zip.asc apache-dubbo-spri
Author: mercyblitz Date: Fri May 29 06:59:16 2020 New Revision: 39816 Log: Prepare for Dubbo Spring Boot 2.7.7 RC1 Added: dev/dubbo/dubbo-spring-boot/2.7.7/ dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip (with props) dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.asc dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.sha512 Added: dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.asc == --- dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.asc (added) +++ dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.asc Fri May 29 06:59:16 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAl7QdhIACgkQp/UI79po +tPXWDBAAwUPCd+iqzD3axsE6Ooxgw7F2ffYiknlOvl2uuLbWBLeEY8c4gnX0QXuX +Ic60P2vOfM8dAx3kHlTkBpgjbDh467zH3TDw69xRP21hXfFVrc8tpSL5MqLY3Tzq +yjcKQMEka9g1PNlzHOqMd+ZSWws7t9NsSXXYlm20viHplW+BMRbcMMf9j3bakK5u +MzdXh5BfPV/mP72ihJ7yDEhudLE/3IXOGzqO2y+qBsjA48FWD9jaqDNK3LmQkywp +93cu3SzjbBv/wHfKWA09/gDGXZbCXBRup4YDyoQ71Cla6t+nfBFD7gKtFGJIHYu2 +r8VbGS4k4WGh15uts0avTdxM1m1GKRXUEBV5OGMawxmaPZaf2QDpr93UNfrE3nFe +/AgU063FCPq1645iaIeLH9Fa+x3LtFfL6FMU+1uh+iLX2z9EVZgjqSJzv0jPjTJx +o3OBBXczapizScHNoC4LG/vUZhG+g9WNKDx205O377alQAka7mN5m0D9AKoj3C4t +3Q2MhYnR9qAyKvLDL4rgLj0jXadzRjMVw2gl2iAD6T/pQ3HfmVYXlrPuVT/VcMlx +RbkLvfY44uH/T+VxHISNEOVNALWarWBMdi8517xA2iBTUb2NfQOUQVoY4bkHBgE/ +LaAVkiR3xtZwuRgiesEk5CxG5PY4mHDCXkIwpDrXnYvyhXXCyEw= +=MtzH +-END PGP SIGNATURE- Added: dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.sha512 == --- dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.sha512 (added) +++ dev/dubbo/dubbo-spring-boot/2.7.7/apache-dubbo-spring-boot-project-2.7.7-source-release.zip.sha512 Fri May 29 06:59:16 2020 @@ -0,0 +1 @@ +0d2441030f518f15be9e1e5846480a81dcd6a9e2c156581ab2d2a82e0dcd871392bafeb393fe828456655895d7b9d0ab50034d6dc8e8bc000f63a5b4af81f6de apache-dubbo-spring-boot-project-2.7.7-source-release.zip
[dubbo-spring-boot-project] tag 2.7.7 created (now 2dc6e37)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.7 in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. at 2dc6e37 (commit) No new revisions were added by this update.
[dubbo-spring-boot-project] branch 2.7.x updated: Duplicate ServiceBean Issue (#721)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/2.7.x by this push:
new 2dc6e37 Duplicate ServiceBean Issue (#721)
2dc6e37 is described below
commit 2dc6e372b921019d40be713152f76c14b81bfdb8
Author: Mercy Ma
AuthorDate: Thu May 28 14:06:11 2020 +0800
Duplicate ServiceBean Issue (#721)
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
* Polish apache/dubbo-spring-boot-project#685 : Dubbo2.7.5: Duplicate
ServiceBean found
---
.../boot/autoconfigure/DubboAutoConfiguration.java | 2 +
.../config/ServiceBeanIdConflictProcessor.java | 115 +
2 files changed, 117 insertions(+)
diff --git
a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
index 6a190cb..6f130e8 100644
---
a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
+++
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java
@@ -23,6 +23,7 @@ import
org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotation
import
org.apache.dubbo.config.spring.beans.factory.annotation.ServiceClassPostProcessor;
import
org.apache.dubbo.config.spring.context.annotation.DubboConfigConfiguration;
import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig;
+import
org.apache.dubbo.spring.boot.beans.factory.config.ServiceBeanIdConflictProcessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -61,6 +62,7 @@ import static
org.apache.dubbo.spring.boot.util.DubboUtils.MULTIPLE_CONFIG_PROPE
@Configuration
@AutoConfigureAfter(DubboRelaxedBindingAutoConfiguration.class)
@EnableConfigurationProperties(DubboConfigurationProperties.class)
+@Import(ServiceBeanIdConflictProcessor.class)
public class DubboAutoConfiguration {
/**
diff --git
a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java
new file mode 100644
index 000..b6bf04b
--- /dev/null
+++
b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java
@@ -0,0 +1,115 @@
+/*
+ * 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 org.apache.dubbo.spring.boot.beans.factory.config;
+
+import org.apache.dubbo.config.ServiceConfig;
+import org.apache.dubbo.config.spring.ServiceBean;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.DisposableBean;
+import
org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
+import org.springframework.core.Ordered;
+import org.springframework.core.PriorityOrdered;
+
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import static org.springframework.util.ClassUtils.getUserClass;
+import static org.springframework.util.ClassUtils.isAssignable;
+
+/**
+ * The post-processor for resolving the id conflict of {@link ServiceBean
[dubbo-spring-boot-project] branch 2.7.x updated: Introducing the samples deployed the external Servlet container (#720)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/2.7.x by this push:
new 611fafe Introducing the samples deployed the external Servlet
container (#720)
611fafe is described below
commit 611fafe44cdc5e426ffe3b45f6cae635eb693047
Author: Mercy Ma
AuthorDate: Tue May 26 17:25:36 2020 +0800
Introducing the samples deployed the external Servlet container (#720)
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
* Polish apache/dubbo-spring-boot-project#718 : [Samples] Introducing the
samples deployed the external Servlet container
---
README.md | 4 +-
README_CN.md | 2 +-
dubbo-spring-boot-actuator/README.md | 26 ++---
.../endpoint/DubboReferencesMetadataEndpoint.java | 3 +-
.../endpoint/DubboServicesMetadataEndpoint.java| 3 +-
.../endpoint/metadata/DubboReferencesMetadata.java | 3 +-
.../endpoint/metadata/DubboServicesMetadata.java | 3 +-
.../boot/autoconfigure/DubboAutoConfiguration.java | 9 +-
.../DubboAutoConfigurationConsumerBootstrap.java | 4 +-
.../DubboAutoConfigurationProviderBootstrap.java | 4 +-
.../provider/service/DefaultDemoService.java | 4 +-
.../src/main/resources/application.properties | 2 +-
...ExternalizedConfigurationConsumerBootstrap.java | 4 +-
.../demo/provider/service/DefaultDemoService.java | 43
...ExternalizedConfigurationProviderBootstrap.java | 5 +-
.../provider/service/DefaultDemoService.java | 4 +-
.../src/main/resources/application.properties | 2 +-
dubbo-spring-boot-samples/pom.xml | 2 +
.../DubboRegistryNacosConsumerBootstrap.java | 4 +-
.../DubboRegistryNacosProviderBootstrap.java | 4 +-
.../provider/service/DefaultDemoService.java | 4 +-
.../src/main/resources/application.properties | 2 +-
dubbo-spring-boot-samples/registry-samples/pom.xml | 16 +++
.../DubboRegistryZooKeeperConsumerBootstrap.java | 4 +-
.../DubboRegistryZooKeeperProviderBootstrap.java | 4 +-
.../provider/service/DefaultDemoService.java | 2 +-
.../src/main/resources/application.properties | 2 +-
dubbo-spring-boot-samples/sample-api/pom.xml | 1 +
.../{demo => sample}/consumer/DemoService.java | 2 +-
.../nacos-samples/consumer-sample/pom.xml | 16 +++
...NacosServiceIntrospectionConsumerBootstrap.java | 2 +-
.../nacos-samples/pom.xml | 16 +++
.../nacos-samples/provider-sample/pom.xml | 16 +++
.../provider/service/DefaultDemoService.java | 2 +-
.../service-introspection-samples/pom.xml | 16 +++
.../zookeeper-samples/consumer-sample/pom.xml | 16 +++
...eeperServiceIntrospectionConsumerBootstrap.java | 2 +-
.../zookeeper-samples/pom.xml | 16 +++
.../zookeeper-samples/provider-sample/pom.xml | 16 +++
.../provider/service/DefaultDemoService.java | 2 +-
.../consumer-sample/pom.xml| 115 +
.../DubboServletContainerConsumerBootstrap.java} | 34 +++---
.../src/main/resources/application.yml | 8 ++
.../pom.xml| 23 -
.../provider-sample/pom.xml| 115 +
.../DubboServletContainerProviderBootstrap.java| 60 +++
.../provider/service/DefaultDemoService.java | 4 +-
.../src/main/resources/application.properties | 16 +++
48 files changed, 546 insertions(+), 121 deletions(-)
diff --git a/README.md b/README.md
index ec3f472..0cd3254 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ If you still use the legacy Dubbo whose version is less than
2.7.0, please use t
### Build from Source
-If you'd like to attempt to experience latest features, you also can build
from source as follow:
+If you'd like to attempt to experience the latest features, you also can build
from the source code as follow:
1. Maven install current project in your local repository.
> Maven install = `mvn install`
@@ -150,7 +150,7 @@ public interface DemoService {
# Spring boot application
spring.application.name=dubbo-auto-configuration-provider-demo
# Base packages to scan Dubbo Component:
@org.apache.dubbo.config.annotation.Service
-dubbo.scan.base-packages=org.apache.dubbo.spring.boot.demo.provider.service
+
dubbo.scan.base-packages=org.apache.dubbo.spring.boot.sample.provider.service
# Dubbo Appli
[dubbo-spring-boot-project] 02/02: Merge branch 'mercyblitz-2.7.x' into 2.7.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git commit d1e5055e406ffeb249bb06a59c733506a939f7d9 Merge: 62629ee 50996fb Author: mercyblitz AuthorDate: Mon May 25 15:54:10 2020 +0800 Merge branch 'mercyblitz-2.7.x' into 2.7.x .../auto-configure-samples/consumer-sample/pom.xml | 2 +- .../auto-configure-samples/pom.xml | 2 +- .../auto-configure-samples/provider-sample/pom.xml | 2 +- .../consumer-sample/pom.xml| 2 +- .../externalized-configuration-samples/pom.xml | 2 +- .../provider-sample/pom.xml| 2 +- dubbo-spring-boot-samples/pom.xml | 4 +- .../nacos-samples}/consumer-sample/pom.xml | 4 +- .../DubboRegistryNacosConsumerBootstrap.java | 0 .../src/main/resources/application.yml | 0 .../nacos-samples}/pom.xml | 7 ++- .../nacos-samples}/provider-sample/pom.xml | 2 +- .../DubboRegistryNacosProviderBootstrap.java | 0 .../demo/provider/service/DefaultDemoService.java | 0 .../src/main/resources/application.properties | 0 dubbo-spring-boot-samples/registry-samples/pom.xml | 23 + .../zookeeper-samples}/consumer-sample/pom.xml | 2 +- .../DubboRegistryZooKeeperConsumerBootstrap.java | 0 .../src/main/resources/application.yml | 0 .../zookeeper-samples}/pom.xml | 4 +- .../zookeeper-samples}/provider-sample/pom.xml | 2 +- .../DubboRegistryZooKeeperProviderBootstrap.java | 0 .../demo/provider/service/DefaultDemoService.java | 0 .../src/main/resources/application.properties | 0 dubbo-spring-boot-samples/sample-api/pom.xml | 2 +- .../nacos-samples}/consumer-sample/pom.xml | 35 +++--- ...acosServiceIntrospectionConsumerBootstrap.java} | 6 +-- .../src/main/resources/application.yml | 4 +- .../nacos-samples/pom.xml | 23 + .../nacos-samples/provider-sample}/pom.xml | 35 +++--- ...acosServiceIntrospectionProviderBootstrap.java} | 10 ++-- .../provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 6 +-- .../service-introspection-samples/pom.xml | 22 + .../zookeeper-samples}/consumer-sample/pom.xml | 56 +++--- ...eperServiceIntrospectionConsumerBootstrap.java} | 6 +-- .../src/main/resources/application.yml | 4 +- .../zookeeper-samples/pom.xml | 23 + .../zookeeper-samples/provider-sample}/pom.xml | 56 +++--- ...eperServiceIntrospectionProviderBootstrap.java} | 10 ++-- .../provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 24 ++ 42 files changed, 249 insertions(+), 137 deletions(-)
[dubbo-spring-boot-project] 01/02: Merge branch '2.7.x' of https://github.com/mercyblitz/dubbo-spring-boot-project into mercyblitz-2.7.x
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git commit 50996fbbba6e6475838fe0a67495c66ed8c73ea8 Merge: 62629ee 2608b39 Author: mercyblitz AuthorDate: Mon May 25 15:53:31 2020 +0800 Merge branch '2.7.x' of https://github.com/mercyblitz/dubbo-spring-boot-project into mercyblitz-2.7.x .../auto-configure-samples/consumer-sample/pom.xml | 2 +- .../auto-configure-samples/pom.xml | 2 +- .../auto-configure-samples/provider-sample/pom.xml | 2 +- .../consumer-sample/pom.xml| 2 +- .../externalized-configuration-samples/pom.xml | 2 +- .../provider-sample/pom.xml| 2 +- dubbo-spring-boot-samples/pom.xml | 4 +- .../nacos-samples}/consumer-sample/pom.xml | 4 +- .../DubboRegistryNacosConsumerBootstrap.java | 0 .../src/main/resources/application.yml | 0 .../nacos-samples}/pom.xml | 7 ++- .../nacos-samples}/provider-sample/pom.xml | 2 +- .../DubboRegistryNacosProviderBootstrap.java | 0 .../demo/provider/service/DefaultDemoService.java | 0 .../src/main/resources/application.properties | 0 dubbo-spring-boot-samples/registry-samples/pom.xml | 23 + .../zookeeper-samples}/consumer-sample/pom.xml | 2 +- .../DubboRegistryZooKeeperConsumerBootstrap.java | 0 .../src/main/resources/application.yml | 0 .../zookeeper-samples}/pom.xml | 4 +- .../zookeeper-samples}/provider-sample/pom.xml | 2 +- .../DubboRegistryZooKeeperProviderBootstrap.java | 0 .../demo/provider/service/DefaultDemoService.java | 0 .../src/main/resources/application.properties | 0 dubbo-spring-boot-samples/sample-api/pom.xml | 2 +- .../nacos-samples}/consumer-sample/pom.xml | 35 +++--- ...acosServiceIntrospectionConsumerBootstrap.java} | 6 +-- .../src/main/resources/application.yml | 4 +- .../nacos-samples/pom.xml | 23 + .../nacos-samples/provider-sample}/pom.xml | 35 +++--- ...acosServiceIntrospectionProviderBootstrap.java} | 10 ++-- .../provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 6 +-- .../service-introspection-samples/pom.xml | 22 + .../zookeeper-samples}/consumer-sample/pom.xml | 56 +++--- ...eperServiceIntrospectionConsumerBootstrap.java} | 6 +-- .../src/main/resources/application.yml | 4 +- .../zookeeper-samples/pom.xml | 23 + .../zookeeper-samples/provider-sample}/pom.xml | 56 +++--- ...eperServiceIntrospectionProviderBootstrap.java} | 10 ++-- .../provider/service/DefaultDemoService.java | 2 +- .../src/main/resources/application.properties | 24 ++ 42 files changed, 249 insertions(+), 137 deletions(-)
[dubbo-spring-boot-project] branch 2.7.x updated (62629ee -> d1e5055)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 62629ee [Refactor] Using @DubboReferece and @DubboService (#714) add 877c9ef Merge pull request #5 from apache/master add 515164e Merge pull request #6 from mercyblitz/master add eb9e8a6 Update revision to be 2.7.2-SNAPSHOT add cddcd95 Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts add e740196 Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 add ee223ec Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts add 0203caf Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 add bb5f8d9 Polish apache/dubbo-spring-boot-project#553 : Upgrade the dependencies for Dubbo Spring Boot 2.7.2 add 33b8ed8 Polish apache/dubbo-spring-boot-project#553 : Upgrade Spring Boot to be 2.1.6.RELEASE add 24ff965 Polish apache/dubbo-spring-boot-project#554 : To change the Dependencies of dubbo to be direct add 7095840 Polish apache/dubbo-spring-boot-project#560 : [QA] Fix the bugs of test cases add d0eebc7 Polish apache/dubbo-spring-boot-project#561 : [Version] Upgrade Dubbo 2.7.3 add 4b1b865 Polish apache/dubbo-spring-boot-project#555 : Add the Maven profiles to test the compatibility for Spring Boot versions add 871251a Polish apache/dubbo-spring-boot-project#555 : [Feature] Add the Maven profiles to test the compatibility for Spring Boot versions add 4816758 Update Documents' version add 5ca5018 Merge branch '2.7.x' into 2.7.x add bc38480 Fix the bugs of Test cases add f0d5dec Merge remote-tracking branch 'upstream/2.7.x' into 2.7.x add b73a7e3 Fix the bugs of Test cases add ea56e86 Polish apache/dubbo-spring-boot-project#569 : DISCLAIMER can be removed add 9bc8201 Polish apache/dubbo-spring-boot-project#571 : Remove incubating and DISCLAIMER add 6cd2de5 Polish apache/dubbo-spring-boot-project#496 : [Issue] Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 add 8a620ca Polish apache/dubbo-spring-boot-project#496 : Fixes the test cases add a40aca1 Merge remote-tracking branch 'upstream/master' into 2.7.x add c2c813a Polish apache/dubbo-spring-boot-project#607 add 79d1691 Polish apache/dubbo-spring-boot-project#619 add f92c194 Merge branch '2.7.x' into 2.7.x add 6d438f1 Merge remote-tracking branch 'origin/2.7.x' into 2.7.x add f0d68c2 Polish add e0d0378 Polish apache/dubbo-spring-boot-project#635 : [Infrastructure] Upgrade Dubbo 2.7.5 add b50ed60 Update the maven-javadoc-plugin to be 3.1.1 add fa4fdee Polish apache/dubbo-spring-boot-project#636 : [Infrastructure] Upgrade Spring Boot 2.x add 3565266 Polish apache/dubbo-spring-boot-project#637 : [Infrastructure] Upgrade Spring Boot 1.5.x add 76dc1ee Polish apache/dubbo-spring-boot-project#638 add 4430093 Polish apache/dubbo-spring-boot-project#638 add c233e17 Polish apache/dubbo-spring-boot-project#638 add cd98762 Polish apache/dubbo-spring-boot-project#642 add 25a6296 Correct words add 1e35339 Merge remote-tracking branch 'upstream/master' into 2.7.x add 37cb4af Merge remote-tracking branch 'upstream/master' into 2.7.x add d69bb6d Polish apache/dubbo-spring-boot-project#647 add b39f420 Polish apache/dubbo-spring-boot-project#648 : Remove the external project files add 43c0534 Merge remote-tracking branch 'upstream/master' into 2.7.x add 7836638 Polish apache/dubbo-spring-boot-project#688 : [Infrastructure] Upgrade Apache Dubbo 2.7.6 add f52286a Merge remote-tracking branch 'upstream/2.7.x' into 2.7.x add 0774423 Update the samples add c4e5340 Update the samples add b66f0cc Update the samples and documents add a0d88b7 2.7.x (#691) add f6251cb Fix #692 add 35568ff Remove deprecated sudo setting. (#707) add 9ef994d Merge remote-tracking branch 'upstream/master' into 2.7.x add 09fd582 Polish apache/dubbo-spring-boot-project#711 : [Infrastructure] Dependency upgrades for 2.7.7 add 62f6d9a Polish apache/dubbo-spring-boot-project#711 : [Infrastructure] Dependency upgrades for 2.7.7 add a282847 Polish apache/dubbo-spring-boot-project#713 : [Refactor] Using @DubboReferece and @DubboService add c7952be Merge branch '2.7.x' into 2.7.x add be01fa6 Merge remote-tracking branch 'origin/2.7.x' into 2.7.x add b00c091 Merge remote-tracking branch 'upstream/2.7.x
[dubbo-spring-boot-project] branch 2.7.x updated: [Refactor] Using @DubboReferece and @DubboService (#714)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/2.7.x by this push: new 62629ee [Refactor] Using @DubboReferece and @DubboService (#714) 62629ee is described below commit 62629eecf81b054068686a226537709a2225c27f Author: Mercy Ma AuthorDate: Wed May 20 11:08:24 2020 +0800 [Refactor] Using @DubboReferece and @DubboService (#714) * Update revision to be 2.7.2-SNAPSHOT * Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts * Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts * Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#553 : Upgrade the dependencies for Dubbo Spring Boot 2.7.2 * Polish apache/dubbo-spring-boot-project#553 : Upgrade Spring Boot to be 2.1.6.RELEASE * Polish apache/dubbo-spring-boot-project#554 : To change the Dependencies of dubbo to be direct * Polish apache/dubbo-spring-boot-project#560 : [QA] Fix the bugs of test cases * Polish apache/dubbo-spring-boot-project#561 : [Version] Upgrade Dubbo 2.7.3 * Polish apache/dubbo-spring-boot-project#555 : Add the Maven profiles to test the compatibility for Spring Boot versions * Polish apache/dubbo-spring-boot-project#555 : [Feature] Add the Maven profiles to test the compatibility for Spring Boot versions * Update Documents' version * Fix the bugs of Test cases * Fix the bugs of Test cases * Polish apache/dubbo-spring-boot-project#569 : DISCLAIMER can be removed * Polish apache/dubbo-spring-boot-project#571 : Remove incubating and DISCLAIMER * Polish apache/dubbo-spring-boot-project#496 : [Issue] Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#496 : Fixes the test cases * Polish apache/dubbo-spring-boot-project#607 * Polish apache/dubbo-spring-boot-project#635 : [Infrastructure] Upgrade Dubbo 2.7.5 * Update the maven-javadoc-plugin to be 3.1.1 * Polish apache/dubbo-spring-boot-project#636 : [Infrastructure] Upgrade Spring Boot 2.x * Polish apache/dubbo-spring-boot-project#637 : [Infrastructure] Upgrade Spring Boot 1.5.x * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#642 * Correct words * Polish apache/dubbo-spring-boot-project#647 * Polish apache/dubbo-spring-boot-project#648 : Remove the external project files * Polish apache/dubbo-spring-boot-project#688 : [Infrastructure] Upgrade Apache Dubbo 2.7.6 * Update the samples * Update the samples * Update the samples and documents * 2.7.x (#691) * 2.7.x (#475) * Fix apache/incubator-dubbo-spring-boot-project#169 * 0.2.1 (#345) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Pol
[dubbo-spring-boot-project] branch 2.7.x updated: [Infrastructure] Dependency upgrades for 2.7.7 #711 (#712)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/2.7.x by this push: new b33d518 [Infrastructure] Dependency upgrades for 2.7.7 #711 (#712) b33d518 is described below commit b33d518171cbddf419990e69294660f2d666034e Author: Mercy Ma AuthorDate: Tue May 19 21:09:04 2020 +0800 [Infrastructure] Dependency upgrades for 2.7.7 #711 (#712) * Update revision to be 2.7.2-SNAPSHOT * Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts * Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#494 : AwaitingNonWebApplicationListener should wait one in Hierarchical Spring Application Contexts * Polish apache/dubbo-spring-boot-project#496 : Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#553 : Upgrade the dependencies for Dubbo Spring Boot 2.7.2 * Polish apache/dubbo-spring-boot-project#553 : Upgrade Spring Boot to be 2.1.6.RELEASE * Polish apache/dubbo-spring-boot-project#554 : To change the Dependencies of dubbo to be direct * Polish apache/dubbo-spring-boot-project#560 : [QA] Fix the bugs of test cases * Polish apache/dubbo-spring-boot-project#561 : [Version] Upgrade Dubbo 2.7.3 * Polish apache/dubbo-spring-boot-project#555 : Add the Maven profiles to test the compatibility for Spring Boot versions * Polish apache/dubbo-spring-boot-project#555 : [Feature] Add the Maven profiles to test the compatibility for Spring Boot versions * Update Documents' version * Fix the bugs of Test cases * Fix the bugs of Test cases * Polish apache/dubbo-spring-boot-project#569 : DISCLAIMER can be removed * Polish apache/dubbo-spring-boot-project#571 : Remove incubating and DISCLAIMER * Polish apache/dubbo-spring-boot-project#496 : [Issue] Dubbo Spring Boot 2.7.1 PropertyResolver Beans conflict in Spring Boot, ref #459 #496 * Polish apache/dubbo-spring-boot-project#496 : Fixes the test cases * Polish apache/dubbo-spring-boot-project#607 * Polish apache/dubbo-spring-boot-project#635 : [Infrastructure] Upgrade Dubbo 2.7.5 * Update the maven-javadoc-plugin to be 3.1.1 * Polish apache/dubbo-spring-boot-project#636 : [Infrastructure] Upgrade Spring Boot 2.x * Polish apache/dubbo-spring-boot-project#637 : [Infrastructure] Upgrade Spring Boot 1.5.x * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#638 * Polish apache/dubbo-spring-boot-project#642 * Correct words * Polish apache/dubbo-spring-boot-project#647 * Polish apache/dubbo-spring-boot-project#648 : Remove the external project files * Polish apache/dubbo-spring-boot-project#688 : [Infrastructure] Upgrade Apache Dubbo 2.7.6 * Update the samples * Update the samples * Update the samples and documents * 2.7.x (#691) * 2.7.x (#475) * Fix apache/incubator-dubbo-spring-boot-project#169 * 0.2.1 (#345) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Pol
[dubbo-spring-boot-project] branch master updated: Remove deprecated sudo setting. (#707)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new 35568ff Remove deprecated sudo setting. (#707) 35568ff is described below commit 35568ff32d3a0fcbbd6b3e14a9f7c0a71b6b08ee Author: dengliming AuthorDate: Tue May 19 15:19:45 2020 +0800 Remove deprecated sudo setting. (#707) --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af79f19..e01d1a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: java -sudo: false # faster builds jdk: - openjdk11
[dubbo] branch master updated: Polish apache/dubbo#6152 (#6154)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 91ad5e2 Polish apache/dubbo#6152 (#6154)
91ad5e2 is described below
commit 91ad5e2fb6d0a3f155accb8a9bd10786996445df
Author: Mercy Ma
AuthorDate: Thu May 14 20:56:37 2020 +0800
Polish apache/dubbo#6152 (#6154)
---
.../config/spring/schema/GenericServiceTest.java | 50 ++
.../config/spring/schema/MyGenericService.java | 30 +
.../META-INF/spring/dubbo-generic-consumer.xml | 36
3 files changed, 116 insertions(+)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java
new file mode 100644
index 000..410e3e9
--- /dev/null
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/GenericServiceTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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 org.apache.dubbo.config.spring.schema;
+
+import org.apache.dubbo.config.spring.ReferenceBean;
+import org.apache.dubbo.config.spring.ServiceBean;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = GenericServiceTest.class)
+@ImportResource(locations =
"classpath:/META-INF/spring/dubbo-generic-consumer.xml")
+public class GenericServiceTest {
+
+@Autowired
+@Qualifier("demoServiceRef")
+private ReferenceBean referenceBean;
+
+@Autowired
+@Qualifier("demoService")
+private ServiceBean serviceBean;
+
+@Test
+public void testBeanDefinitionParser() {
+assertNotNull(referenceBean);
+assertNotNull(serviceBean);
+}
+}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/MyGenericService.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/MyGenericService.java
new file mode 100644
index 000..b7bcb6d
--- /dev/null
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/MyGenericService.java
@@ -0,0 +1,30 @@
+/*
+ * 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 org.apache.dubbo.config.spring.schema;
+
+import org.apache.dubbo.rpc.service.GenericException;
+import org.apache.dubbo.rpc.service.GenericService;
+
+public class MyGenericService implements GenericService {
+
+public Object $invoke(String methodName, String[] parameterTypes, Object[]
args) throws GenericException {
+if ("sayHello".equals(methodName)) {
+return "Welcome " + args[0];
+}
+return null;
+}
+}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-generic-
[dubbo] branch master updated: Making "dubbo-build-tools" module to be non-deployable one. (#6115)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 391dc65 Making "dubbo-build-tools" module to be non-deployable one. (#6115) 391dc65 is described below commit 391dc65c61733201adce1837e2f48d9a75d5a0e7 Author: Mercy Ma AuthorDate: Thu May 7 17:21:28 2020 +0800 Making "dubbo-build-tools" module to be non-deployable one. (#6115) --- dubbo-build-tools/pom.xml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml index 761cb2a..e6f5929 100644 --- a/dubbo-build-tools/pom.xml +++ b/dubbo-build-tools/pom.xml @@ -22,4 +22,18 @@ dubbo-build-tools 1.0.0 jar + + + + +org.apache.maven.plugins +maven-deploy-plugin +2.8.2 + +true + + + + + \ No newline at end of file
[dubbo] branch master updated: 1、support for merger when use @Reference or @Method or @DubboReference (#6092)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4d3316b 1、support for merger when use @Reference or @Method or
@DubboReference (#6092)
4d3316b is described below
commit 4d3316b87d18d37ce982928052fd5451f63cea92
Author: imuxi <33019873+im...@users.noreply.github.com>
AuthorDate: Thu May 7 11:10:30 2020 +0800
1、support for merger when use @Reference or @Method or @DubboReference
(#6092)
2、Delete unnecessary 'return' comments, Cause the check to failed
---
.../java/org/apache/dubbo/config/annotation/DubboReference.java| 7 +--
.../src/main/java/org/apache/dubbo/config/annotation/Method.java | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
index 985a4d9..eb1a2e6 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
@@ -263,9 +263,12 @@ public @interface DubboReference {
String tag() default "";
/**
+ * Service merger
+ */
+String merger() default "";
+
+/**
* methods support
- *
- * @return
*/
Method[] methods() default {};
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
index 0cdc97c..c1fe088 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
@@ -65,5 +65,7 @@ public @interface Method {
String validation() default "";
+String merger() default "";
+
Argument[] arguments() default {};
}
[dubbo] branch master updated: modify the synchronize monitor object to final, prevent the monitor object changes (#6081)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 6140f5f modify the synchronize monitor object to final,prevent the
monitor object changes (#6081)
6140f5f is described below
commit 6140f5f9eb4d7eb141e7910caeceb564b919b58b
Author: JuliusZhang
AuthorDate: Wed May 6 16:56:26 2020 +0800
modify the synchronize monitor object to final,prevent the monitor object
changes (#6081)
---
.../common/config/configcenter/file/FileSystemDynamicConfiguration.java | 2 +-
.../apache/dubbo/metadata/report/support/AbstractMetadataReport.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
index 2544c05..36fb61f 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
@@ -507,7 +507,7 @@ public class FileSystemDynamicConfiguration extends
AbstractDynamicConfiguration
return super.getWorkersThreadPool();
}
-private V executeMutually(Object mutex, Callable callable) {
+private V executeMutually(final Object mutex, Callable callable) {
V value = null;
synchronized (mutex) {
try {
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
index 3fe0eb1..1d39401 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
@@ -394,7 +394,7 @@ public abstract class AbstractMetadataReport implements
MetadataReport {
final ScheduledExecutorService retryExecutor =
Executors.newScheduledThreadPool(0, new
NamedThreadFactory("DubboMetadataReportRetryTimer", true));
volatile ScheduledFuture retryScheduledFuture;
-AtomicInteger retryCounter = new AtomicInteger(0);
+final AtomicInteger retryCounter = new AtomicInteger(0);
// retry task schedule period
long retryPeriod;
// if no failed report, wait how many times to run retry task.
[dubbo] branch master updated: add new loadbalance strategy (#6064)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 6d2ba7e add new loadbalance strategy (#6064)
6d2ba7e is described below
commit 6d2ba7ec7b5a1cb7971143d4262d0a1bfc826d45
Author: August <33082727+august...@users.noreply.github.com>
AuthorDate: Wed May 6 16:47:22 2020 +0800
add new loadbalance strategy (#6064)
* add new loadbalance strategy
* add note
* Update ShortestResponseLoadBalanceTest.java
---
.../loadbalance/ShortestResponseLoadBalance.java | 100 +
.../org.apache.dubbo.rpc.cluster.LoadBalance | 3 +-
.../cluster/loadbalance/LoadBalanceBaseTest.java | 22 +
.../ShortestResponseLoadBalanceTest.java | 53 +++
4 files changed, 177 insertions(+), 1 deletion(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
new file mode 100644
index 000..610b1b4
--- /dev/null
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
@@ -0,0 +1,100 @@
+/*
+ * 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 org.apache.dubbo.rpc.cluster.loadbalance;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.rpc.Invocation;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.RpcStatus;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * ShortestResponseLoadBalance
+ *
+ * Filter the number of invokers with the shortest response time of success
calls and count the weights and quantities of these invokers.
+ * If there is only one invoker, use the invoker directly;
+ * if there are multiple invokers and the weights are not the same, then
random according to the total weight;
+ * if there are multiple invokers and the same weight, then randomly called.
+ */
+public class ShortestResponseLoadBalance extends AbstractLoadBalance {
+
+public static final String NAME = "shortestresponse";
+
+@Override
+protected Invoker doSelect(List> invokers, URL url,
Invocation invocation) {
+// Number of invokers
+int length = invokers.size();
+// Estimated shortest response time of all invokers
+long shortestResponse = Long.MAX_VALUE;
+// The number of invokers having the same estimated shortest response
time
+int shortestCount = 0;
+// The index of invokers having the same estimated shortest response
time
+int[] shortestIndexes = new int[length];
+// the weight of every invokers
+int[] weights = new int[length];
+// The sum of the warmup weights of all the shortest response invokers
+int totalWeight = 0;
+// The weight of the first shortest response invokers
+int firstWeight = 0;
+// Every shortest response invoker has the same weight value?
+boolean sameWeight = true;
+
+// Filter out all the shortest response invokers
+for (int i = 0; i < length; i++) {
+Invoker invoker = invokers.get(i);
+RpcStatus rpcStatus = RpcStatus.getStatus(invoker.getUrl(),
invocation.getMethodName());
+// Calculate the estimated response time from the product of
active connections and succeeded average elapsed time.
+long succeededAverageElapsed =
rpcStatus.getSucceededAverageElapsed();
+int active = rpcStatus.getActive();
+long estimateResponse = succeededAverageElapsed * active;
+int afterWarmup = getWeight(invoker, invocation);
+weights[i] = afterWarmup;
+// Same as LeastActiveLoadBalance
+if (estimateResponse < shortestResponse) {
+shortestResponse = estimateResponse;
+shortestCount = 1;
+shortestIndexes[0] = i;
+totalWeight = afterWarmu
[dubbo] branch master updated (b2e6d51 -> d94b57d)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git. from b2e6d51 1、configuration.publishConfig returns false，without throw exception (#6094) add d94b57d Lambda replaced with method reference (#6105) No new revisions were added by this update. Summary of changes: .../java/com/alibaba/dubbo/registry/support/FailbackRegistry.java | 4 ++-- .../src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java| 2 +- .../main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-)
[dubbo] branch master updated: 1、configuration.publishConfig returns false，without throw exception (#6094)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new b2e6d51 1、configuration.publishConfig returns false，without throw
exception (#6094)
b2e6d51 is described below
commit b2e6d512e328c41d3756d9e324bd2b4499b8a3e0
Author: imuxi <33019873+im...@users.noreply.github.com>
AuthorDate: Wed May 6 12:25:37 2020 +0800
1、configuration.publishConfig returns false，without throw exception (#6094)
* 1、configuration.publishConfig returns false，without throw exception
* 1、configuration.getConfigKeys returns empty-list，without throw exception
---
.../config/configcenter/AbstractDynamicConfigurationTest.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java
index 00d58f6..4f2f700 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/config/configcenter/AbstractDynamicConfigurationTest.java
@@ -33,6 +33,8 @@ import static
org.apache.dubbo.common.config.configcenter.AbstractDynamicConfigu
import static
org.apache.dubbo.common.config.configcenter.AbstractDynamicConfiguration.THREAD_POOL_PREFIX_PARAM_NAME;
import static
org.apache.dubbo.common.config.configcenter.AbstractDynamicConfiguration.THREAD_POOL_SIZE_PARAM_NAME;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -105,13 +107,13 @@ public class AbstractDynamicConfigurationTest {
@Test
public void testPublishConfig() {
-assertThrows(UnsupportedOperationException.class, () ->
configuration.publishConfig(null, null), "No support");
-assertThrows(UnsupportedOperationException.class, () ->
configuration.publishConfig(null, null, null), "No support");
+assertFalse(configuration.publishConfig(null, null));
+assertFalse(configuration.publishConfig(null, null, null));
}
@Test
public void testGetConfigKeys() {
-assertThrows(UnsupportedOperationException.class, () ->
configuration.getConfigKeys(null), "No support");
+assertTrue(configuration.getConfigKeys(null).isEmpty());
}
@Test
[dubbo] branch master updated: Polish apache/dubbo#6078 : [Enhancement] Resolving the placeholders of XML BeanDefinition in the Configuration Class (#6079)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 434f9dd Polish apache/dubbo#6078 : [Enhancement] Resolving the
placeholders of XML BeanDefinition in the Configuration Class (#6079)
434f9dd is described below
commit 434f9dd393286247d921be7a14b3873518e38622
Author: Mercy Ma
AuthorDate: Tue Apr 28 17:29:03 2020 +0800
Polish apache/dubbo#6078 : [Enhancement] Resolving the placeholders of XML
BeanDefinition in the Configuration Class (#6079)
---
.../spring/schema/DubboBeanDefinitionParser.java | 51 --
.../spring/schema/DubboNamespaceHandlerTest.java | 35 +--
.../resources/META-INF/demo-provider.properties| 12 +
...o-provider.xml => demo-provider-properties.xml} | 20 ++---
.../apache/dubbo/config/spring/demo-provider.xml | 6 +--
5 files changed, 79 insertions(+), 45 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 1cf027a..5a849ff 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -42,6 +42,7 @@ import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.core.env.Environment;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -83,14 +84,14 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
RootBeanDefinition beanDefinition = new RootBeanDefinition();
beanDefinition.setBeanClass(beanClass);
beanDefinition.setLazyInit(false);
-String id = element.getAttribute("id");
+String id = resolveAttribute(element, "id", parserContext);
if (StringUtils.isEmpty(id) && required) {
-String generatedBeanName = element.getAttribute("name");
+String generatedBeanName = resolveAttribute(element, "name",
parserContext);
if (StringUtils.isEmpty(generatedBeanName)) {
if (ProtocolConfig.class.equals(beanClass)) {
generatedBeanName = "dubbo";
} else {
-generatedBeanName = element.getAttribute("interface");
+generatedBeanName = resolveAttribute(element, "interface",
parserContext);
}
}
if (StringUtils.isEmpty(generatedBeanName)) {
@@ -121,21 +122,21 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
}
}
} else if (ServiceBean.class.equals(beanClass)) {
-String className = element.getAttribute("class");
+String className = resolveAttribute(element, "class",
parserContext);
if (StringUtils.isNotEmpty(className)) {
RootBeanDefinition classDefinition = new RootBeanDefinition();
classDefinition.setBeanClass(ReflectUtils.forName(className));
classDefinition.setLazyInit(false);
-parseProperties(element.getChildNodes(), classDefinition);
+parseProperties(element.getChildNodes(), classDefinition,
parserContext);
beanDefinition.getPropertyValues().addPropertyValue("ref", new
BeanDefinitionHolder(classDefinition, id + "Impl"));
}
-} else if(ReferenceBean.class.equals(beanClass)){
-String interfaceClassName = element.getAttribute("interface");
-if(StringUtils.isNotEmpty(interfaceClassName)){
+} else if (ReferenceBean.class.equals(beanClass)) {
+String interfaceClassName = resolveAttribute(element, "interface",
parserContext);
+if (StringUtils.isNotEmpty(interfaceClassName)) {
Class interfaceClass =
ReflectUtils.forName(interfaceClassName);
beanDefinition.setTargetType(interfaceClass);
}
-}else if (ProviderConfig.class.equals(beanClass)) {
+} else if (ProviderConfig.class.equals(beanClass)) {
parseNested(element, parserContext, ServiceBean.class, true,
"service", "provider", id, beanDefinition);
} else if (ConsumerConfig.
[dubbo] branch master updated: [Dubbo-5978] fix nacos-registry dubbo.registry.group no effect (#5997)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new acd6e87 [Dubbo-5978] fix nacos-registry dubbo.registry.group no
effect (#5997)
acd6e87 is described below
commit acd6e87ddeba5ea2a491b04799cd55e2dce2541f
Author: Huangxuny1
AuthorDate: Tue Apr 28 17:03:19 2020 +0800
[Dubbo-5978] fix nacos-registry dubbo.registry.group no effect (#5997)
* register and subscriber with group name
* polish
---
.../apache/dubbo/registry/nacos/NacosRegistry.java | 50 --
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index a13fa88..187da71 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.registry.nacos;
+import com.alibaba.nacos.api.common.Constants;
import com.google.common.collect.Lists;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
@@ -138,7 +139,8 @@ public class NacosRegistry extends FailbackRegistry {
execute(namingService -> {
Set serviceNames = getServiceNames(url, null);
for (String serviceName : serviceNames) {
-List instances =
namingService.getAllInstances(serviceName);
+List instances =
namingService.getAllInstances(serviceName,
+getUrl().getParameter(GROUP_KEY,
Constants.DEFAULT_GROUP));
urls.addAll(buildURLs(url, instances));
}
});
@@ -149,7 +151,14 @@ public class NacosRegistry extends FailbackRegistry {
public void doRegister(URL url) {
final String serviceName = getServiceName(url);
final Instance instance = createInstance(url);
-execute(namingService -> namingService.registerInstance(serviceName,
instance));
+/**
+ * namingService.registerInstance with {@link
org.apache.dubbo.registry.support.AbstractRegistry#registryUrl}
+ * default {@link DEFAULT_GROUP}
+ *
+ * in https://github.com/apache/dubbo/issues/5978
+ */
+execute(namingService -> namingService.registerInstance(serviceName,
+getUrl().getParameter(GROUP_KEY, Constants.DEFAULT_GROUP),
instance));
}
@Override
@@ -157,7 +166,10 @@ public class NacosRegistry extends FailbackRegistry {
execute(namingService -> {
String serviceName = getServiceName(url);
Instance instance = createInstance(url);
-namingService.deregisterInstance(serviceName, instance.getIp(),
instance.getPort());
+namingService.deregisterInstance(serviceName,
+getUrl().getParameter(GROUP_KEY, Constants.DEFAULT_GROUP),
+instance.getIp()
+, instance.getPort());
});
}
@@ -166,8 +178,8 @@ public class NacosRegistry extends FailbackRegistry {
Set serviceNames = getServiceNames(url, listener);
//Set corresponding serviceNames for easy search later
-if(isServiceNamesWithCompatibleMode(url)){
-for(String serviceName:serviceNames){
+if (isServiceNamesWithCompatibleMode(url)) {
+for (String serviceName : serviceNames) {
NacosInstanceManageUtil.setCorrespondingServiceNames(serviceName, serviceNames);
}
}
@@ -183,9 +195,15 @@ public class NacosRegistry extends FailbackRegistry {
/**
* Get all instances with serviceNames to avoid instance
overwrite and but with empty instance mentioned
* in https://github.com/apache/dubbo/issues/5885 and
https://github.com/apache/dubbo/issues/5899
+ *
+ * namingService.getAllInstances with {@link
org.apache.dubbo.registry.support.AbstractRegistry#registryUrl}
+ * default {@link DEFAULT_GROUP}
+ *
+ * in https://github.com/apache/dubbo/issues/5978
*/
for (String serviceName : serviceNames) {
-List instances =
namingService.getAllInstances(serviceName);
+List instances =
namingService.getAllInstances(serviceName,
+getUrl().getParameter(GROUP_KEY,
Constants.DEFAULT_GROUP));
NacosInstanceManageUtil.initOrRefreshServiceInstanceList(serviceName,
instances);
allCorrespondingInstanc
[dubbo] branch master updated: @Reference和@Service Naming issues (#6074)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 78aeadc @Reference和@Service Naming issues (#6074)
78aeadc is described below
commit 78aeadc48348f5b36862db6a16adf8226d23a2f4
Author: Mercy Ma
AuthorDate: Tue Apr 28 11:25:04 2020 +0800
@Reference和@Service Naming issues (#6074)
* Polish apache/dubbo#6007 : [Discussion] @Reference和@Service Naming issues
* Polish apache/dubbo#6007 : [Discussion] @Reference和@Service Naming issues
* Polish apache/dubbo#6007 : [Discussion] @Reference和@Service Naming issues
---
.../{Reference.java => DubboReference.java}| 24 +++
.../annotation/{Service.java => DubboService.java} | 11 ---
.../apache/dubbo/config/annotation/Reference.java | 21 +++--
.../apache/dubbo/config/annotation/Service.java| 8 +++--
.../dubbo/common/utils/AnnotationUtilsTest.java| 20 ++--
.../ReferenceAnnotationBeanPostProcessor.java | 10 --
.../annotation/ServiceClassPostProcessor.java | 36 +-
.../consumer/test/TestConsumerConfiguration.java | 5 +--
.../annotation/provider/DefaultHelloService.java | 3 +-
9 files changed, 82 insertions(+), 56 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Reference.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
similarity index 97%
copy from
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Reference.java
copy to
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
index 4fd1a3f..985a4d9 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Reference.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
@@ -23,15 +23,15 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Reference
+ * An annotation used for referencing a Dubbo service
*
- * @export
- * @since 2.7.0
+ * @since 2.7.7
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface Reference {
+public @interface DubboReference {
+
/**
* Interface class, default value is void.class
*/
@@ -89,7 +89,7 @@ public @interface Reference {
/**
* Export an stub service for event dispatch, default value is false.
- *
+ *
* see org.apache.dubbo.rpc.Constants#STUB_EVENT_METHODS_KEY
*/
boolean stubevent() default false;
@@ -97,14 +97,14 @@ public @interface Reference {
/**
* Whether to reconnect if connection is lost, if not specify, reconnect
is enabled by default, and the interval
* for retry connecting is 2000 ms
- *
+ *
* see org.apache.dubbo.remoting.Constants#DEFAULT_RECONNECT_PERIOD
*/
String reconnect() default "";
/**
* Whether to stick to the same node in the cluster, the default value is
false
- *
+ *
* see Constants#DEFAULT_CLUSTER_STICKY
*/
boolean sticky() default false;
@@ -131,7 +131,7 @@ public @interface Reference {
/**
* The callback instance limit peer connection
- *
+ *
* see org.apache.dubbo.rpc.Constants#DEFAULT_CALLBACK_INSTANCES
*/
int callbacks() default 0;
@@ -158,14 +158,14 @@ public @interface Reference {
/**
* Service invocation retry times
- *
+ *
* see Constants#DEFAULT_RETRIES
*/
int retries() default 2;
/**
* Load balance strategy, legal values include: random, roundrobin,
leastactive
- *
+ *
* see Constants#DEFAULT_LOADBALANCE
*/
String loadbalance() default "";
@@ -207,14 +207,14 @@ public @interface Reference {
/**
* Filters for service invocation
- *
+ *
* see Filter
*/
String[] filter() default {};
/**
* Listeners for service exporting and unexporting
- *
+ *
* see ExporterListener
*/
String[] listener() default {};
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Service.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboService.java
similarity index 97%
copy from
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Service.java
copy to
dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboService.java
index 425814d..3b27d04 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Service.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboService.java
@@ -28,15 +28,15 @@ import static
org.apache.dubbo.common.constants.CommonConstants.DEFAU
[dubbo] branch master updated: Polish apache/dubbo#5793 : jdk11, No application config found or it's not a valid config! (#6071)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 692d753 Polish apache/dubbo#5793 : jdk11, No application config found
or it's not a valid config! (#6071)
692d753 is described below
commit 692d7530e09e14a87ebed6608d4d21cb5634e39f
Author: Mercy Ma
AuthorDate: Tue Apr 28 09:04:23 2020 +0800
Polish apache/dubbo#5793 : jdk11, No application config found or it's not a
valid config! (#6071)
---
dubbo-common/pom.xml | 23 +++
dubbo-dependencies-bom/pom.xml | 8
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
index 2ac4880..44d9fab 100644
--- a/dubbo-common/pom.xml
+++ b/dubbo-common/pom.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
4.0.0
org.apache.dubbo
@@ -66,21 +67,11 @@
commons-io
commons-io
+
+
+javax.annotation
+javax.annotation-api
+
-
-
-javax.annotation
-
-[1.11,)
-
-
-
-javax.annotation
-javax.annotation-api
-1.3.1
-
-
-
-
\ No newline at end of file
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 916bdd4..9bf5a1c 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -110,6 +110,7 @@
0.12.0
4.0.38
3.6.0
+1.3.2
3.1.0
9.4.11.v20180605
1.1.0.Final
@@ -328,6 +329,13 @@
protobuf-java-util
${protobuf-java_version}
+
+
+javax.annotation
+javax.annotation-api
+${javax_annotation-api_version}
+
+
javax.servlet
javax.servlet-api
[dubbo] branch master updated: [Refactor] Rename the class name of ServiceAnnotationBeanPostProcessor (#6070)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 7e43315 [Refactor] Rename the class name of ServiceAnnotationBeanPostProcessor (#6070) 7e43315 is described below commit 7e43315cd62a47803d786a1a04002203a4512d4e Author: Mercy Ma AuthorDate: Mon Apr 27 16:10:05 2020 +0800 [Refactor] Rename the class name of ServiceAnnotationBeanPostProcessor (#6070) * Polish apache/dubbo#4830 : [Refactor] Rename the class name of ServiceAnnotationBeanPostProcessor * Polish apache/dubbo#4830 : Remove unused import --- .../ServiceAnnotationBeanPostProcessor.java| 491 + ...ocessor.java => ServiceClassPostProcessor.java} | 32 +- .../ServiceAnnotationTestConfiguration2.java | 115 + .../annotation/ServiceClassPostProcessorTest.java | 95 4 files changed, 231 insertions(+), 502 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java index 08a0965..3c9457c 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessor.java @@ -16,83 +16,23 @@ */ package org.apache.dubbo.config.spring.beans.factory.annotation; -import org.apache.dubbo.common.logger.Logger; -import org.apache.dubbo.common.logger.LoggerFactory; -import org.apache.dubbo.common.utils.ArrayUtils; -import org.apache.dubbo.config.MethodConfig; -import org.apache.dubbo.config.annotation.Method; import org.apache.dubbo.config.annotation.Service; -import org.apache.dubbo.config.spring.ServiceBean; -import org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener; -import org.apache.dubbo.config.spring.context.annotation.DubboClassPathBeanDefinitionScanner; -import org.springframework.beans.BeansException; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.factory.BeanClassLoaderAware; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanDefinitionHolder; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.RuntimeBeanReference; -import org.springframework.beans.factory.config.SingletonBeanRegistry; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; -import org.springframework.beans.factory.support.BeanNameGenerator; -import org.springframework.beans.factory.support.ManagedList; -import org.springframework.context.EnvironmentAware; -import org.springframework.context.ResourceLoaderAware; -import org.springframework.context.annotation.AnnotationBeanNameGenerator; -import org.springframework.context.annotation.AnnotationConfigUtils; -import org.springframework.context.annotation.ClassPathBeanDefinitionScanner; -import org.springframework.context.annotation.ConfigurationClassPostProcessor; -import org.springframework.core.annotation.AnnotationAttributes; -import org.springframework.core.env.Environment; -import org.springframework.core.io.ResourceLoader; -import org.springframework.core.type.filter.AnnotationTypeFilter; -import org.springframework.util.CollectionUtils; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; -import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; import java.util.Set; -import static com.alibaba.spring.util.AnnotatedBeanDefinitionRegistryUtils.registerBeans; -import static com.alibaba.spring.util.ObjectUtils.of; -import static org.apache.dubbo.config.spring.beans.factory.annotation.ServiceBeanNameBuilder.create; -import static org.apache.dubbo.config.spring.util.DubboAnnotationUtils.resolveServiceInterfaceClass; -import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition; -import static org.springframework.context.annotation.AnnotationConfigUtils.CONFIGURATION_BEAN_NAME_GENERATOR; -import sta
[dubbo] branch master updated: [Enhancement] Take the "name" property of Dubbo Config as Spring Bean If its "id" property is blank[Enhancement] Take the "name" property of Dubbo Config as Spring Bean
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new e956171 [Enhancement] Take the "name" property of Dubbo Config as
Spring Bean If its "id" property is blank[Enhancement] Take the "name" property
of Dubbo Config as Spring Bean If its "id" property is blank (#6063)
e956171 is described below
commit e9561717bbd1623f6189ec8735173d6a10062a4a
Author: Mercy Ma
AuthorDate: Sun Apr 26 17:08:56 2020 +0800
[Enhancement] Take the "name" property of Dubbo Config as Spring Bean If
its "id" property is blank[Enhancement] Take the "name" property of Dubbo
Config as Spring Bean If its "id" property is blank (#6063)
* Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for
Apache License
* Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for
Apache License
* Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for
Apache License
* Polish apache/dubbo#6051 : [Enhancement] Take the "name" property of
Dubbo Config as Spring Bean If its "id" property is blank
* Polish apache/dubbo#6051 : [Enhancement] Take the "name" property of
Dubbo Config as Spring Bean If its "id" property is blank
---
.../dubbo/config/spring/context/annotation/EnableDubboConfigTest.java | 3 +--
.../dubbo-config-spring/src/test/resources/META-INF/config.properties | 1 -
.../src/test/resources/META-INF/dubbo-provider.properties | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
index d3c969d..5817185 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
@@ -107,9 +107,8 @@ public class EnableDubboConfigTest {
Map protocolConfigs =
context.getBeansOfType(ProtocolConfig.class);
for (Map.Entry entry :
protocolConfigs.entrySet()) {
-String beanName = entry.getKey();
ProtocolConfig protocol = entry.getValue();
-Assert.assertEquals(beanName, protocol.getName());
+Assert.assertEquals(protocol, context.getBean(protocol.getName(),
ProtocolConfig.class));
}
// asserts aliases
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/config.properties
b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/config.properties
index aa79925..22d06ae 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/config.properties
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/config.properties
@@ -14,7 +14,6 @@ dubbo.module.name = dubbo-demo-module
dubbo.registry.address = zookeeper://192.168.99.100:32770
## protocol
-dubbo.protocol.id = dubbo
dubbo.protocol.name = dubbo
dubbo.protocol.port = 20880
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo-provider.properties
b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo-provider.properties
index 812044c..0cbed90 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo-provider.properties
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo-provider.properties
@@ -19,7 +19,6 @@ dubbo.registry.id = my-registry
dubbo.registry.address = N/A
###
-dubbo.protocol.id = dubbo
dubbo.protocol.name = dubbo
dubbo.protocol.port = 12345
dubbo.monitor.address=N/A
\ No newline at end of file
[dubbo] branch master updated: [Enhancement] Adding a build tools module for Apache License (#6060)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new 9769a1d [Enhancement] Adding a build tools module for Apache License (#6060) 9769a1d is described below commit 9769a1dc7e27830d51b4b2bd35bb349618e7bdaa Author: Mercy Ma AuthorDate: Sun Apr 26 16:19:23 2020 +0800 [Enhancement] Adding a build tools module for Apache License (#6060) * Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for Apache License * Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for Apache License * Polish apache/dubbo#6058 : [Enhancement] Adding a build tools module for Apache License --- codestyle/checkstyle.xml | 5 dubbo-build-tools/pom.xml | 25 .../src/main/resources/checkstyle-header.txt | 16 + .../dubbo/config/ConfigCenterConfigTest.java | 26 ++--- .../apache/dubbo/demo/consumer/Application.java| 26 ++--- .../demo/consumer/comp/DemoServiceComponent.java | 27 ++ .../apache/dubbo/demo/provider/Application.java| 26 ++--- .../dubbo/demo/provider/DemoServiceImpl.java | 26 ++--- .../apache/dubbo/demo/consumer/Application.java| 26 ++--- .../apache/dubbo/demo/provider/Application.java| 26 ++--- .../qos/legacy/service/generic/DemoException.java | 26 ++--- .../qos/legacy/service/generic/DemoService.java| 26 ++--- .../legacy/service/generic/DemoServiceImpl.java| 26 ++--- .../legacy/service/generic/GenericServiceTest.java | 26 ++--- .../dubbo/qos/legacy/service/generic/User.java | 26 ++--- .../registry/nacos/NacosServiceDiscovery.java | 3 ++- .../org/apache/dubbo/remoting/IdleSensible.java| 27 ++ .../dubbo/rpc/protocol/grpc/GrpcProtocol.java | 3 ++- pom.xml| 20 +++- 19 files changed, 225 insertions(+), 187 deletions(-) diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml index f15260f..050fbed 100644 --- a/codestyle/checkstyle.xml +++ b/codestyle/checkstyle.xml @@ -7,6 +7,11 @@ + + + + + diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml new file mode 100644 index 000..761cb2a --- /dev/null +++ b/dubbo-build-tools/pom.xml @@ -0,0 +1,25 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +org.apache.dubbo +dubbo-build-tools +1.0.0 +jar + \ No newline at end of file diff --git a/dubbo-build-tools/src/main/resources/checkstyle-header.txt b/dubbo-build-tools/src/main/resources/checkstyle-header.txt new file mode 100644 index 000..d973dce --- /dev/null +++ b/dubbo-build-tools/src/main/resources/checkstyle-header.txt @@ -0,0 +1,16 @@ +/* + * 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. + */ \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java index 6221d6e..fcba6fa 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java @@ -1,20 +1,18 @@ /* - * 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
[dubbo] branch master updated: set reference bean definition target type (#5710)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 2ccd50f set reference bean definition target type (#5710)
2ccd50f is described below
commit 2ccd50f0780c619f353d8d4ede1ab0647cbe2733
Author: mooseen
AuthorDate: Fri Apr 24 14:49:31 2020 +0800
set reference bean definition target type (#5710)
Co-authored-by: quzijing
---
.../dubbo/config/spring/schema/DubboBeanDefinitionParser.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
index 9c5d9c1..1cf027a 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/schema/DubboBeanDefinitionParser.java
@@ -129,7 +129,13 @@ public class DubboBeanDefinitionParser implements
BeanDefinitionParser {
parseProperties(element.getChildNodes(), classDefinition);
beanDefinition.getPropertyValues().addPropertyValue("ref", new
BeanDefinitionHolder(classDefinition, id + "Impl"));
}
-} else if (ProviderConfig.class.equals(beanClass)) {
+} else if(ReferenceBean.class.equals(beanClass)){
+String interfaceClassName = element.getAttribute("interface");
+if(StringUtils.isNotEmpty(interfaceClassName)){
+Class interfaceClass =
ReflectUtils.forName(interfaceClassName);
+beanDefinition.setTargetType(interfaceClass);
+}
+}else if (ProviderConfig.class.equals(beanClass)) {
parseNested(element, parserContext, ServiceBean.class, true,
"service", "provider", id, beanDefinition);
} else if (ConsumerConfig.class.equals(beanClass)) {
parseNested(element, parserContext, ReferenceBean.class, false,
"reference", "consumer", id, beanDefinition);
[dubbo-spring-boot-project] branch master updated: Fix #692
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new f6251cb Fix #692
f6251cb is described below
commit f6251cb11716b076bd57de19e9f82077c106b649
Author: Mercy Ma
AuthorDate: Mon Apr 13 14:41:02 2020 +0800
Fix #692
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e4859b6..924f308 100644
--- a/README.md
+++ b/README.md
@@ -200,7 +200,7 @@ public interface DemoService {
name: dubbo-auto-configure-consumer-sample
```
-If `DubboProviderDemo` works well, please mark sure `DubboProviderDemo` is
started.
+If `DubboProviderDemo` works well, please make sure `DubboProviderDemo` is
started.
More details, please refer to [Samples](dubbo-spring-boot-samples).
[dubbo-spring-boot-project] branch 2.7.x updated (3828941 -> 9ff9277)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 3828941 Merge 2.7.6 (#689) add c4077b4 2.7.x (#627) add 4cb036d 链接bug修复 (#625) add f23f348 fix link from Chinese README to the English one (#624) add bd3b731 [Release] 2.7.5 (#644) (#650) add c4699b1 [Release] 2.7.5 (#644) (#651) add 238a9e6 Update README.md add 4ffc83e Update README_CN.md add 557b17a fix 无法映射到 dubbo.registries (#656) add b6b6f41 update README.md (#662) add cb51fdd update dubbo-spring-boot-actuator/README.md (#667) add b5f0b30 update dubbo-spring-boot-autoconfigure/README.md (#669) add 214d982 update README_CN.md (#663) add 5df8600 Use HTTPS instead of HTTP to resolve dependencies (#675) add 62fcb62 update dubbo-spring-boot-autoconfigure/README.md (#671) add a07f2e1 Document Correction (#677) add effdbf1 README: Remove duplicated badges (#686) add 9ff9277 Merge branch 'master' into 2.7.x No new revisions were added by this update. Summary of changes: README.md| 16 ++-- README_CN.md | 6 +++--- dubbo-spring-boot-parent/pom.xml | 1 + pom.xml | 4 ++-- 4 files changed, 12 insertions(+), 15 deletions(-)
svn commit: r38771 - in /dev/dubbo/dubbo-spring-boot/2.7.6: ./ apache-dubbo-spring-boot-project-2.7.6-source-release.zip apache-dubbo-spring-boot-project-2.7.6-source-release.zip.asc apache-dubbo-spri
Author: mercyblitz Date: Wed Apr 1 14:40:37 2020 New Revision: 38771 Log: Prepare for Dubbo Spring Boot 2.7.6 RC1 Added: dev/dubbo/dubbo-spring-boot/2.7.6/ dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip (with props) dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.asc dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.sha512 Added: dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip == Binary file - no diff available. Propchange: dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.asc == --- dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.asc (added) +++ dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.asc Wed Apr 1 14:40:37 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAl6EpSYACgkQp/UI79po +tPWQNA//Wz7e7nBb1jC3h4qiRzQ6XygS5GV/YvQUosBLwqXT30mcRzbbM6js76+Z +58LVRVG8U4Ap/5wdtkvt4F0e9upPUpU4wht0ksOct5G+y8DYOKuW6jfBlfGiF7i/ +KVO6E3VJ5kni6tZAxIzV/efHvLjXmWPs8vAW/t6aPlWMckfpw18PuBN1Cpu4GXRb +u97Yt/GKsbJQf4t8T0u5gy7Xp0jzCiqAhQAAlcbkuObLWmYvI2Jx4FRmiwzJvM0J +Mqtx8QqF4nEySiJPG9xUd4zjmM/qOOzxbD82JV5dtabwKG+n5xgOjF0SZRExJvSi +lAZMJLhyvYDicTLSfHrNH47ireEqoj3iosaWwVs4tidTTSKE56ZlckxRfbGH7ZM3 +dkgmDvkn1X3q9RsrMJZ/AHlDcUCP59lCB/STBnFdmwesyqlaz8A/H1CuQpmoN4GJ +YDj21Yy1G8bSz2tVfpVU17Kme3kxKg8459oqzzBFkY/ICKk3BQkYSL4e97q8M+W5 +J0UoO+uzVoI4COgk1aBFcvm45g61TntOx+btdNBFVUOy7anmF/yEyO5GtRQNVky2 +dcCaZGLh6V+E/aCFbkaw6UYGtZtixq4vVH/mZnMR/GTL1d+rSsWXtwKNeOU4tLpC +9X4USzCAVqMNgFdGeHmyHGwbvgnYoh97ZFI66EWrzbFt+srBdlM= +=ut3d +-END PGP SIGNATURE- Added: dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.sha512 == --- dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.sha512 (added) +++ dev/dubbo/dubbo-spring-boot/2.7.6/apache-dubbo-spring-boot-project-2.7.6-source-release.zip.sha512 Wed Apr 1 14:40:37 2020 @@ -0,0 +1 @@ +52936ec6ac344b4493403292e2e25fa773d8c7af47311722f3a7059c5425318d746715b83e397bf6996693fcff775e8ea6f20643fa388cfff62b42806f9b1e45 apache-dubbo-spring-boot-project-2.7.6-source-release.zip
[dubbo-spring-boot-project] branch master updated: README: Remove duplicated badges (#686)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new effdbf1 README: Remove duplicated badges (#686) effdbf1 is described below commit effdbf1fba36c28f342003a5d1434a76d2cdbcd8 Author: Dinesh Bolkensteyn AuthorDate: Wed Apr 1 16:08:56 2020 +0200 README: Remove duplicated badges (#686) The duplication got introduced in https://github.com/apache/dubbo-spring-boot-project/commit/c4077b40d848d582724000d973eeda8283b5735b by mistake I believe. --- README.md | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index ea5cab2..e894966 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,7 @@ [](https://codecov.io/gh/apache/dubbo-spring-boot-project)  -[Apache Dubbo](https://github.com/apache/dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it also provides -[](https://codecov.io/gh/apache/ubbo-spring-boot-project) - - +[Apache Dubbo](https://github.com/apache/dubbo) Spring Boot Project makes it easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo as RPC Framework. What's more, it also provides: * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., annotation-driven, auto configuration, externalized configuration). * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, health checks, externalized configuration).
[dubbo] branch master updated: [Dubbo-5871][Dubbo-5885][Dubbo-5899] Fix nacos registry not work bug since 2.7.6 (#5902)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new cb12928 [Dubbo-5871][Dubbo-5885][Dubbo-5899] Fix nacos registry not
work bug since 2.7.6 (#5902)
cb12928 is described below
commit cb12928a710a34142e8c6a9b93e532239906a69e
Author: Lei Jiang <53557551+lad...@users.noreply.github.com>
AuthorDate: Tue Mar 31 14:55:10 2020 +0800
[Dubbo-5871][Dubbo-5885][Dubbo-5899] Fix nacos registry not work bug since
2.7.6 (#5902)
* TO FIX bug with https://github.com/apache/dubbo/issues/5885
* Avoid instances overwriting problem with different service name
* Avoid duplicated service name which will lead duplicated subscribe
* Resolve Conflicts
* Resolve conflicts
* Use ConcurrentHashMap instead of HashMap
* Resolve conflicts
* Resolve conflicts
* Resolve conflicts
* Format codes
---
.../apache/dubbo/registry/nacos/NacosRegistry.java | 76 +++---
.../nacos/util/NacosInstanceManageUtil.java| 67 +++
2 files changed, 135 insertions(+), 8 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index 070c526..a13fa88 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.registry.nacos;
+import com.google.common.collect.Lists;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.common.logger.Logger;
@@ -25,6 +26,7 @@ import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.common.utils.UrlUtils;
import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.registry.Registry;
+import org.apache.dubbo.registry.nacos.util.NacosInstanceManageUtil;
import org.apache.dubbo.registry.support.FailbackRegistry;
import com.alibaba.nacos.api.exception.NacosException;
@@ -162,20 +164,62 @@ public class NacosRegistry extends FailbackRegistry {
@Override
public void doSubscribe(final URL url, final NotifyListener listener) {
Set serviceNames = getServiceNames(url, listener);
+
+//Set corresponding serviceNames for easy search later
+if(isServiceNamesWithCompatibleMode(url)){
+for(String serviceName:serviceNames){
+
NacosInstanceManageUtil.setCorrespondingServiceNames(serviceName, serviceNames);
+}
+}
+
doSubscribe(url, listener, serviceNames);
}
private void doSubscribe(final URL url, final NotifyListener listener,
final Set serviceNames) {
execute(namingService -> {
-List instances = new LinkedList();
-for (String serviceName : serviceNames) {
-instances.addAll(namingService.getAllInstances(serviceName));
-subscribeEventListener(serviceName, url, listener);
+if (isServiceNamesWithCompatibleMode(url)) {
+List allCorrespondingInstanceList =
Lists.newArrayList();
+
+/**
+ * Get all instances with serviceNames to avoid instance
overwrite and but with empty instance mentioned
+ * in https://github.com/apache/dubbo/issues/5885 and
https://github.com/apache/dubbo/issues/5899
+ */
+for (String serviceName : serviceNames) {
+List instances =
namingService.getAllInstances(serviceName);
+
NacosInstanceManageUtil.initOrRefreshServiceInstanceList(serviceName,
instances);
+allCorrespondingInstanceList.addAll(instances);
+}
+notifySubscriber(url, listener, allCorrespondingInstanceList);
+for (String serviceName : serviceNames) {
+subscribeEventListener(serviceName, url, listener);
+}
+} else {
+List instances = new LinkedList();
+for (String serviceName : serviceNames) {
+
instances.addAll(namingService.getAllInstances(serviceName));
+notifySubscriber(url, listener, instances);
+subscribeEventListener(serviceName, url, listener);
+}
}
-notifySubscriber(url, listener, instances);
+
});
}
+/**
+ * Since 2.7.6 the legacy service name will be added to serviceNames
+ * to fix bug with https://github.com/apache/dubbo/issues/5442
+ *
+ * @
[dubbo] branch master updated: Add test cases for NacosMetadataReport (#5776)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4307c2b Add test cases for NacosMetadataReport (#5776)
4307c2b is described below
commit 4307c2b2fab47e7bbcb78c254cfe07c921c98f16
Author: Lei Jiang <53557551+lad...@users.noreply.github.com>
AuthorDate: Fri Mar 6 15:35:07 2020 +0800
Add test cases for NacosMetadataReport (#5776)
* Add more test case for NacosMetadataReport
* Modify codes
* Modify comments
* Add more test case and modify codes
* Modify codes
---
.../store/nacos/NacosMetadataReportTest.java | 158 +++--
1 file changed, 143 insertions(+), 15 deletions(-)
diff --git
a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportTest.java
b/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportTest.java
index c441635..88fc75a 100644
---
a/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportTest.java
+++
b/dubbo-metadata/dubbo-metadata-report-nacos/src/test/java/org/apache/dubbo/metadata/store/nacos/NacosMetadataReportTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.metadata.store.nacos;
+import com.alibaba.nacos.api.exception.NacosException;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.metadata.definition.ServiceDefinitionBuilder;
@@ -25,13 +26,17 @@ import
org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
import com.alibaba.nacos.api.config.ConfigService;
import com.google.gson.Gson;
+import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
+import
org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
@@ -40,19 +45,63 @@ import static
org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
//FIXME: waiting for embedded Nacos suport, then we can open the switch.
@Disabled("https://github.com/alibaba/nacos/issues/1188;)
public class NacosMetadataReportTest {
+
private static final String SESSION_TIMEOUT_KEY = "session";
+
private static final String TEST_SERVICE =
"org.apache.dubbo.metadata.store.nacos.NacosMetadata4TstService";
+
private NacosMetadataReport nacosMetadataReport;
+
private NacosMetadataReportFactory nacosMetadataReportFactory;
+
private ConfigService configService;
-private static final String NACOS_GROUP = "zzz";
+private static final String NACOS_GROUP = "metadata_test";
+
+/**
+ * timeout(ms) for nacos session
+ */
+private static final int SESSION_TIMEOUT = 15 * 1000;
+
+/**
+ * timeout(ms) for query operation on nacos
+ */
+private static final int NACOS_READ_TIMEOUT = 5 * 1000;
+
+/**
+ * interval(ms) to make nacos cache refresh
+ */
+private static final int INTERVAL_TO_MAKE_NACOS_REFRESH = 1000;
+
+/**
+ * version for test
+ */
+private static final String VERSION = "1.0.0";
+
+/**
+ * group for test
+ */
+private static final String METADATA_GROUP = null;
+
+/**
+ * application name for test
+ */
+private static final String APPLICATION_NAME = "nacos-metdata-report-test";
+
+/**
+ * revision for test
+ */
+private static final String REVISION = "90980";
+
+/**
+ * protocol for test
+ */
+private static final String PROTOCOL = "xxx";
@BeforeEach
public void setUp() {
-// timeout in 15 seconds.
URL url = URL.valueOf("nacos://127.0.0.1:8848?group=" + NACOS_GROUP)
-.addParameter(SESSION_TIMEOUT_KEY, 15000);
+.addParameter(SESSION_TIMEOUT_KEY, SESSION_TIMEOUT);
nacosMetadataReportFactory = new NacosMetadataReportFactory();
this.nacosMetadataReport = (NacosMetadataReport)
nacosMetadataReportFactory.createMetadataReport(url);
this.configService = nacosMetadataReport.buildConfigService(url);
@@ -62,31 +111,109 @@ public class NacosMetadataReportTest {
public void tearDown() throws Exception {
}
+
@Test
public void testStoreProvider() throws Exception {
-String version = "1.0.0";
-String group =
[dubbo] branch master updated: [Feature] To support the application choose the preferred network interface (#5801)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 0313381 [Feature] To support the application choose the preferred
network interface (#5801)
0313381 is described below
commit 03133818ad657584d30d4ca04e280cdf836849ac
Author: Mercy Ma
AuthorDate: Fri Feb 28 16:12:23 2020 +0800
[Feature] To support the application choose the preferred network interface
(#5801)
* Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh
* Polish /apache/dubbo#5297 : Only one of the multiple registration centers
using nacos can register
* Polish /apache/dubbo#5442 :
VERSION_KEY和GROUP_KEY为空时，注册到NACOS的服务名与alibaba实现不一致，导致无法消费
* Polish /apache/dubbo#5442 : Merge upstream/master
* Polish /apache/dubbo##5239 : Mock字段注入异常
* Polish /apache/dubbo##5239 : Mock字段注入异常
* Polish /apache/dubbo#5770 : Removing the interinal JDK API from
FileSystemDynamicConfiguration
* Polish /apache/dubbo#5771 : [Enhancement] Refactor the APT test-cases
implementation of dubbo-metadata-processor in Java 9+
* Bugfix for the test-cases
* Polish /apache/dubbo#5779 : Rename the local variables
* Add FieldUtils
* Polish /apache/dubbo#5795 : [Feature] To support the application choose
the preferred network interface
* Polish /apache/dubbo#5442 :
VERSION_KEY和GROUP_KEY为空时，注册到NACOS的服务名与alibaba实现不一致，导致无法消费
---
.../dubbo/common/constants/CommonConstants.java| 10 ++
.../org/apache/dubbo/common/utils/FieldUtils.java | 148 +
.../org/apache/dubbo/common/utils/NetUtils.java| 140 ++-
.../apache/dubbo/common/utils/FieldUtilsTest.java | 88
...onfigDefaultPropertyValueBeanPostProcessor.java | 14 +-
.../apache/dubbo/registry/nacos/NacosRegistry.java | 5 +-
6 files changed, 363 insertions(+), 42 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index b0082e8..7924109 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.common.constants;
+import java.net.NetworkInterface;
import java.util.concurrent.ExecutorService;
import java.util.regex.Pattern;
@@ -199,6 +200,15 @@ public interface CommonConstants {
String HOST_KEY = "host";
String PORT_KEY = "port";
String DUBBO_IP_TO_BIND = "DUBBO_IP_TO_BIND";
+
+/**
+ * The property name for {@link NetworkInterface#getDisplayName() the name
of network interface} that
+ * the Dubbo application prefers
+ *
+ * @since 2.7.6
+ */
+String DUBBO_PREFERRED_NETWORK_INTERFACE =
"dubbo.network.interface.preferred";
+
@Deprecated
String SHUTDOWN_WAIT_SECONDS_KEY = "dubbo.service.shutdown.wait.seconds";
String SHUTDOWN_WAIT_KEY = "dubbo.service.shutdown.wait";
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/FieldUtils.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/FieldUtils.java
new file mode 100644
index 000..a619239
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/FieldUtils.java
@@ -0,0 +1,148 @@
+/*
+ * 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 org.apache.dubbo.common.utils;
+
+import java.lang.reflect.Field;
+
+import static org.apache.dubbo.common.utils.ClassUtils.getAllInheritedTypes;
+
+/**
+ * The utilities class for Java Reflection {@link Field}
+ *
+ * @since 2.7.6
+ */
+public interface FieldUtils {
+
+/**
+ * Like the {@link Class#getDeclaredField(String)} method without throwing
any {@link Exception}
+ *
+ * @param declaredClass the declared class
+ * @param fieldName the name of {@link Field}
+ * @r
[dubbo-spring-boot-project] branch master updated (5df8600 -> 62fcb62)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 5df8600 Use HTTPS instead of HTTP to resolve dependencies (#675) add 62fcb62 update dubbo-spring-boot-autoconfigure/README.md (#671) No new revisions were added by this update. Summary of changes: dubbo-spring-boot-autoconfigure/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[dubbo-spring-boot-project] branch master updated: update README_CN.md (#663)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/master by this push:
new 214d982 update README_CN.md (#663)
214d982 is described below
commit 214d9823983abe81b8993243f972305d70aaa8a7
Author: withthewind
AuthorDate: Tue Feb 25 16:51:52 2020 +0800
update README_CN.md (#663)
---
README_CN.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README_CN.md b/README_CN.md
index d7a93be..9a21043 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -244,9 +244,9 @@ public interface DemoService {
如果您在使用 Dubbo Spring Boot 中遇到任何问题或者有什么建议? 我们非常需要您的支持!
--
如果您需要升级版本，请提前阅读[发布公告](https://github.com/dubbo/dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
+-
如果您需要升级版本，请提前阅读[发布公告](https://github.com/apache/dubbo-spring-boot-project/releases)，了解最新的特性和问题修复。
- 如果您遇到任何问题 ，您可以订阅 [Dubbo 用户邮件列表](mailto:dubbo+subscr...@googlegroups.com)。
-- 问题反馈，您可以在
[issues](https://github.com/dubbo/dubbo-spring-boot-project/issues) 提出您遇到的使用问题。
+- 问题反馈，您可以在
[issues](https://github.com/apache/dubbo-spring-boot-project/issues) 提出您遇到的使用问题。
[dubbo-spring-boot-project] branch master updated: update dubbo-spring-boot-autoconfigure/README.md (#669)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new b5f0b30 update dubbo-spring-boot-autoconfigure/README.md (#669) b5f0b30 is described below commit b5f0b3039c6c38deddd6e575d35be8e4f0f96b55 Author: withthewind AuthorDate: Tue Feb 25 16:49:55 2020 +0800 update dubbo-spring-boot-autoconfigure/README.md (#669) --- dubbo-spring-boot-autoconfigure/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 800f230..e92ddd7 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -6,7 +6,7 @@ ## Content -1. [Main Content](https://github.com/dubbo/dubbo-spring-boot-project) +1. [Main Content](https://github.com/apache/dubbo-spring-boot-project) 2. [Integrate with Maven](#integrate-with-maven) 3. [Auto Configuration](#auto-configuration) 4. [Externalized Configuration](#externalized-configuration)
[dubbo-spring-boot-project] branch master updated: update dubbo-spring-boot-actuator/README.md (#667)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/master by this push: new cb51fdd update dubbo-spring-boot-actuator/README.md (#667) cb51fdd is described below commit cb51fddd839df5651fc3d46ce3e0762842cbb6dd Author: withthewind AuthorDate: Tue Feb 25 16:49:43 2020 +0800 update dubbo-spring-boot-actuator/README.md (#667) --- dubbo-spring-boot-actuator/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 92269c5..a2bd650 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -6,7 +6,7 @@ ## Content -1. [Main Content](https://github.com/dubbo/dubbo-spring-boot-project) +1. [Main Content](https://github.com/apache/dubbo-spring-boot-project) 2. [Integrate with Maven](#integrate-with-maven) 3. [Health Checks](#health-checks) 4. [Endpoints](#endpoints)
[dubbo-spring-boot-project] branch master updated (557b17a -> b6b6f41)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git. from 557b17a fix 无法映射到 dubbo.registries (#656) add b6b6f41 update README.md (#662) No new revisions were added by this update. Summary of changes: README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[dubbo] branch master updated: 2.7.6 Refactor + Enhancement (#5772)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 56f1c18 2.7.6 Refactor + Enhancement (#5772)
56f1c18 is described below
commit 56f1c1861b146a37e3d49541781532fa2757f0e8
Author: Mercy Ma
AuthorDate: Fri Feb 21 19:56:32 2020 +0800
2.7.6 Refactor + Enhancement (#5772)
* Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh
* Polish /apache/dubbo#5297 : Only one of the multiple registration centers
using nacos can register
* Polish /apache/dubbo#5442 :
VERSION_KEY和GROUP_KEY为空时，注册到NACOS的服务名与alibaba实现不一致，导致无法消费
* Polish /apache/dubbo#5442 : Merge upstream/master
* Polish /apache/dubbo##5239 : Mock字段注入异常
* Polish /apache/dubbo##5239 : Mock字段注入异常
* Polish /apache/dubbo#5770 : Removing the interinal JDK API from
FileSystemDynamicConfiguration
* Polish /apache/dubbo#5771 : [Enhancement] Refactor the APT test-cases
implementation of dubbo-metadata-processor in Java 9+
* Bugfix for the test-cases
---
.../file/FileSystemDynamicConfiguration.java | 18 ++---
.../AbstractAnnotationProcessingTest.java | 25 ---
.../AnnotationProcessingTestProcessor.java | 76 ++
.../processing/CompilerInvocationInterceptor.java | 45 +
.../org/apache/dubbo/metadata/tools/Compiler.java | 6 +-
.../apache/dubbo/metadata/tools/TestProcessor.java | 8 ++-
pom.xml| 2 +-
7 files changed, 150 insertions(+), 30 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
index 44209f6..2544c05 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/file/FileSystemDynamicConfiguration.java
@@ -27,7 +27,6 @@ import org.apache.dubbo.common.function.ThrowableFunction;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.common.utils.StringUtils;
-import com.sun.nio.file.SensitivityWatchEventModifier;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -527,20 +526,15 @@ public class FileSystemDynamicConfiguration extends
AbstractDynamicConfiguration
}
private static Integer initDelay(WatchEvent.Modifier[] modifiers) {
-return Stream.of(modifiers)
-.filter(modifier -> modifier instanceof
SensitivityWatchEventModifier)
-.map(SensitivityWatchEventModifier.class::cast)
-.map(SensitivityWatchEventModifier::sensitivityValueInSeconds)
-.max(Integer::compareTo)
-.orElse(null);
+if (isBasedPoolingWatchService()) {
+return 2;
+} else {
+return null;
+}
}
private static WatchEvent.Modifier[] initWatchEventModifiers() {
-if (isBasedPoolingWatchService()) { // If based on
PollingWatchService, High sensitivity will be used
-return of(SensitivityWatchEventModifier.HIGH);
-} else {
-return of();
-}
+return of();
}
/**
diff --git
a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/AbstractAnnotationProcessingTest.java
b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/AbstractAnnotationProcessingTest.java
index 1a8f9dd..d224f07 100644
---
a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/AbstractAnnotationProcessingTest.java
+++
b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/AbstractAnnotationProcessingTest.java
@@ -17,10 +17,10 @@
package org.apache.dubbo.metadata.annotation.processing;
import org.apache.dubbo.metadata.annotation.processing.util.TypeUtils;
-import org.apache.dubbo.metadata.tools.Compiler;
-import org.apache.dubbo.metadata.tools.TestProcessor;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.TypeElement;
@@ -28,7 +28,6 @@ import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import java.io.IOException;
import java.lang.annotation.Annotation;
-import java.util.LinkedHashSet;
import java.util.Set;
/**
@@ -36,8 +35,11 @@ imp
[dubbo] branch master updated: Polish #5442 (#5760)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new ff14005 Polish #5442 (#5760)
ff14005 is described below
commit ff14005475dc2e6e1e8c5081abb61e65faef464c
Author: Mercy Ma
AuthorDate: Thu Feb 20 11:46:14 2020 +0800
Polish #5442 (#5760)
* Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh
* Polish /apache/dubbo#5297 : Only one of the multiple registration centers
using nacos can register
* Polish /apache/dubbo#5442 :
VERSION_KEY和GROUP_KEY为空时，注册到NACOS的服务名与alibaba实现不一致，导致无法消费
* Polish /apache/dubbo#5442 : Merge upstream/master
* Polish /apache/dubbo##5239 : Mock字段注入异常
* Polish /apache/dubbo##5239 : Mock字段注入异常
---
.../apache/dubbo/config/AbstractMethodConfig.java | 18
.../org/apache/dubbo/config/ServiceConfigBase.java | 11 ++---
.../apache/dubbo/registry/nacos/NacosRegistry.java | 52 ++
3 files changed, 50 insertions(+), 31 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
index 4f5e849..3a7b1a5 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
@@ -62,7 +62,7 @@ public abstract class AbstractMethodConfig extends
AbstractConfig {
/**
* The name of mock class which gets called when a service fails to execute
- *
+ *
* note that: the mock doesn't support on the provider side，and the mock
is executed when a non-business exception
* occurs after a remote service call
*/
@@ -157,18 +157,20 @@ public abstract class AbstractMethodConfig extends
AbstractConfig {
}
public void setMock(String mock) {
-if (mock == null) {
-return;
-}
this.mock = mock;
}
-public void setMock(Boolean mock) {
+/**
+ * Set the property "mock"
+ *
+ * @param mock the value of mock
+ * @since 2.7.6
+ */
+public void setMock(Object mock) {
if (mock == null) {
-setMock((String) null);
-} else {
-setMock(mock.toString());
+return;
}
+this.setMock(String.valueOf(mock));
}
public String getMerger() {
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
index 9810207..4a7c282 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
@@ -209,8 +209,8 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
}
public void completeCompoundConfigs() {
- super.completeCompoundConfigs(provider);
- if(provider != null) {
+super.completeCompoundConfigs(provider);
+if (provider != null) {
if (protocols == null) {
setProtocols(provider.getProtocols());
}
@@ -223,8 +223,9 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
if (StringUtils.isEmpty(protocolIds)) {
setProtocolIds(provider.getProtocolIds());
}
- }
+}
}
+
private void convertProtocolIdsToProtocols() {
computeValidProtocolIds();
if (StringUtils.isEmpty(protocolIds)) {
@@ -361,12 +362,12 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
}
@Override
-public void setMock(Boolean mock) {
+public void setMock(String mock) {
throw new IllegalArgumentException("mock doesn't support on provider
side");
}
@Override
-public void setMock(String mock) {
+public void setMock(Object mock) {
throw new IllegalArgumentException("mock doesn't support on provider
side");
}
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index f26cf0c..2e61d22 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -27,6 +27,13 @@ import org.apache.dubbo.registry.NotifyListener;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.support.FailbackRegistry;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.alibaba.nacos.api
[dubbo] branch master updated: nacos_registry_bugfix (#5212)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 0e30d76 nacos_registry_bugfix (#5212)
0e30d76 is described below
commit 0e30d7649598c086103ecf38d4fe1d6c3eca7887
Author: 张志勇
AuthorDate: Wed Feb 19 16:02:24 2020 +0800
nacos_registry_bugfix (#5212)
Co-authored-by: Xin Wang
---
.../apache/dubbo/registry/nacos/NacosRegistry.java| 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
index 894ea52..f26cf0c 100644
---
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
+++
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistry.java
@@ -398,16 +398,17 @@ public class NacosRegistry extends FailbackRegistry {
private void subscribeEventListener(String serviceName, final URL url,
final NotifyListener listener)
throws NacosException {
-if (!nacosListeners.containsKey(serviceName)) {
-EventListener eventListener = event -> {
-if (event instanceof NamingEvent) {
-NamingEvent e = (NamingEvent) event;
-notifySubscriber(url, listener, e.getInstances());
-}
-};
-namingService.subscribe(serviceName, eventListener);
-nacosListeners.put(serviceName, eventListener);
+if (nacosListeners.containsKey(serviceName)) {
+logger.info("nacosListeners contains serviceName:" + serviceName);
}
+EventListener eventListener = event -> {
+if (event instanceof NamingEvent) {
+NamingEvent e = (NamingEvent) event;
+notifySubscriber(url, listener, e.getInstances());
+}
+};
+namingService.subscribe(serviceName, eventListener);
+nacosListeners.put(serviceName, eventListener);
}
/**
[dubbo] branch master updated: [#5297] Only one of the multiple registration centers using nacos can register (#5756)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new eda947a [#5297] Only one of the multiple registration centers using
nacos can register (#5756)
eda947a is described below
commit eda947a8dfb276dff4362e6a5cbabcbb8fe9c97f
Author: Mercy Ma
AuthorDate: Wed Feb 19 14:30:33 2020 +0800
[#5297] Only one of the multiple registration centers using nacos can
register (#5756)
* Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh
* Polish /apache/dubbo#5297 : Only one of the multiple registration centers
using nacos can register
---
.../main/java/org/apache/dubbo/config/RegistryConfig.java | 2 +-
.../DubboConfigDefaultPropertyValueBeanPostProcessor.java | 3 ++-
.../spring/context/annotation/EnableDubboConfigTest.java | 2 +-
.../dubbo/registry/support/AbstractRegistryFactory.java | 15 +--
.../apache/dubbo/registry/nacos/NacosRegistryFactory.java | 5 +
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
index 127be17..3b868fe 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
@@ -213,7 +213,7 @@ public class RegistryConfig extends AbstractConfig {
URL url = URL.valueOf(address);
setUsername(url.getUsername());
setPassword(url.getPassword());
-updateIdIfAbsent(url.getProtocol());
+//updateIdIfAbsent(url.getProtocol());
updateProtocolIfAbsent(url.getProtocol());
updatePortIfAbsent(url.getPort());
updateParameters(url.getParameters());
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
index 0a33910..c513b13 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
@@ -26,6 +26,7 @@ import
org.springframework.beans.factory.support.MergedBeanDefinitionPostProcess
import org.springframework.beans.factory.support.RootBeanDefinition;
import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
import org.springframework.core.Ordered;
+import org.springframework.core.PriorityOrdered;
import javax.annotation.PostConstruct;
import java.beans.PropertyDescriptor;
@@ -43,7 +44,7 @@ import static
org.springframework.util.ReflectionUtils.invokeMethod;
* @since 2.7.6
*/
public class DubboConfigDefaultPropertyValueBeanPostProcessor extends
GenericBeanPostProcessorAdapter
-implements MergedBeanDefinitionPostProcessor, Ordered {
+implements MergedBeanDefinitionPostProcessor, PriorityOrdered {
/**
* The bean name of {@link
DubboConfigDefaultPropertyValueBeanPostProcessor}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
index 3aabd80..d3c969d 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java
@@ -82,7 +82,7 @@ public class EnableDubboConfigTest {
Assertions.assertEquals("netty", consumerConfig.getClient());
// asserts aliases
-assertTrue(hasAlias(context,
"org.apache.dubbo.config.RegistryConfig#0", "zookeeper"));
+assertFalse(hasAlias(context,
"org.apache.dubbo.config.RegistryConfig#0", "zookeeper"));
assertFalse(hasAlias(context,
"org.apache.dubbo.config.MonitorConfig#0", "zookeeper"));
}
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java
index 7a3be4a..413c68f 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dub
[dubbo] branch master updated: Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh (#5753)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new f4af3de Polish /apache/dubbo#5745 : Increasing the stack size in the
start.sh (#5753)
f4af3de is described below
commit f4af3ded4b305423a79272843c6c8ea0207415b1
Author: Mercy Ma
AuthorDate: Tue Feb 18 12:36:55 2020 +0800
Polish /apache/dubbo#5745 : Increasing the stack size in the start.sh
(#5753)
---
.../src/main/resources/META-INF/assembly/bin/start.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
index 6994e7d..50c3a70 100755
---
a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
+++
b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
@@ -93,13 +93,13 @@ fi
# MaxInlineLevel=15 is the default since JDK 14 and can be removed once older
JDKs are no longer supported
BITS=`java -version 2>&1 | grep -i 64-bit`
-JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss256k
-XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled
-XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m
-XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly
-XX:CMSInitiatingOccupancyFraction=70 "
+JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss512k
-XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled
-XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m
-XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly
-XX:CMSInitiatingOccupancyFraction=70 "
if [ -n "$BITS" ]; then
JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*}
JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }')
if [ $JAVA_MAJOR_VERSION -ge 9 ] || ([ $JAVA_MAJOR_VERSION -ge 1 ] && [
$JAVA_MINOR_VERSION -ge 8 ]); then
- JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m
-Xss256k -XX:LargePageSizeInBytes=128m -XX:+DisableExplicitGC -XX:+UseG1GC
-XX:MaxGCPauseMillis=200 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25
-XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0
-XX:SurvivorRatio=8 -XX:G1ReservePercent=15 "
+ JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m
-Xss512k -XX:LargePageSizeInBytes=128m -XX:+DisableExplicitGC -XX:+UseG1GC
-XX:MaxGCPauseMillis=200 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25
-XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0
-XX:SurvivorRatio=8 -XX:G1ReservePercent=15 "
fi
else
JAVA_MEM_OPTS=" -server -Xms1g -Xmx1g -XX:${VM_ARGS}=128m
-XX:SurvivorRatio=2 -XX:+UseParallelGC "
[dubbo] branch master updated: [Optimization] To remove EnableDubboConfigBinding and EnableDubboConfigBindings (#5730)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new b99b383 [Optimization] To remove EnableDubboConfigBinding and
EnableDubboConfigBindings (#5730)
b99b383 is described below
commit b99b3837186b7fb7f68ae106b67cc42deeed18b9
Author: Mercy Ma
AuthorDate: Tue Feb 11 13:12:03 2020 +0800
[Optimization] To remove EnableDubboConfigBinding and
EnableDubboConfigBindings (#5730)
* Polish /apache/dubbo#5721 : [Enhancement] Setting the default IDs for
Dubbo's Config Beans
* Polish /apache/dubbo#5729 : [Optimization] To remove
EnableDubboConfigBinding and EnableDubboConfigBindings
---
.../DubboConfigBindingBeanPostProcessor.java | 234 -
.../annotation/DubboConfigBindingRegistrar.java| 215 ---
.../annotation/DubboConfigBindingsRegistrar.java | 71 ---
.../annotation/EnableDubboConfigBinding.java | 83
.../annotation/EnableDubboConfigBindings.java | 50 -
.../context/config/DubboConfigBeanCustomizer.java | 2 -
...pertyDefaultValueDubboConfigBeanCustomizer.java | 86
.../DubboConfigBindingBeanPostProcessorTest.java | 88
.../DubboConfigBindingRegistrarTest.java | 86
.../DubboConfigBindingsRegistrarTest.java | 60 --
.../java/org/apache/dubbo/rpc/RpcContextTest.java | 1 +
11 files changed, 1 insertion(+), 975 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessor.java
deleted file mode 100644
index 9b181cb..000
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessor.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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 org.apache.dubbo.config.spring.beans.factory.annotation;
-
-import org.apache.dubbo.common.utils.Assert;
-import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.config.AbstractConfig;
-import
org.apache.dubbo.config.spring.context.annotation.DubboConfigBindingRegistrar;
-import
org.apache.dubbo.config.spring.context.annotation.EnableDubboConfigBinding;
-import org.apache.dubbo.config.spring.context.config.DubboConfigBeanCustomizer;
-import
org.apache.dubbo.config.spring.context.properties.DefaultDubboConfigBinder;
-import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import
org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.springframework.core.env.Environment;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import static
org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors;
-
-/**
- * Dubbo Config Binding {@link BeanPostProcessor}
- *
- * @see EnableDubboConfigBinding
- * @see DubboConfigBindingRegistrar
- * @since 2.5.8
- */
-
-public class DubboConfigBindingBeanPostProcessor implements BeanPostProcessor,
ApplicationContextAware, InitializingBean
-, BeanDefinitionRegistryPostProcessor {
-
-p
[dubbo] branch master updated: Polish /apache/dubbo#5721 : [Enhancement] Setting the default IDs for Dubbo's Config Beans (#5725)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 60e72bf Polish /apache/dubbo#5721 : [Enhancement] Setting the default
IDs for Dubbo's Config Beans (#5725)
60e72bf is described below
commit 60e72bf5c91657dfae8106979cd00106e4764bab
Author: Mercy Ma
AuthorDate: Mon Feb 10 20:13:03 2020 +0800
Polish /apache/dubbo#5721 : [Enhancement] Setting the default IDs for
Dubbo's Config Beans (#5725)
---
...onfigDefaultPropertyValueBeanPostProcessor.java | 105 +
.../context/DubboBootstrapApplicationListener.java | 7 ++
...DubboLifecycleComponentApplicationListener.java | 7 ++
.../annotation/DubboComponentScanRegistrar.java| 20 +---
.../DubboConfigConfigurationRegistrar.java | 28 +-
.../DubboLifecycleComponentRegistrar.java | 3 +
.../spring/context/annotation/EnableDubbo.java | 1 -
.../context/annotation/EnableDubboLifecycle.java | 7 +-
...pertyDefaultValueDubboConfigBeanCustomizer.java | 3 +
.../schema/AnnotationBeanDefinitionParser.java | 22 +
.../dubbo/config/spring/util/DubboBeanUtils.java | 68 +
.../annotation/EnableDubboLifecycleTest.java | 56 ---
12 files changed, 206 insertions(+), 121 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
new file mode 100644
index 000..0a33910
--- /dev/null
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigDefaultPropertyValueBeanPostProcessor.java
@@ -0,0 +1,105 @@
+/*
+ * 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 org.apache.dubbo.config.spring.beans.factory.config;
+
+import org.apache.dubbo.config.AbstractConfig;
+
+import com.alibaba.spring.beans.factory.config.GenericBeanPostProcessorAdapter;
+import org.springframework.beans.BeansException;
+import
org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import
org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
+import org.springframework.core.Ordered;
+
+import javax.annotation.PostConstruct;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import static com.alibaba.spring.util.ObjectUtils.of;
+import static org.springframework.aop.support.AopUtils.getTargetClass;
+import static org.springframework.beans.BeanUtils.getPropertyDescriptor;
+import static org.springframework.util.ReflectionUtils.invokeMethod;
+
+/**
+ * The {@link BeanPostProcessor} class for the default property value of
{@link AbstractConfig Dubbo's Config Beans}
+ *
+ * @since 2.7.6
+ */
+public class DubboConfigDefaultPropertyValueBeanPostProcessor extends
GenericBeanPostProcessorAdapter
+implements MergedBeanDefinitionPostProcessor, Ordered {
+
+/**
+ * The bean name of {@link
DubboConfigDefaultPropertyValueBeanPostProcessor}
+ */
+public static final String BEAN_NAME =
"dubboConfigDefaultPropertyValueBeanPostProcessor";
+
+protected void processBeforeInitialization(AbstractConfig dubboConfigBean,
String beanName) throws BeansException {
+// [Feature] https://github.com/apache/dubbo/issues/5721
+setBeanNameAsDefaultValue(dubboConfigBean, "id", beanName);
+setBeanNameAsDefaultValue(dubboConfigBean, "name", beanName);
+}
+
+@Override
+public void postProcessMergedBeanDefinition(RootBeanDefinition
beanDefinition, Class beanType, String beanName) {
+// DO NOTHING
+
[dubbo] branch master updated: Polish /apache/dubbo#5446 : With @Reference, Aop does not work (#5717)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 95bd350 Polish /apache/dubbo#5446 : With @Reference, Aop does not
work (#5717)
95bd350 is described below
commit 95bd350cae95c0f738eade5ba78ad9827586135d
Author: Mercy Ma
AuthorDate: Fri Feb 7 12:19:35 2020 +0800
Polish /apache/dubbo#5446 : With @Reference, Aop does not work (#5717)
* Polish /apache/dubbo#5446 : With @Reference, Aop does not work
* Polish /apache/dubbo#5718 : [Infrastructure] Uprade
com.alibaba.spring:spring-context-support 1.0.6
* Polish /apache/dubbo#5446 : With @Reference, Aop does not work
---
dubbo-config/dubbo-config-spring/pom.xml | 7 +
.../ReferenceAnnotationBeanPostProcessor.java | 147 +
.../ReferenceAnnotationBeanPostProcessorTest.java | 37 --
dubbo-dependencies-bom/pom.xml | 2 +-
4 files changed, 127 insertions(+), 66 deletions(-)
diff --git a/dubbo-config/dubbo-config-spring/pom.xml
b/dubbo-config/dubbo-config-spring/pom.xml
index e88fc2d..74cc929 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -57,6 +57,13 @@
spring-context-support
+
+
+org.aspectj
+aspectjweaver
+1.9.5
+test
+
org.apache.dubbo
dubbo-registry-default
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
index e3f23ec..3fea6ec 100644
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
+++
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
@@ -30,7 +30,6 @@ import
org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.core.annotation.AnnotationAttributes;
@@ -57,7 +56,7 @@ import static org.springframework.util.StringUtils.hasText;
* @since 2.5.7
*/
public class ReferenceAnnotationBeanPostProcessor extends
AbstractAnnotationBeanPostProcessor implements
-ApplicationContextAware, ApplicationListener {
+ApplicationContextAware, ApplicationListener
{
/**
* The bean name of {@link ReferenceAnnotationBeanPostProcessor}
@@ -72,15 +71,15 @@ public class ReferenceAnnotationBeanPostProcessor extends
AbstractAnnotationBean
private final ConcurrentMap> referenceBeanCache =
new ConcurrentHashMap<>(CACHE_SIZE);
-private final ConcurrentHashMap
localReferenceBeanInvocationHandlerCache =
-new ConcurrentHashMap<>(CACHE_SIZE);
-
private final ConcurrentMap> injectedFieldReferenceBeanCache =
new ConcurrentHashMap<>(CACHE_SIZE);
private final ConcurrentMap> injectedMethodReferenceBeanCache =
new ConcurrentHashMap<>(CACHE_SIZE);
+private final ConcurrentMap
referencedBeanInvocationHandlersCache =
+new ConcurrentHashMap<>();
+
private ApplicationContext applicationContext;
/**
@@ -135,11 +134,13 @@ public class ReferenceAnnotationBeanPostProcessor extends
AbstractAnnotationBean
ReferenceBean referenceBean =
buildReferenceBeanIfAbsent(referenceBeanName, attributes, injectedType);
-registerReferenceBean(referencedBeanName, referenceBean, attributes,
injectedType);
+boolean localServiceBean = isLocalServiceBean(referencedBeanName,
referenceBean, attributes);
+
+registerReferenceBean(referencedBeanName, referenceBean, attributes,
localServiceBean, injectedType);
cacheInjectedReferenceBean(referenceBean, injectedElement);
-return getOrCreateProxy(referencedBeanName, referenceBeanName,
attributes, injectedType);
+return getOrCreateProxy(referencedBeanName, referenceBean,
localServiceBean, injectedType);
}
/**
@@ -148,18 +149,19 @@ public class ReferenceAnnotationBeanPostProcessor extends
AbstractAnnotationBean
* @param referencedBeanName The name of bean that annotated Dubbo's
{@link Service @Service} in the Spring {@link ApplicationContext}
*
[dubbo] branch master updated: publish event when exported. (#5715)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new ee6 publish event when exported. (#5715)
ee6 is described below
commit ee6296732aa7ee3c2e913210ff077ee9e0d5
Author: ken.lj
AuthorDate: Thu Feb 6 11:19:02 2020 +0800
publish event when exported. (#5715)
---
.../main/java/org/apache/dubbo/config/ServiceConfigBase.java | 4
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 10 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
index 3d73efd..9810207 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
@@ -92,10 +92,6 @@ public abstract class ServiceConfigBase extends
AbstractServiceConfig {
setMethods(MethodConfig.constructMethodConfig(service.methods()));
}
-public void exported() {
-
-}
-
@Deprecated
private static List
convertProviderToProtocol(List providers) {
if (CollectionUtils.isEmpty(providers)) {
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index aaeb851..83e1127 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -204,6 +204,13 @@ public class ServiceConfig extends ServiceConfigBase
{
} else {
doExport();
}
+
+exported();
+}
+
+public void exported() {
+// dispatch a ServiceConfigExportedEvent since 2.7.4
+dispatch(new ServiceConfigExportedEvent(this));
}
private void checkAndUpdateSubConfigs() {
@@ -290,9 +297,6 @@ public class ServiceConfig extends ServiceConfigBase {
path = interfaceName;
}
doExportUrls();
-
-// dispatch a ServiceConfigExportedEvent since 2.7.4
-dispatch(new ServiceConfigExportedEvent(this));
}
@SuppressWarnings({"unchecked", "rawtypes"})
