From d5914ef6ad3f1aac1bb01b03362da11bf9ec7328 Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Thu, 21 Feb 2019 15:30:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20issue=20#195:=20@Reference=20check=3D?= =?UTF-8?q?false=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/dubbo/config/annotation/Reference.java | 2 +- .../apache/dubbo/config/AbstractReferenceConfig.java | 10 +++++----- .../org/apache/dubbo/config/AbstractServiceConfig.java | 8 ++++---- .../org/apache/dubbo/config/annotation/Reference.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java index 4c1ca979a179..c8f25b3b423b 100644 --- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java +++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java @@ -43,7 +43,7 @@ boolean generic() default false; - boolean injvm() default false; + boolean injvm() default true; boolean check() default true; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java index 325b1f1790e8..093be8b23f02 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java @@ -36,12 +36,12 @@ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig { /** * Check if service provider exists, if not exists, it will be fast fail */ - protected Boolean check; + protected Boolean check = true; /** * Whether to eagle-init */ - protected Boolean init; + protected Boolean init = false; /** * Whether to use generic interface @@ -51,16 +51,16 @@ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig { /** * Whether to find reference's instance from the current JVM */ - protected Boolean injvm; + protected Boolean injvm = true; /** * Lazy create connection */ - protected Boolean lazy; + protected Boolean lazy = false; protected String reconnect; - protected Boolean sticky; + protected Boolean sticky = false; /** * Whether to support event in stub. diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java index 4fffd7552291..ac276447b4c6 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java @@ -47,7 +47,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig { /** * whether the service is deprecated */ - protected Boolean deprecated; + protected Boolean deprecated = false; /** * The time delay register service (milliseconds) @@ -57,7 +57,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig { /** * Whether to export the service */ - protected Boolean export; + protected Boolean export = true; /** * The service weight @@ -74,7 +74,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig { * after the service registered,and it needs to be enabled manually; if you want to disable the service, you also need * manual processing */ - protected Boolean dynamic; + protected Boolean dynamic = false; /** * Whether to use token @@ -99,7 +99,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig { /** * Whether to register */ - private Boolean register; + private Boolean register = true; /** * Warm up period diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java index 63e2cd5f1d15..75165c68db5f 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java @@ -73,7 +73,7 @@ /** * When enable, prefer to call local service in the same JVM if it's present, default value is false */ - boolean injvm() default false; + boolean injvm() default true; /** * Check if service provider is available during boot up, default value is true From 1a64581e8107e72e0ed8b1b43587c48bd62c0668 Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Thu, 21 Feb 2019 16:35:33 +0800 Subject: [PATCH 2/3] fix javadoc --- .../main/java/org/apache/dubbo/config/annotation/Reference.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java index 75165c68db5f..9aaea67fc666 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java @@ -71,7 +71,7 @@ boolean generic() default false; /** - * When enable, prefer to call local service in the same JVM if it's present, default value is false + * When enable, prefer to call local service in the same JVM if it's present, default value is true */ boolean injvm() default true; From cbc49fd6566a62ddf2fb00c0429848e09c056824 Mon Sep 17 00:00:00 2001 From: Ian Luo Date: Fri, 22 Feb 2019 10:30:23 +0800 Subject: [PATCH 3/3] fix unit test --- .../java/org/apache/dubbo/config/AbstractReferenceConfig.java | 2 +- .../java/org/apache/dubbo/config/annotation/Reference.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java index 093be8b23f02..b4a732e1eb0c 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java @@ -51,7 +51,7 @@ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig { /** * Whether to find reference's instance from the current JVM */ - protected Boolean injvm = true; + protected Boolean injvm = false; /** * Lazy create connection diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java index 9aaea67fc666..63e2cd5f1d15 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java @@ -71,9 +71,9 @@ boolean generic() default false; /** - * When enable, prefer to call local service in the same JVM if it's present, default value is true + * When enable, prefer to call local service in the same JVM if it's present, default value is false */ - boolean injvm() default true; + boolean injvm() default false; /** * Check if service provider is available during boot up, default value is true