msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

fix bug

Browse Source
pull/904/head
seanyu 3 years ago
parent b4632496f5
commit 4fe18235ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java
Unescape View File

@ -258,7 +258,7 @@ public class StaticMetadataManager {
List<InstanceMetadataProvider> instanceMetadataProviders) { List<InstanceMetadataProvider> instanceMetadataProviders) {
// resolve region info // resolve region info
if (!CollectionUtils.isEmpty(instanceMetadataProviders)) { if (!CollectionUtils.isEmpty(instanceMetadataProviders)) {
Set<String> providerRegions = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getRegion).filter(Objects::nonNull).collect(Collectors.toSet()); Set<String> providerRegions = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getRegion).filter(region -> !StringUtils.isBlank(region)).collect(Collectors.toSet());
if (!CollectionUtils.isEmpty(providerRegions)) { if (!CollectionUtils.isEmpty(providerRegions)) {
if (providerRegions.size() > 1) { if (providerRegions.size() > 1) {
throw new IllegalArgumentException("Multiple Regions Provided in InstanceMetadataProviders"); throw new IllegalArgumentException("Multiple Regions Provided in InstanceMetadataProviders");
@ -275,7 +275,7 @@ public class StaticMetadataManager {
// resolve zone info // resolve zone info
if (!CollectionUtils.isEmpty(instanceMetadataProviders)) { if (!CollectionUtils.isEmpty(instanceMetadataProviders)) {
Set<String> providerZones = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getZone).filter(Objects::nonNull).collect(Collectors.toSet()); Set<String> providerZones = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getZone).filter(zone -> !StringUtils.isBlank(zone)).collect(Collectors.toSet());
if (!CollectionUtils.isEmpty(providerZones)) { if (!CollectionUtils.isEmpty(providerZones)) {
if (providerZones.size() > 1) { if (providerZones.size() > 1) {
throw new IllegalArgumentException("Multiple Zones Provided in InstanceMetadataProviders"); throw new IllegalArgumentException("Multiple Zones Provided in InstanceMetadataProviders");
@ -292,7 +292,7 @@ public class StaticMetadataManager {
// resolve campus info // resolve campus info
if (!CollectionUtils.isEmpty(instanceMetadataProviders)) { if (!CollectionUtils.isEmpty(instanceMetadataProviders)) {
Set<String> providerCampus = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getCampus).filter(Objects::nonNull).collect(Collectors.toSet()); Set<String> providerCampus = instanceMetadataProviders.stream().map(InstanceMetadataProvider::getCampus).filter(campus -> !StringUtils.isBlank(campus)).collect(Collectors.toSet());
if (!CollectionUtils.isEmpty(providerCampus)) { if (!CollectionUtils.isEmpty(providerCampus)) {
if (providerCampus.size() > 1) { if (providerCampus.size() > 1) {
throw new IllegalArgumentException("Multiple Campus Provided in InstanceMetadataProviders"); throw new IllegalArgumentException("Multiple Campus Provided in InstanceMetadataProviders");

Write Preview
Loading…
Cancel
Save