From 49d0ebdabef7168dcfc7910c996688d759be6058 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Wed, 5 Feb 2020 16:42:10 +0800 Subject: [PATCH] just update to match code style --- .../alibaba/cloud/examples/Application.java | 2 +- .../nacos/NacosPropertySourceRepository.java | 5 +++-- .../endpoint/NacosConfigHealthIndicator.java | 4 ++-- .../NacosDiscoveryClientConfiguration.java | 3 ++- .../cloud/nacos/discovery/NacosWatch.java | 2 +- .../health/NacosDiscoveryHealthIndicator.java | 19 ++++++++++--------- ...cosDiscoveryEndpointAutoConfiguration.java | 5 +++-- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java index 30ef8884..ce693054 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java @@ -123,7 +123,7 @@ class SampleRunner implements ApplicationRunner { * * user.name=Nacos user.age=25 * @param configInfo latest config data for specific dataId in Nacos - * server + * server */ @Override public void receiveConfigInfo(String configInfo) { diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java index 56265f45..ac391bad 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java @@ -65,8 +65,9 @@ public final class NacosPropertySourceRepository { public static void collectNacosPropertySource( NacosPropertySource nacosPropertySource) { - NACOS_PROPERTY_SOURCE_REPOSITORY.putIfAbsent(getMapKey(nacosPropertySource.getDataId(), - nacosPropertySource.getGroup()), nacosPropertySource); + NACOS_PROPERTY_SOURCE_REPOSITORY + .putIfAbsent(getMapKey(nacosPropertySource.getDataId(), + nacosPropertySource.getGroup()), nacosPropertySource); } public static NacosPropertySource getNacosPropertySource(String dataId, diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java index 482909d8..affd0139 100644 --- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java +++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java @@ -23,8 +23,8 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; /** - * The {@link HealthIndicator} for Nacos Config - * + * The {@link HealthIndicator} for Nacos Config. + * * @author xiaojing * @author Mercy */ diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java index 6ac2b159..61234516 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientConfiguration.java @@ -54,7 +54,8 @@ public class NacosDiscoveryClientConfiguration { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", + matchIfMissing = true) public NacosWatch nacosWatch(NacosDiscoveryProperties nacosDiscoveryProperties, ObjectProvider taskScheduler) { return new NacosWatch(nacosDiscoveryProperties, taskScheduler); diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java index edfa637f..ba14654d 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java @@ -61,7 +61,7 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl } /** - * The constructor with {@link NacosDiscoveryProperties} bean and the optional + * The constructor with {@link NacosDiscoveryProperties} bean and the optional. * {@link TaskScheduler} bean * @param properties {@link NacosDiscoveryProperties} bean * @param taskScheduler the optional {@link TaskScheduler} bean diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java index 1854a42a..5a925ec3 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java @@ -1,12 +1,11 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Copyright 2013-2018 the original author or authors. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.cloud.nacos.discovery.actuate.health; import com.alibaba.nacos.api.naming.NamingService; @@ -23,8 +23,8 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; /** - * The {@link HealthIndicator} for Nacos Discovery - * + * The {@link HealthIndicator} for Nacos Discovery. + * * @author Mercy * @since 2.2.0 * @see HealthIndicator @@ -55,4 +55,5 @@ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { break; } } + } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java index 78635ae1..e5a4b515 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java @@ -30,8 +30,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * The AutoConfiguration class for Nacos Discovery's Endpoints - * + * The AutoConfiguration class for Nacos Discovery's Endpoints. + * * @author xiaojing * @author Mercy */ @@ -55,4 +55,5 @@ public class NacosDiscoveryEndpointAutoConfiguration { return new NacosDiscoveryHealthIndicator( nacosDiscoveryProperties.namingServiceInstance()); } + }