Merge 20ff50e into ac5be1d

sofastack · Sep 25, 2018 · 428c4ca · 428c4ca
2 parents ac5be1d + 20ff50e
commit 428c4ca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...ot-starter/src/main/java/com/alipay/sofa/runtime/api/annotation/SofaReferenceBinding.java b/...ot-starter/src/main/java/com/alipay/sofa/runtime/api/annotation/SofaReferenceBinding.java
@@ -73,9 +73,27 @@
      * callback handler
      *
      * @return callback handler
+     * @Deprecated this attribute is not intended for use and will be removed the next major version.
      */
+    @Deprecated
     String callbackHandler() default "";
 
+    /**
+     * callback implementation class name
+     *
+     * @return callback implementation class name
+     * @since 2.5.0
+     */
+    String callbackClass() default "";
+
+    /**
+     * callback spring beanName ref
+     *
+     * @return callback spring beanName ref
+     * @since 2.5.0
+     */
+    String callbackRef() default "";
+
     /**
      * registry for this consumer
      *

diff --git a/runtime-sofa-boot-starter/src/test/resources/config/application.properties b/runtime-sofa-boot-starter/src/test/resources/config/application.properties
@@ -1 +1,2 @@
-spring.application.name=runtime-test
+spring.application.name=runtime-test
+management.endpoints.jmx.unique-names=false