From a192c17ede5c14d08217c98379e38974537d95fc Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Tue, 8 Sep 2020 09:27:44 +0800 Subject: [PATCH] Remove spring-cloud-starter-dubbo-gateway --- .../com/alibaba/cloud/nacos/NacosDiscoveryProperties.java | 8 ++++---- .../sentinel/endpoint/SentinelHealthIndicatorTests.java | 4 ++-- .../cloud/dubbo/service/DubboMetadataServiceProxy.java | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java index 52fedfe60..acc8b2585 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java @@ -274,10 +274,10 @@ public class NacosDiscoveryProperties { this.namingMaintainService = createMaintainService(properties); } - @PreDestroy - public void destroy() throws NacosException { - namingService.shutDown(); - } + @PreDestroy + public void destroy() throws NacosException { + namingService.shutDown(); + } public String getEndpoint() { return endpoint; diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java index 96b7adaae..71ddb799b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java @@ -110,8 +110,8 @@ public class SentinelHealthIndicatorTests { Health health = sentinelHealthIndicator.health(); assertThat(health.getStatus()).isEqualTo(Status.UNKNOWN); - assertThat(health.getDetails().get("dashboard")).isEqualTo( - new Status(Status.UNKNOWN.getCode(), "localhost:8080 can't be connected")); + assertThat(health.getDetails().get("dashboard")).isEqualTo(new Status( + Status.UNKNOWN.getCode(), "localhost:8080 can't be connected")); } @Test diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java index 2d0bbc063..ff70950d6 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java @@ -23,9 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import com.alibaba.cloud.dubbo.metadata.repository.ServiceInstanceSelector; import com.alibaba.cloud.dubbo.util.DubboMetadataUtils; - import org.apache.dubbo.common.URL; - import org.slf4j.Logger; import org.slf4j.LoggerFactory;