From 61f7b4a3a5e974b73a47bc9e7a4047a79e0226e8 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Thu, 24 Sep 2020 15:08:36 +0800 Subject: [PATCH] Fix JavaDoc --- .../cloud/dubbo/annotation/DubboTransported.java | 15 +++++---------- .../DubboServiceDiscoveryAutoConfiguration.java | 9 ++++----- .../http/matcher/AbstractHttpRequestMatcher.java | 1 + 3 files changed, 10 insertions(+), 15 deletions(-) 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..6a97fcc7 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,11 @@ 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 - * methods of {@link FeignClient @FeignClient} annotated classes. - *
    - *
      - * If {@link DubboTransported @DubboTransported} annotated methods of - * {@link FeignClient @FeignClient} annotated classes. - *
    - *
  2. + *
  3. {@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.
  4. *
  5. {@link LoadBalanced @LoadBalanced} {@link RestTemplate} annotated field, method and * parameters
  6. *
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java index 0deb8897..6e491425 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceDiscoveryAutoConfiguration.java @@ -16,7 +16,6 @@ package com.alibaba.cloud.dubbo.autoconfigure; -import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -203,7 +202,7 @@ public class DubboServiceDiscoveryAutoConfiguration { * {@link #defaultHeartbeatEventChangePredicate()} method providers the default * implementation to detect whether the {@link HeartbeatEvent#getValue() state} is * changed or not. If and only if changed, the - * {@link #dispatchServiceInstancesChangedEvent(String, Collection)} will be executed. + * {@link #dispatchServiceInstancesChangedEvent(String, List)} will be executed. *

* Note : Spring Cloud {@link HeartbeatEvent} has a critical flaw that can't * figure out which service was changed precisely, it's just used for a notification @@ -362,7 +361,7 @@ public class DubboServiceDiscoveryAutoConfiguration { /** * Zookeeper uses {@link TreeCacheEvent} to trigger - * {@link #dispatchServiceInstancesChangedEvent(String, Collection)} , thus + * {@link #dispatchServiceInstancesChangedEvent(String, List)} , thus * {@link HeartbeatEvent} handle is always ignored. * @return false forever */ @@ -430,7 +429,7 @@ public class DubboServiceDiscoveryAutoConfiguration { } /** - * Try to {@link #dispatchServiceInstancesChangedEvent(String, Collection) + * Try to {@link #dispatchServiceInstancesChangedEvent(String, List) * dispatch} {@link ServiceInstancesChangedEvent} before * {@link ZookeeperServiceWatch#childEvent(CuratorFramework, TreeCacheEvent)} * execution if required. @@ -528,7 +527,7 @@ public class DubboServiceDiscoveryAutoConfiguration { /** * Nacos uses {@link EventListener} to trigger. - * {@link #dispatchServiceInstancesChangedEvent(String, Collection)} , thus + * {@link #dispatchServiceInstancesChangedEvent(String, List)} , thus * {@link HeartbeatEvent} handle is always ignored * @return false forever */ diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java index a2d3ea75..a5ae45bd 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java @@ -40,6 +40,7 @@ public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher { *

* For example {@code " || "} for URL patterns or {@code " && "} for param * expressions. + * @return the notation */ protected abstract String getToStringInfix();