From 5e847f2b0d1a25adddc5edb3936dbd8d5764185b Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Wed, 15 Apr 2020 09:25:14 +0800 Subject: [PATCH] Polish alibaba/spring-cloud-alibaba#1363 : Resolve the issues of JavaDoc --- spring-cloud-alibaba-dependencies/pom.xml | 6 ------ .../cloud/examples/fallback/EchoServiceFallback.java | 3 +-- .../fallback/EchoServiceFallbackFactory.java | 1 - .../alibaba/cloud/examples/service/EchoService.java | 4 +--- .../cloud/examples/controller/EchoController.java | 1 - .../cloud/dubbo/annotation/DubboTransported.java | 12 ++++-------- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 25fbea14..4174a590 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -23,12 +23,6 @@ 1.1.0 1.2.1 0.8.0 - 4.4.1 - 1.0.5 - 2.44.0 - 1.1.0 - 1.1.8.6 - 1.1.1 1.0.6 diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java index 30a9de2b..055521c5 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallback.java @@ -20,7 +20,6 @@ import com.alibaba.cloud.examples.service.EchoService; /** * @author lengleng - * @date 2019-08-01 *

* sentinel 降级处理 */ @@ -35,7 +34,7 @@ public class EchoServiceFallback implements EchoService { /** * 调用服务提供方的输出接口. * @param str 用户输入 - * @return + * @return response */ @Override public String echo(String str) { diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java index 94366678..9df335d2 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/fallback/EchoServiceFallbackFactory.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Component; /** * @author lengleng - * @date 2019-08-01 */ @Component public class EchoServiceFallbackFactory implements FallbackFactory { diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java index 4e0da067..417eff79 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/java/com/alibaba/cloud/examples/service/EchoService.java @@ -24,12 +24,10 @@ import org.springframework.web.bind.annotation.PathVariable; /** * @author lengleng - * @date 2019-08-01 *

* example feign client */ -@FeignClient(name = "service-provider", - fallbackFactory = EchoServiceFallbackFactory.class) +@FeignClient(name = "service-provider", fallbackFactory = EchoServiceFallbackFactory.class) public interface EchoService { /** diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/java/com/alibaba/cloud/examples/controller/EchoController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/java/com/alibaba/cloud/examples/controller/EchoController.java index c74f7b48..ccf36448 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/java/com/alibaba/cloud/examples/controller/EchoController.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/java/com/alibaba/cloud/examples/controller/EchoController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; /** * @author lengleng - * @date 2019-08-01 */ @RestController public class EchoController { diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java index efe083ea..725950b3 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java @@ -37,16 +37,12 @@ import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_RETRIES; * Spring Cloud Service-to-Service call is transported by Dubbo under the hood, there are * two main scenarios: *

    - *
  1. {@link FeignClient @FeignClient} annotated classes: - *
      - * If {@link DubboTransported @DubboTransported} annotated classes, the invocation of all + *
    • {@link FeignClient @FeignClient} annotated classes: If + * {@link DubboTransported @DubboTransported} annotated classes, the invocation of all * methods of {@link FeignClient @FeignClient} annotated classes. - *
    - *
      + * * If {@link DubboTransported @DubboTransported} annotated methods of - * {@link FeignClient @FeignClient} annotated classes. - *
    - *
  2. + * {@link FeignClient @FeignClient} annotated classes. *
  3. {@link LoadBalanced @LoadBalanced} {@link RestTemplate} annotated field, method and * parameters
  4. *