You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2020/05/07 03:10:50 UTC
[dubbo] branch master updated: 1、support for merger when use @Reference or @Method or @DubboReference (#6092)
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4d3316b 1、support for merger when use @Reference or @Method or @DubboReference (#6092)
4d3316b is described below
commit 4d3316b87d18d37ce982928052fd5451f63cea92
Author: imuxi <33...@users.noreply.github.com>
AuthorDate: Thu May 7 11:10:30 2020 +0800
1、support for merger when use @Reference or @Method or @DubboReference (#6092)
2、Delete unnecessary 'return' comments, Cause the check to failed
---
.../java/org/apache/dubbo/config/annotation/DubboReference.java | 7 +++++--
.../src/main/java/org/apache/dubbo/config/annotation/Method.java | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
index 985a4d9..eb1a2e6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
@@ -263,9 +263,12 @@ public @interface DubboReference {
String tag() default "";
/**
+ * Service merger
+ */
+ String merger() default "";
+
+ /**
* methods support
- *
- * @return
*/
Method[] methods() default {};
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
index 0cdc97c..c1fe088 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
@@ -65,5 +65,7 @@ public @interface Method {
String validation() default "";
+ String merger() default "";
+
Argument[] arguments() default {};
}