You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by li...@apache.org on 2021/03/01 08:33:05 UTC
[dubbo-samples] branch master updated: Fix it for Dubbo 3.0 (#280)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 5cea6d0 Fix it for Dubbo 3.0 (#280)
5cea6d0 is described below
commit 5cea6d00d56723e716056e51d066cf9e69eda847
Author: Albumen Kevin <jh...@hotmail.com>
AuthorDate: Mon Mar 1 16:32:58 2021 +0800
Fix it for Dubbo 3.0 (#280)
---
dubbo-samples-cache/case-versions.conf | 2 +-
dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf | 2 +-
dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf | 2 +-
dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf | 2 +-
.../main/java/org/apache/dubbo/samples/configcenter/ZKTools.java | 4 ++--
.../src/main/resources/multi-protocols-config-center.properties | 4 ++--
.../src/main/resources/spring/configcenter-provider.xml | 4 ++--
.../dubbo-samples-configcenter-xml/case-versions.conf | 2 +-
dubbo-samples-consul/case-versions.conf | 2 +-
dubbo-samples-default-config/case-versions.conf | 2 +-
.../dubbo-samples-generic-impl/case-versions.conf | 2 +-
.../dubbo-samples-applevel-override/case-versions.conf | 2 +-
dubbo-samples-http/case-versions.conf | 2 +-
dubbo-samples-merge/case-versions.conf | 2 +-
dubbo-samples-monitor/case-versions.conf | 2 +-
dubbo-samples-protostuff/case-versions.conf | 2 +-
.../dubbo/samples/basic/spi/CompatibleServiceDiscovery.java | 8 +++++++-
.../test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java | 4 ++--
dubbo-samples-thrift/case-versions.conf | 2 +-
dubbo-samples-validation/case-versions.conf | 2 +-
dubbo-samples-webservice/case-versions.conf | 2 +-
dubbo-samples-zipkin/case-versions.conf | 2 +-
22 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/dubbo-samples-cache/case-versions.conf b/dubbo-samples-cache/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-cache/case-versions.conf
+++ b/dubbo-samples-cache/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf b/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf
index ada35bd..10c9f4b 100644
--- a/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf
+++ b/dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# SpringBoot/SpringCloud app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring-boot.version=1.*
\ No newline at end of file
diff --git a/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf b/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf
index ada35bd..10c9f4b 100644
--- a/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf
+++ b/dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# SpringBoot/SpringCloud app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring-boot.version=1.*
\ No newline at end of file
diff --git a/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf b/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf
index ada35bd..10c9f4b 100644
--- a/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf
+++ b/dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# SpringBoot/SpringCloud app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring-boot.version=1.*
\ No newline at end of file
diff --git a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
index 0434a13..af50719 100644
--- a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
+++ b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
@@ -42,8 +42,8 @@ public class ZKTools {
"dubbo.registry.address=zookeeper://" + zookeeperHost + ":2181\n" +
"dubbo.protocols.dubbo1.name=dubbo\n" +
"dubbo.protocols.dubbo1.port=20991\n" +
- "dubbo.protocols.hessian1.name=hessian\n" +
- "dubbo.protocols.hessian1.port=8089";
+ "dubbo.protocols.dubbo2.name=dubbo\n" +
+ "dubbo.protocols.dubbo2.port=20992";
System.out.println(str);
diff --git a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/multi-protocols-config-center.properties b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/multi-protocols-config-center.properties
index 0087bbe..1bb5b31 100644
--- a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/multi-protocols-config-center.properties
+++ b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/multi-protocols-config-center.properties
@@ -17,6 +17,6 @@
dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.protocols.dubbo1.name=dubbo
dubbo.protocols.dubbo1.port=20991
-dubbo.protocols.hessian1.name=hessian
-dubbo.protocols.hessian1.port=8089
+dubbo.protocols.dubbo2.name=dubbo
+dubbo.protocols.dubbo2.port=20992
diff --git a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/spring/configcenter-provider.xml b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/spring/configcenter-provider.xml
index bfbb644..8d5865b 100644
--- a/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/spring/configcenter-provider.xml
+++ b/dubbo-samples-configcenter/dubbo-samples-configcenter-multiprotocol/src/main/resources/spring/configcenter-provider.xml
@@ -28,9 +28,9 @@
<dubbo:config-center address="zookeeper://${zookeeper.address:127.0.0.1}:2181"/>
<bean id="demoService" class="org.apache.dubbo.samples.configcenter.impl.DemoServiceImpl"/>
- <dubbo:service protocol="hessian1" interface="org.apache.dubbo.samples.configcenter.api.DemoService"
- ref="demoService"/>
<dubbo:service protocol="dubbo1" interface="org.apache.dubbo.samples.configcenter.api.DemoService"
ref="demoService"/>
+ <dubbo:service protocol="dubbo2" interface="org.apache.dubbo.samples.configcenter.api.DemoService"
+ ref="demoService"/>
</beans>
diff --git a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/case-versions.conf b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/case-versions.conf
+++ b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-consul/case-versions.conf b/dubbo-samples-consul/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-consul/case-versions.conf
+++ b/dubbo-samples-consul/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-default-config/case-versions.conf b/dubbo-samples-default-config/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-default-config/case-versions.conf
+++ b/dubbo-samples-default-config/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf b/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf
+++ b/dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-governance/dubbo-samples-applevel-override/case-versions.conf b/dubbo-samples-governance/dubbo-samples-applevel-override/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-governance/dubbo-samples-applevel-override/case-versions.conf
+++ b/dubbo-samples-governance/dubbo-samples-applevel-override/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-http/case-versions.conf b/dubbo-samples-http/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-http/case-versions.conf
+++ b/dubbo-samples-http/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-merge/case-versions.conf b/dubbo-samples-merge/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-merge/case-versions.conf
+++ b/dubbo-samples-merge/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-monitor/case-versions.conf b/dubbo-samples-monitor/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-monitor/case-versions.conf
+++ b/dubbo-samples-monitor/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-protostuff/case-versions.conf b/dubbo-samples-protostuff/case-versions.conf
index d0c0cc4..5398c8e 100644
--- a/dubbo-samples-protostuff/case-versions.conf
+++ b/dubbo-samples-protostuff/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# SpringBoot app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring-boot.version=2.*
diff --git a/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleServiceDiscovery.java b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleServiceDiscovery.java
index 0b6a914..4cfc665 100644
--- a/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleServiceDiscovery.java
+++ b/dubbo-samples-spi-compatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleServiceDiscovery.java
@@ -27,6 +27,8 @@ public class CompatibleServiceDiscovery implements ServiceDiscovery {
protected ServiceInstance serviceInstance;
+ protected URL url;
+
//@Override
public ServiceInstance getLocalInstance() {
return serviceInstance;
@@ -44,7 +46,7 @@ public class CompatibleServiceDiscovery implements ServiceDiscovery {
@Override
public void initialize(URL registryURL) throws Exception {
-
+ url = registryURL;
}
@Override
@@ -62,4 +64,8 @@ public class CompatibleServiceDiscovery implements ServiceDiscovery {
return null;
}
+ @Override
+ public URL getUrl() {
+ return url;
+ }
}
diff --git a/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
index 073ef53..ce7ee69 100644
--- a/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
+++ b/dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
@@ -43,7 +43,7 @@ public class DemoServiceIT {
List<String> decodedUrls = urls.stream().map(URL::decode).collect(Collectors.toList());
Assert.assertEquals(1, decodedUrls.size());
String url = decodedUrls.get(0);
- Assert.assertTrue(url.startsWith("compatible://"));
+ Assert.assertTrue(url.startsWith("compatible://") || url.startsWith("dubbo://"));
}
@Test
@@ -52,7 +52,7 @@ public class DemoServiceIT {
List<String> decodedUrls = urls.stream().map(URL::decode).collect(Collectors.toList());
Assert.assertFalse(decodedUrls.isEmpty());
String url = decodedUrls.get(0);
- Assert.assertTrue(url.startsWith("consumer://"));
+ Assert.assertTrue(url.startsWith("consumer://") || url.startsWith("dubbo://"));
}
@Test
diff --git a/dubbo-samples-thrift/case-versions.conf b/dubbo-samples-thrift/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-thrift/case-versions.conf
+++ b/dubbo-samples-thrift/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-validation/case-versions.conf b/dubbo-samples-validation/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-validation/case-versions.conf
+++ b/dubbo-samples-validation/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-webservice/case-versions.conf b/dubbo-samples-webservice/case-versions.conf
index 978f7e7..4f6e401 100644
--- a/dubbo-samples-webservice/case-versions.conf
+++ b/dubbo-samples-webservice/case-versions.conf
@@ -2,5 +2,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
diff --git a/dubbo-samples-zipkin/case-versions.conf b/dubbo-samples-zipkin/case-versions.conf
index 0e26c8b..581882b 100644
--- a/dubbo-samples-zipkin/case-versions.conf
+++ b/dubbo-samples-zipkin/case-versions.conf
@@ -20,5 +20,5 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
+dubbo.version=2.7*
spring.version=4.*, 5.*
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org