From 9e708b1c1ceaf7ee7e33e8313e7a4d453937fafb Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 18 Sep 2020 17:08:59 +0800 Subject: [PATCH] Code Style --- .../com/alibaba/cloud/sidecar/SidecarHealthChecker.java | 3 ++- .../cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java | 1 + .../cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java | 1 + .../sidecar/nacos/SidecarNacosDiscoveryProperties.java | 1 + ...rviceRegistrationNonWebApplicationAutoConfiguration.java | 6 +++--- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java index 7c71f9a46..fabccd12a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java @@ -67,7 +67,8 @@ public class SidecarHealthChecker { instanceCache(applicationName, ip, port, status); if (status.equals(Status.UP)) { if (needRegister(applicationName, ip, port, status)) { - this.sidecarDiscoveryClient.registerInstance(applicationName, ip, port); + this.sidecarDiscoveryClient.registerInstance(applicationName, ip, + port); log.info( "Polyglot service changed and Health check success. register the new instance. applicationName = {}, ip = {}, port = {}, status = {}", applicationName, ip, port, status); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java index 85842e748..feaf86fe4 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosAutoConfiguration.java @@ -55,4 +55,5 @@ public class SidecarNacosAutoConfiguration { return new SidecarNacosDiscoveryClient(nacosServiceManager, sidecarNacosDiscoveryProperties); } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java index ecfe82e0d..86735833d 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java @@ -66,4 +66,5 @@ public class SidecarNacosDiscoveryClient implements SidecarDiscoveryClient { return nacosServiceManager .getNamingService(sidecarNacosDiscoveryProperties.getNacosProperties()); } + } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java index 2e6cd89df..a6c5a9788 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java @@ -18,6 +18,7 @@ package com.alibaba.cloud.sidecar.nacos; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.sidecar.SidecarProperties; + import org.springframework.util.StringUtils; /** diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java index e5f9fa3f5..a7d194240 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java @@ -108,9 +108,9 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration { for (List urls : repository.getAllExportedUrls().values()) { urls.stream().filter( url -> REST_PROTOCOL.equalsIgnoreCase(url.getProtocol())) - .findFirst().ifPresent(url -> { - serverPort = url.getPort(); - }); + .findFirst().ifPresent(url -> { + serverPort = url.getPort(); + }); // If REST protocol is not present, use any applied port. if (serverPort == null) {