study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2087 from eden-yuan/master

Browse Source 
代码调整
This commit is contained in:
TheoneFx 2021-05-26 16:37:02 +08:00 committed by GitHub
commit 4ffbe22c8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java
View File

@ -132,7 +132,6 @@ public class DataSourcePropertiesConfiguration {
if (!ObjectUtils.isEmpty(field.get(this))) { if (!ObjectUtils.isEmpty(field.get(this))) {
return field.getName(); return field.getName();
} }
return null;
} }
catch (IllegalAccessException e) { catch (IllegalAccessException e) {
// won't happen // won't happen

3
spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java
View File

@ -86,9 +86,8 @@ public abstract class SentinelConverter<T extends Object>
}); });
for (Object obj : sourceArray) { for (Object obj : sourceArray) {
String item = null;
try { try {
item = objectMapper.writeValueAsString(obj); String item = objectMapper.writeValueAsString(obj);
Optional.ofNullable(convertRule(item)) Optional.ofNullable(convertRule(item))
.ifPresent(convertRule -> ruleCollection.add(convertRule)); .ifPresent(convertRule -> ruleCollection.add(convertRule));
} }

14
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java
View File

@ -32,6 +32,16 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator {
private final ConfigService configService; private final ConfigService configService;
/**
* status up .
*/
private final String STATUS_UP = "UP";
/**
* status down .
*/
private final String STATUS_DOWN = "DOWN";
public NacosConfigHealthIndicator(ConfigService configService) { public NacosConfigHealthIndicator(ConfigService configService) {
this.configService = configService; this.configService = configService;
} }
@ -43,10 +53,10 @@ public class NacosConfigHealthIndicator extends AbstractHealthIndicator {
// Set the status to Builder // Set the status to Builder
builder.status(status); builder.status(status);
switch (status) { switch (status) {
case "UP": case STATUS_UP:
builder.up(); builder.up();
break; break;
case "DOWN": case STATUS_DOWN:
builder.down(); builder.down();
break; break;
default: default:

14
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java
View File

@ -31,6 +31,16 @@ import org.springframework.boot.actuate.health.HealthIndicator;
*/ */
public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { 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; private final NamingService namingService;
public NacosDiscoveryHealthIndicator(NamingService namingService) { public NacosDiscoveryHealthIndicator(NamingService namingService) {
@ -44,10 +54,10 @@ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator {
// Set the status to Builder // Set the status to Builder
builder.status(status); builder.status(status);
switch (status) { switch (status) {
case "UP": case STATUS_UP:
builder.up(); builder.up();
break; break;
case "DOWN": case STATUS_DOWN:
builder.down(); builder.down();
break; break;
default: default: