You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/11/23 02:39:19 UTC
[incubator-dubbo] 02/04: Fix small bugs find in UT
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 773d7f4474f9ff958fa51718c555f9ac5ffb23c3
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Nov 22 20:26:37 2018 +0800
Fix small bugs find in UT
---
.../src/main/java/org/apache/dubbo/config/AbstractConfig.java | 5 +++--
.../src/main/java/org/apache/dubbo/config/ApplicationConfig.java | 2 ++
.../src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java | 1 +
.../src/main/java/org/apache/dubbo/config/MetadataReportConfig.java | 2 ++
.../src/main/java/org/apache/dubbo/config/MethodConfig.java | 6 ++++++
.../src/main/java/org/apache/dubbo/config/MonitorConfig.java | 2 ++
.../src/main/java/org/apache/dubbo/config/ProtocolConfig.java | 1 +
.../src/main/java/org/apache/dubbo/config/RegistryConfig.java | 1 +
.../src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java | 5 +++++
.../src/test/java/org/apache/dubbo/config/ServiceConfigTest.java | 1 +
10 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index 0b5d86f..8030253 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -423,9 +423,10 @@ public abstract class AbstractConfig implements Serializable {
Object value = method.invoke(this);
String str = String.valueOf(value).trim();
if (value != null && str.length() > 0) {
- if (parameter != null && parameter.escaped()) {
+ // ignore escape, keep the original value.
+ /*if (parameter != null && parameter.escaped()) {
str = URL.encode(str);
- }
+ }*/
if (parameter != null && parameter.append()) {
String pre = String.valueOf(metaData.get(Constants.DEFAULT_KEY + "." + key));
if (pre != null && pre.length() > 0) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
index f4c529a..d14d78e 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
@@ -269,6 +269,8 @@ public class ApplicationConfig extends AbstractConfig {
this.shutwait = shutwait;
}
+ @Override
+ @Parameter(excluded = true)
public boolean isValid() {
return !StringUtils.isEmpty(name);
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
index 0b884cc..1a03863 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java
@@ -301,6 +301,7 @@ public class ConfigCenterConfig extends AbstractConfig {
}
@Override
+ @Parameter(excluded = true)
public boolean isValid() {
if (StringUtils.isEmpty(address) && StringUtils.isEmpty(env)) {
return false;
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
index 90c7fe0..87beb23 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java
@@ -127,6 +127,8 @@ public class MetadataReportConfig extends AbstractConfig {
}
+ @Override
+ @Parameter(excluded = true)
public boolean isValid() {
return StringUtils.isNotEmpty(address);
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
index b04cc83..48045d4 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java
@@ -236,7 +236,13 @@ public class MethodConfig extends AbstractMethodConfig {
this.serviceId = serviceId;
}
+ /**
+ * service and name must not be null.
+ *
+ * @return
+ */
@Override
+ @Parameter(excluded = true)
public String getPrefix() {
return Constants.DUBBO + "." + service
+ (StringUtils.isEmpty(serviceId) ? "" : ("." + serviceId))
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java
index a662256..3a95da2 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java
@@ -134,6 +134,8 @@ public class MonitorConfig extends AbstractConfig {
return interval;
}
+ @Override
+ @Parameter(excluded = true)
public boolean isValid() {
return StringUtils.isNotEmpty(address);
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
index 3e9fdcd..fe986b3 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
@@ -473,6 +473,7 @@ public class ProtocolConfig extends AbstractConfig {
}
@Override
+ @Parameter(excluded = true)
public boolean isValid() {
return StringUtils.isNotEmpty(name);
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
index 5e8015c..f96227a 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
@@ -355,6 +355,7 @@ public class RegistryConfig extends AbstractConfig {
}
@Override
+ @Parameter(excluded = true)
public boolean isValid() {
// empty protocol will default to 'dubbo'
return !StringUtils.isEmpty(address);
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 0b1840f..947a59f 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -50,11 +50,13 @@ public class ReferenceConfigTest {
rc.setInjvm(false);
try {
+ System.setProperty("java.net.preferIPv4Stack", "true");
demoService.export();
rc.get();
Assert.assertTrue(!Constants.LOCAL_PROTOCOL.equalsIgnoreCase(
rc.getInvoker().getUrl().getProtocol()));
} finally {
+ System.clearProperty("java.net.preferIPv4Stack");
demoService.unexport();
}
}
@@ -95,11 +97,14 @@ public class ReferenceConfigTest {
sc.setProtocol(protocol);
try {
+ System.setProperty("java.net.preferIPv4Stack", "true");
sc.export();
demoService = rc.get();
success = true;
} catch (Exception e) {
e.printStackTrace();
+ } finally {
+ System.clearProperty("java.net.preferIPv4Stack");
}
Assert.assertTrue(success);
Assert.assertNotNull(demoService);
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index 9ee5273..3ab73d2 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -75,6 +75,7 @@ public class ServiceConfigTest {
RegistryConfig registry = new RegistryConfig();
registry.setProtocol("mockprotocol2");
+ registry.setAddress("N/A");
ArgumentConfig argument = new ArgumentConfig();
argument.setIndex(0);