From c3d393b09e4c74b91a191494115c85f2a1ab5d70 Mon Sep 17 00:00:00 2001 From: eden-yuan <916928826@qq.com> Date: Mon, 24 May 2021 15:22:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=20try=E6=89=A7=E8=A1=8C=E5=90=8E=E6=97=A0cat?= =?UTF-8?q?ch=20=E4=BE=9D=E7=84=B6=E6=98=AFreturn=20null=202.=20=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8E=E7=BB=AD=E6=B2=A1=E7=94=A8=E5=88=B0=E5=8F=AF?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=88=B0=20try=20=E5=86=85=203.=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0UP/DOWN=20=E5=B8=B8=E9=87=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourcePropertiesConfiguration.java | 1 - .../datasource/converter/SentinelConverter.java | 3 +-- .../nacos/endpoint/NacosConfigHealthIndicator.java | 14 ++++++++++++-- .../health/NacosDiscoveryHealthIndicator.java | 14 ++++++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java index a0a5526f..330a0a04 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java @@ -132,7 +132,6 @@ public class DataSourcePropertiesConfiguration { if (!ObjectUtils.isEmpty(field.get(this))) { return field.getName(); } - return null; } catch (IllegalAccessException e) { // won't happen diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java index 306dd1a0..1cc8c725 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java @@ -86,9 +86,8 @@ public abstract class SentinelConverter }); for (Object obj : sourceArray) { - String item = null; try { - item = objectMapper.writeValueAsString(obj); + String item = objectMapper.writeValueAsString(obj); Optional.ofNullable(convertRule(item)) .ifPresent(convertRule -> ruleCollection.add(convertRule)); } diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java index affd0139..37e3c246 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java @@ -32,6 +32,16 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator { private final ConfigService configService; + /** + * status up . + */ + private final String STATUS_UP = "UP"; + + /** + * status down . + */ + private final String STATUS_DOWN = "DOWN"; + public NacosConfigHealthIndicator(ConfigService configService) { this.configService = configService; } @@ -43,10 +53,10 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator { // Set the status to Builder builder.status(status); switch (status) { - case "UP": + case STATUS_UP: builder.up(); break; - case "DOWN": + case STATUS_DOWN: builder.down(); break; default: diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java index 5a925ec3..32e523bb 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java @@ -31,6 +31,16 @@ import org.springframework.boot.actuate.health.HealthIndicator; */ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { + /** + * status up. + */ + private static final String STATUS_UP = "UP"; + + /** + * status down. + */ + private static final String STATUS_DOWN = "DOWN"; + private final NamingService namingService; public NacosDiscoveryHealthIndicator(NamingService namingService) { @@ -44,10 +54,10 @@ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { // Set the status to Builder builder.status(status); switch (status) { - case "UP": + case STATUS_UP: builder.up(); break; - case "DOWN": + case STATUS_DOWN: builder.down(); break; default: