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

nacos watch enhance

Browse Source
This commit is contained in:
yuhuangbin 2020-09-09 19:18:45 +08:00
parent cd8464d4a0
commit bd2cd3f394
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java
View File

@ -19,7 +19,7 @@ package com.alibaba.cloud.nacos.discovery;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -41,6 +41,7 @@ import org.springframework.context.SmartLifecycle;
/** /**
* @author xiaojing * @author xiaojing
* @author yuhuangbin
*/ */
public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycle { public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycle {
@ -88,13 +89,13 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
if (event instanceof NamingEvent) { if (event instanceof NamingEvent) {
List<Instance> instances = ((NamingEvent) event) List<Instance> instances = ((NamingEvent) event)
.getInstances(); .getInstances();
Instance currentInstance = selectCurrentInstance( Optional<Instance> instanceOptional = selectCurrentInstance(
instances); instances);
if (Objects.nonNull(currentInstance)) { instanceOptional.ifPresent(currentInstance -> {
resetIfNeeded(currentInstance); resetIfNeeded(currentInstance);
publisher.publishEvent( publisher.publishEvent(
new HeartbeatEvent(this, currentInstance)); new HeartbeatEvent(this, currentInstance));
} });
} }
} }
}); });
@ -121,11 +122,11 @@ public class NacosWatch implements ApplicationEventPublisherAware, SmartLifecycl
} }
} }
private Instance selectCurrentInstance(List<Instance> instances) { private Optional<Instance> selectCurrentInstance(List<Instance> instances) {
return instances.stream() return instances.stream()
.filter(instance -> properties.getIp().equals(instance.getIp()) .filter(instance -> properties.getIp().equals(instance.getIp())
&& properties.getPort() == instance.getPort()) && properties.getPort() == instance.getPort())
.findFirst().orElse(null); .findFirst();
} }
@Override @Override