diff --git a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java index cffcb8d68..40f04aab7 100644 --- a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.spring.boot.actuate.endpoint; -import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.AbstractDubboMetadata; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboReferencesMetadata; diff --git a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java index f9dcac264..d1947da42 100644 --- a/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.spring.boot.actuate.endpoint; -import org.apache.dubbo.config.annotation.Service; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.AbstractDubboMetadata; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboServicesMetadata; diff --git a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java index 1ccb08ec1..51f4e03f6 100644 --- a/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.spring.boot.actuate.autoconfigure; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint; import org.apache.dubbo.spring.boot.actuate.endpoint.DubboMetadataEndpoint; import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesMetadataEndpoint; @@ -214,7 +214,7 @@ interface DemoService { String sayHello(String name); } - @Service( + @DubboService( version = "${dubbo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", diff --git a/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboReferencesMetadata.java b/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboReferencesMetadata.java index e389a6a0a..d93ea3a16 100644 --- a/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboReferencesMetadata.java +++ b/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboReferencesMetadata.java @@ -16,9 +16,9 @@ */ package org.apache.dubbo.spring.boot.actuate.endpoint.metadata; -import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.spring.ReferenceBean; import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; + import org.springframework.beans.factory.annotation.InjectionMetadata; import org.springframework.stereotype.Component; diff --git a/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboServicesMetadata.java b/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboServicesMetadata.java index 7122e365c..5f1847cf4 100644 --- a/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboServicesMetadata.java +++ b/dubbo-spring-boot-compatible/actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/metadata/DubboServicesMetadata.java @@ -16,8 +16,8 @@ */ package org.apache.dubbo.spring.boot.actuate.endpoint.metadata; -import org.apache.dubbo.config.annotation.Service; import org.apache.dubbo.config.spring.ServiceBean; + import org.springframework.stereotype.Component; import java.util.LinkedHashMap; diff --git a/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java b/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java index a8278df56..c4d62da48 100644 --- a/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java +++ b/dubbo-spring-boot-compatible/actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAutoConfigurationTest.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.spring.boot.actuate.autoconfigure; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.actuate.endpoint.DubboEndpoint; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboConfigsMetadata; import org.apache.dubbo.spring.boot.actuate.endpoint.metadata.DubboPropertiesMetadata; @@ -220,7 +220,7 @@ interface DemoService { String sayHello(String name); } - @Service( + @DubboService( version = "${dubbo.service.version}", application = "${dubbo.application.id}", protocol = "${dubbo.protocol.id}", diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java index 82cce5163..53b6dca26 100644 --- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java @@ -16,8 +16,6 @@ */ package org.apache.dubbo.spring.boot.autoconfigure; -import org.apache.dubbo.config.annotation.Reference; -import org.apache.dubbo.config.annotation.Service; import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; import org.apache.dubbo.config.spring.context.annotation.DubboConfigConfiguration; diff --git a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java index be83edf9e..91d731576 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java @@ -16,8 +16,10 @@ */ package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.dubbo.config.annotation.Method; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationRunner; @@ -35,7 +37,14 @@ public class DubboAutoConfigurationConsumerBootstrap { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "1.0.0", url = "dubbo://127.0.0.1:12345") + @DubboReference( + version = "1.0.0", + url = "dubbo://127.0.0.1:12345", + timeout = 100, + methods = { + @Method(name = "sayHello", timeout = 300) + } + ) private DemoService demoService; public static void main(String[] args) { diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java index bd61706ea..265208c93 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java @@ -17,8 +17,9 @@ package org.apache.dubbo.spring.boot.demo.provider.bootstrap; import org.apache.dubbo.spring.boot.demo.provider.service.DefaultDemoService; + +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; /** * Dubbo Auto-Configuration Provider Bootstrap @@ -30,7 +31,8 @@ public class DubboAutoConfigurationProviderBootstrap { public static void main(String[] args) { - new SpringApplicationBuilder(DubboAutoConfigurationProviderBootstrap.class) - .run(args); +// new SpringApplicationBuilder(DubboAutoConfigurationProviderBootstrap.class) +// .run(args); + SpringApplication.run(DubboAutoConfigurationProviderBootstrap.class,args); } } diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index 325b19abf..eab0793ca 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -16,19 +16,28 @@ */ package org.apache.dubbo.spring.boot.demo.provider.service; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import java.util.Random; + /** * Default {@link DemoService} * * @see DemoService * @since 2.7.0 */ -@Service(version = "1.0.0") +@DubboService(version = "1.0.0") public class DefaultDemoService implements DemoService { + private final Logger logger = LoggerFactory.getLogger(getClass()); + + private final Random costTimeRandom = new Random(); + /** * The default value of ${dubbo.application.name} is ${spring.application.name} */ @@ -37,6 +46,17 @@ public class DefaultDemoService implements DemoService { @Override public String sayHello(String name) { + await(); return String.format("[%s] : Hello, %s", serviceName, name); } + + private void await() { + try { + long timeInMillisToWait = costTimeRandom.nextInt(500); + Thread.sleep(timeInMillisToWait); + logger.info("execution time : " + timeInMillisToWait + " ms."); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } } \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java index dab14873a..7c8ed2f89 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.slf4j.Logger; @@ -34,7 +34,7 @@ public class DubboRegistryNacosConsumerBootstrap { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "${demo.service.version}") + @DubboReference(version = "${demo.service.version}") private DemoService demoService; public static void main(String[] args) { diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index bbfe5254c..3e4c424e8 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.spring.boot.demo.provider.service; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.springframework.beans.factory.annotation.Value; @@ -27,7 +27,7 @@ * @see DemoService * @since 2.7.0 */ -@Service(version = "${demo.service.version}") +@DubboService(version = "${demo.service.version}") public class DefaultDemoService implements DemoService { /** diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java index 81829ca3d..d472c3923 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java @@ -16,8 +16,9 @@ */ package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationRunner; @@ -33,7 +34,7 @@ public class DubboRegistryZooKeeperConsumerBootstrap { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "${demo.service.version}") + @DubboReference(version = "${demo.service.version}") private DemoService demoService; public static void main(String[] args) { diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index bf5f80d99..3e4c424e8 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -16,8 +16,9 @@ */ package org.apache.dubbo.spring.boot.demo.provider.service; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; + import org.springframework.beans.factory.annotation.Value; /** @@ -26,7 +27,7 @@ * @see DemoService * @since 2.7.0 */ -@Service(version = "${demo.service.version}") +@DubboService(version = "${demo.service.version}") public class DefaultDemoService implements DemoService { /** diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java index 063c1a6c2..9d3b389f3 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java @@ -16,7 +16,7 @@ */ package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.slf4j.Logger; @@ -40,7 +40,7 @@ public class DubboExternalizedConfigurationConsumerBootstrap { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "${demo.service.version}", url = "${demo.service.url}") + @DubboReference(version = "${demo.service.version}", url = "${demo.service.url}") private DemoService demoService; public static void main(String[] args) { diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index bf5f80d99..3e4c424e8 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -16,8 +16,9 @@ */ package org.apache.dubbo.spring.boot.demo.provider.service; -import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.spring.boot.demo.consumer.DemoService; + import org.springframework.beans.factory.annotation.Value; /** @@ -26,7 +27,7 @@ * @see DemoService * @since 2.7.0 */ -@Service(version = "${demo.service.version}") +@DubboService(version = "${demo.service.version}") public class DefaultDemoService implements DemoService { /**