1、support for merger when use @reference or @method or @DubboReference (

#6092) 2、Delete unnecessary 'return' comments, Cause the check to failed
apache · May 7, 2020 · 4d3316b · 4d3316b
1 parent 6140f5f
commit 4d3316b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 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
@@ -262,10 +262,13 @@
      */
     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
@@ -65,5 +65,7 @@
 
     String validation() default "";
 
+    String merger() default "";
+
     Argument[] arguments() default {};
 }