Skip to content

Fix it for Dubbo 3.0 #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chickenlj merged 12 commits into from
Mar 1, 2021
Merged

Fix it for Dubbo 3.0 #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dc8b8c7
ignore some modules
AlbumenJ Feb 26, 2021
78f181e
ignore some modules
AlbumenJ Feb 26, 2021
0a6cc4a
tempolarly add hessian-lite dependency
AlbumenJ Feb 27, 2021
40063f0
ignore some modules
AlbumenJ Feb 27, 2021
733aaf4
ignore some modules
AlbumenJ Feb 27, 2021
de06875
ignore some modules
AlbumenJ Feb 27, 2021
ac02014
fix impl in spi-compatible
AlbumenJ Feb 27, 2021
1dbdb12
ignore some modules
AlbumenJ Feb 28, 2021
bf9aea3
remove hessian
AlbumenJ Feb 28, 2021
c3db86f
ignore some modules
AlbumenJ Feb 28, 2021
42584e1
fix 3.0 protocol
AlbumenJ Mar 1, 2021
a4cf39c
Recover pom in generic impl
AlbumenJ Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dubbo-samples-cache/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-cloud-native/dubbo-call-sc/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-cloud-native/dubbo-call-scdubbo/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-cloud-native/sc-call-dubbo/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
4 changes: 2 additions & 2 deletions ...nfigcenter-multiprotocol/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public static void generateDubboPropertiesForGlobal() {
"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);

Expand Down
4 changes: 2 additions & 2 deletions ...es-configcenter-multiprotocol/src/main/resources/multi-protocols-config-center.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions ...bo-samples-configcenter-multiprotocol/src/main/resources/spring/configcenter-provider.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion dubbo-samples-configcenter/dubbo-samples-configcenter-xml/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-consul/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-default-config/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-generic/dubbo-samples-generic-impl/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-governance/dubbo-samples-applevel-override/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-http/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-merge/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-monitor/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-protostuff/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
8 changes: 7 additions & 1 deletion ...mpatible/src/main/java/org/apache/dubbo/samples/basic/spi/CompatibleServiceDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public class CompatibleServiceDiscovery implements ServiceDiscovery {

protected ServiceInstance serviceInstance;

protected URL url;

//@Override
public ServiceInstance getLocalInstance() {
return serviceInstance;
Expand All @@ -44,7 +46,7 @@ public void update(ServiceInstance serviceInstance) throws RuntimeException {

@Override
public void initialize(URL registryURL) throws Exception {

url = registryURL;
}

@Override
Expand All @@ -62,4 +64,8 @@ public Set<String> getServices() {
return null;
}

@Override
public URL getUrl() {
return url;
}
}
4 changes: 2 additions & 2 deletions dubbo-samples-spi-compatible/src/test/java/org/apache/dubbo/samples/basic/DemoServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void testRegisteredProviders() throws Exception {
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
Expand All @@ -52,7 +52,7 @@ public void testRegisteredConsumers() throws Exception {
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
Expand Down
2 changes: 1 addition & 1 deletion dubbo-samples-thrift/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-validation/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-webservice/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
2 changes: 1 addition & 1 deletion dubbo-samples-zipkin/case-versions.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*