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 2020/03/12 15:40:18 UTC
[dubbo-samples] branch master updated: fix metadata assertion error
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 4973fd1 fix metadata assertion error
4973fd1 is described below
commit 4973fd15b8b7b52bbf03073e4c11c3054cf5c2a9
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Mar 12 23:39:57 2020 +0800
fix metadata assertion error
---
.../metadatareport/configcenter/MetadataConfigcenterProvider.java | 1 +
.../org/apache/dubbo/samples/metadatareport/configcenter/ZKTools.java | 2 +-
.../apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java | 4 ++--
.../dubbo/samples/metadatareport/local/annotation/MetadataIT.java | 2 +-
.../dubbo/samples/metadatareport/local/properties/MetadataIT.java | 2 +-
.../org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataConfigcenterProvider.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataConfigcenterProvider.java
index 935bc08..2c918ab 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataConfigcenterProvider.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataConfigcenterProvider.java
@@ -54,6 +54,7 @@ public class MetadataConfigcenterProvider {
@Bean
public ProviderConfig providerConfig() {
ProviderConfig providerConfig = new ProviderConfig();
+ providerConfig.setId("id"); //FIXME, spring bean id 'providerConfig' should not be used as dubbo id.
providerConfig.setTimeout(1000);
return providerConfig;
}
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/ZKTools.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/ZKTools.java
index bc79a75..a8be01e 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/ZKTools.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/java/org/apache/dubbo/samples/metadatareport/configcenter/ZKTools.java
@@ -57,7 +57,7 @@ public class ZKTools {
"dubbo.consumer.timeout=6000\n" +
"#global config for provider\n" +
"dubbo.protocol.port=20831\n" +
- "dubbo.provider.timeout=5000";
+ "dubbo.provider.id.timeout=5000";
System.out.println(str);
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
index 2d8a901..a706ffa 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/test/java/org/apache/dubbo/samples/metadatareport/configcenter/MetadataIT.java
@@ -105,7 +105,7 @@ public class MetadataIT {
Map<String, String> parameters = definition.getParameters();
Assert.assertEquals("provider", parameters.get("side"));
Assert.assertEquals("sayHello", parameters.get("methods"));
- Assert.assertEquals("1000", parameters.get("timeout"));
+ Assert.assertEquals("5000", parameters.get("timeout"));
Assert.assertEquals("1.1.1", parameters.get("version"));
Assert.assertEquals("d-test", parameters.get("group"));
Assert.assertEquals("100", parameters.get("threads"));
@@ -153,7 +153,7 @@ public class MetadataIT {
Assert.assertEquals("consumer", map.get("side"));
Assert.assertEquals("metadatareport-configcenter-consumer", map.get("application"));
Assert.assertEquals("sayHello", map.get("methods"));
- Assert.assertEquals("false", map.get("lazy"));
+ Assert.assertNull(map.get("lazy"));
Assert.assertEquals("false", map.get("sticky"));
Assert.assertEquals("1.1.1", map.get("version"));
Assert.assertEquals("d-test", map.get("group"));
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
index 30c004a..7d8a5e1 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-annotation/src/test/java/org/apache/dubbo/samples/metadatareport/local/annotation/MetadataIT.java
@@ -148,7 +148,7 @@ public class MetadataIT {
Assert.assertEquals("consumer", map.get("side"));
Assert.assertEquals("metadatareport-local-annotation-consumer", map.get("application"));
Assert.assertEquals("sayHello", map.get("methods"));
- Assert.assertEquals("false", map.get("lazy"));
+ Assert.assertNull(map.get("lazy"));
Assert.assertEquals("false", map.get("sticky"));
Assert.assertEquals("1.1.8", map.get("version"));
Assert.assertEquals("d-test", map.get("group"));
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
index 3e5a4ca..0f9fac6 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-properties/src/test/java/org/apache/dubbo/samples/metadatareport/local/properties/MetadataIT.java
@@ -138,7 +138,7 @@ public class MetadataIT {
Assert.assertEquals("consumer", map.get("side"));
Assert.assertEquals("metadatareport-local-properties-consumer", map.get("application"));
Assert.assertEquals("sayHello", map.get("methods"));
- Assert.assertEquals("false", map.get("lazy"));
+ Assert.assertNull(map.get("lazy"));
Assert.assertEquals("false", map.get("sticky"));
Assert.assertEquals(DemoService.class.getName(), map.get("interface"));
}
diff --git a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
index 1473eaa..e533c3a 100644
--- a/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
+++ b/java/dubbo-samples-metadata-report/dubbo-samples-metadata-report-local-xml/src/test/java/org/apache/dubbo/samples/metadatareport/local/xml/MetadataIT.java
@@ -138,7 +138,7 @@ public class MetadataIT {
Assert.assertEquals("consumer", map.get("side"));
Assert.assertEquals("metadatareport-local-xml-consumer2", map.get("application"));
Assert.assertEquals("sayHello", map.get("methods"));
- Assert.assertEquals("false", map.get("lazy"));
+ Assert.assertNull(map.get("lazy"));
Assert.assertEquals("false", map.get("sticky"));
Assert.assertEquals(DemoService.class.getName(), map.get("interface"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org