From 8b8466e2a492c5df30e66ddf90e998e57866568d Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 14:25:03 +0800 Subject: [PATCH 01/65] [type:refactor] refactor discovery plugin. --- pom.xml | 1 - shenyu-admin/pom.xml | 38 +-- .../admin/discovery/APDiscoveryProcessor.java | 20 +- .../discovery/AbstractDiscoveryProcessor.java | 54 ++-- .../discovery/DefaultDiscoveryProcessor.java | 25 +- ...DiscoveryDataChangedEventSyncListener.java | 4 +- .../listener/DataChangedEventListener.java | 8 +- .../listener/DiscoveryDataChangedEvent.java | 21 +- shenyu-client/shenyu-client-core/pom.xml | 2 +- .../register/InstanceRegisterListener.java | 35 +- shenyu-discovery/pom.xml | 37 --- shenyu-discovery/shenyu-discovery-api/pom.xml | 41 --- .../discovery/api/ShenyuDiscoveryService.java | 83 ----- .../discovery/api/config/DiscoveryConfig.java | 106 ------ .../api/config/DiscoveryConfigTest.java | 72 ----- .../DataChangedEventListenerTest.java | 67 ---- .../DiscoveryDataChangedEventTest.java | 40 --- .../shenyu-discovery-etcd/pom.xml | 85 ----- .../discovery/etcd/EtcdDiscoveryService.java | 255 --------------- ...henyu.discovery.api.ShenyuDiscoveryService | 18 -- .../etcd/EtcdDiscoveryServiceTest.java | 254 --------------- .../shenyu-discovery-eureka/pom.xml | 53 --- .../eureka/CustomedEurekaConfig.java | 124 ------- .../eureka/EurekaDiscoveryService.java | 304 ------------------ ...henyu.discovery.api.ShenyuDiscoveryService | 17 - .../eureka/EurekaDiscoveryServiceTest.java | 201 ------------ .../shenyu-discovery-nacos/pom.xml | 46 --- .../nacos/NacosDiscoveryService.java | 274 ---------------- ...henyu.discovery.api.ShenyuDiscoveryService | 17 - .../nacos/NacosDiscoveryServiceTest.java | 249 -------------- .../shenyu-discovery-zookeeper/pom.xml | 50 --- .../zookeeper/ZookeeperDiscoveryService.java | 213 ------------ ...henyu.discovery.api.ShenyuDiscoveryService | 17 - .../ZookeeperDiscoveryServiceTest.java | 149 --------- shenyu-examples/shenyu-examples-grpc/pom.xml | 5 - .../shenyu-examples-http-swagger3/pom.xml | 31 -- shenyu-examples/shenyu-examples-http/pom.xml | 24 -- .../pom.xml | 5 - .../api/ShenyuInstanceRegisterRepository.java | 20 +- .../registry/api/entity/InstanceEntity.java | 40 +++ .../api/event/ChangedEventListener.java | 35 ++ .../shenyu/registry/etcd/EtcdClient.java | 4 +- .../etcd/EtcdInstanceRegisterRepository.java | 66 +++- .../shenyu-registry-eureka/pom.xml | 21 +- .../EurekaInstanceRegisterRepository.java | 193 ++++++++--- .../NacosInstanceRegisterRepository.java | 117 ++++++- .../registry/zookeeper/ZookeeperClient.java | 43 ++- .../ZookeeperInstanceRegisterRepository.java | 142 ++++++-- .../zookeeper/ZookeeperClientTest.java | 16 +- .../ShenyuGrpcDiscoveryConfiguration.java | 9 + ...SpringWebSocketDiscoveryConfiguration.java | 9 + ...ShenyuSpringMvcDiscoveryConfiguration.java | 8 + 52 files changed, 708 insertions(+), 3060 deletions(-) rename {shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api => shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery}/listener/DataChangedEventListener.java (94%) rename {shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api => shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery}/listener/DiscoveryDataChangedEvent.java (95%) delete mode 100644 shenyu-discovery/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-api/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/ShenyuDiscoveryService.java delete mode 100644 shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/config/DiscoveryConfig.java delete mode 100644 shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/config/DiscoveryConfigTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListenerTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEventTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-etcd/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-etcd/src/main/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryService.java delete mode 100644 shenyu-discovery/shenyu-discovery-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService delete mode 100644 shenyu-discovery/shenyu-discovery-etcd/src/test/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryServiceTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-eureka/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/CustomedEurekaConfig.java delete mode 100644 shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryService.java delete mode 100644 shenyu-discovery/shenyu-discovery-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService delete mode 100644 shenyu-discovery/shenyu-discovery-eureka/src/test/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryServiceTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-nacos/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java delete mode 100644 shenyu-discovery/shenyu-discovery-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService delete mode 100644 shenyu-discovery/shenyu-discovery-nacos/src/test/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryServiceTest.java delete mode 100644 shenyu-discovery/shenyu-discovery-zookeeper/pom.xml delete mode 100644 shenyu-discovery/shenyu-discovery-zookeeper/src/main/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryService.java delete mode 100644 shenyu-discovery/shenyu-discovery-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService delete mode 100644 shenyu-discovery/shenyu-discovery-zookeeper/src/test/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryServiceTest.java create mode 100644 shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java diff --git a/pom.xml b/pom.xml index c8603992517d..24330bb7bf44 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,6 @@ shenyu-dist shenyu-alert shenyu-sdk - shenyu-discovery shenyu-registry shenyu-kubernetes-controller diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml index 015bb3bcdc0f..fb5bc7e53bfe 100644 --- a/shenyu-admin/pom.xml +++ b/shenyu-admin/pom.xml @@ -296,38 +296,6 @@ spring-boot-starter-validation - - - org.apache.shenyu - shenyu-discovery-etcd - ${project.version} - - - - org.apache.shenyu - shenyu-discovery-zookeeper - ${project.version} - - - - org.apache.shenyu - shenyu-discovery-nacos - ${project.version} - - - - org.apache.shenyu - shenyu-discovery-eureka - - - jakarta.servlet - servlet-api - - - ${project.version} - - - org.apache.shenyu @@ -358,6 +326,12 @@ shenyu-admin-listener-zookeeper ${project.version} + + + org.apache.shenyu + shenyu-registry-core + ${project.version} + diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java index 744cede74780..b19334a573a2 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java @@ -17,6 +17,8 @@ package org.apache.shenyu.admin.discovery; +import org.apache.shenyu.admin.discovery.listener.DataChangedEventListener; +import org.apache.shenyu.admin.discovery.listener.DiscoveryDataChangedEvent; import org.apache.shenyu.admin.exception.ShenyuAdminException; import org.apache.shenyu.admin.listener.DataChangedEvent; import org.apache.shenyu.admin.mapper.DiscoveryUpstreamMapper; @@ -25,7 +27,8 @@ import org.apache.shenyu.admin.transfer.DiscoveryTransfer; import org.apache.shenyu.common.enums.ConfigGroupEnum; import org.apache.shenyu.common.enums.DataEventTypeEnum; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; +import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import java.util.Collections; import java.util.Objects; @@ -44,7 +47,7 @@ public APDiscoveryProcessor(final DiscoveryUpstreamMapper discoveryUpstreamMappe @Override public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxySelectorDTO proxySelectorDTO) { - ShenyuDiscoveryService shenyuDiscoveryService = getShenyuDiscoveryService(discoveryHandlerDTO.getDiscoveryId()); + ShenyuInstanceRegisterRepository shenyuDiscoveryService = getShenyuDiscoveryService(discoveryHandlerDTO.getDiscoveryId()); String key = super.buildProxySelectorKey(discoveryHandlerDTO.getListenerNode()); if (Objects.isNull(shenyuDiscoveryService)) { throw new ShenyuAdminException(String.format("before start ProxySelector you need init DiscoveryId=%s", discoveryHandlerDTO.getDiscoveryId())); @@ -54,7 +57,18 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f LOG.info("shenyu discovery has watcher key = {}", key); return; } - shenyuDiscoveryService.watch(key, getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO)); + final DataChangedEventListener discoveryDataChangedEventListener = getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO); + shenyuDiscoveryService.watchInstances(key, (selectKey, selectValue, event) -> { + if (event.equals(ChangedEventListener.Event.ADDED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.ADDED)); + } else if (event.equals(ChangedEventListener.Event.UPDATED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.UPDATED)); + } else if (event.equals(ChangedEventListener.Event.DELETED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.DELETED)); + } else { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.IGNORED)); + } + }); cacheKey.add(key); DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.PROXY_SELECTOR, DataEventTypeEnum.CREATE, Collections.singletonList(DiscoveryTransfer.INSTANCE.mapToData(proxySelectorDTO))); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java index 2013e4037726..9584dd4a1dd7 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java @@ -18,6 +18,7 @@ package org.apache.shenyu.admin.discovery; import org.apache.commons.lang3.StringUtils; +import org.apache.shenyu.admin.discovery.listener.DataChangedEventListener; import org.apache.shenyu.admin.discovery.parse.CustomDiscoveryUpstreamParser; import org.apache.shenyu.admin.listener.DataChangedEvent; import org.apache.shenyu.admin.mapper.DiscoveryUpstreamMapper; @@ -33,9 +34,9 @@ import org.apache.shenyu.common.enums.DataEventTypeEnum; import org.apache.shenyu.common.utils.GsonUtils; import org.apache.shenyu.common.utils.UUIDUtils; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; +import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; +import org.apache.shenyu.registry.api.config.RegisterConfig; +import org.apache.shenyu.registry.api.entity.InstanceEntity; import org.apache.shenyu.spi.ExtensionLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,16 +44,16 @@ import org.springframework.context.ApplicationEventPublisherAware; import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Properties; import java.util.Set; -import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import java.util.Properties; -import java.util.HashSet; -import java.util.Collections; public abstract class AbstractDiscoveryProcessor implements DiscoveryProcessor, ApplicationEventPublisherAware { @@ -60,7 +61,7 @@ public abstract class AbstractDiscoveryProcessor implements DiscoveryProcessor, protected static final Logger LOG = LoggerFactory.getLogger(DefaultDiscoveryProcessor.class); - private final Map discoveryServiceCache; + private final Map discoveryServiceCache; private final Map> dataChangedEventListenerCache; @@ -88,11 +89,11 @@ public void createDiscovery(final DiscoveryDO discoveryDO) { String type = discoveryDO.getType(); String props = discoveryDO.getProps(); Properties properties = GsonUtils.getGson().fromJson(props, Properties.class); - DiscoveryConfig discoveryConfig = new DiscoveryConfig(); - discoveryConfig.setType(type); + RegisterConfig discoveryConfig = new RegisterConfig(); + discoveryConfig.setRegisterType(type); discoveryConfig.setProps(properties); - discoveryConfig.setServerList(discoveryDO.getServerList()); - ShenyuDiscoveryService discoveryService = ExtensionLoader.getExtensionLoader(ShenyuDiscoveryService.class).getJoin(type); + discoveryConfig.setServerLists(discoveryDO.getServerList()); + ShenyuInstanceRegisterRepository discoveryService = ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class).getJoin(type); discoveryService.init(discoveryConfig); discoveryServiceCache.put(discoveryDO.getId(), discoveryService); dataChangedEventListenerCache.put(discoveryDO.getId(), new HashSet<>()); @@ -106,12 +107,12 @@ public void createDiscovery(final DiscoveryDO discoveryDO) { */ @Override public void removeDiscovery(final DiscoveryDO discoveryDO) { - ShenyuDiscoveryService shenyuDiscoveryService = discoveryServiceCache.remove(discoveryDO.getId()); + ShenyuInstanceRegisterRepository shenyuDiscoveryService = discoveryServiceCache.remove(discoveryDO.getId()); if (shenyuDiscoveryService == null) { return; } if (discoveryServiceCache.values().stream().noneMatch(p -> p.equals(shenyuDiscoveryService))) { - shenyuDiscoveryService.shutdown(); + shenyuDiscoveryService.close(); LOG.info("shenyu discovery shutdown [{}] discovery", discoveryDO.getName()); } } @@ -123,11 +124,11 @@ public void removeDiscovery(final DiscoveryDO discoveryDO) { */ @Override public void removeProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxySelectorDTO proxySelectorDTO) { - ShenyuDiscoveryService shenyuDiscoveryService = discoveryServiceCache.get(discoveryHandlerDTO.getDiscoveryId()); + ShenyuInstanceRegisterRepository shenyuDiscoveryService = discoveryServiceCache.get(discoveryHandlerDTO.getDiscoveryId()); String key = buildProxySelectorKey(discoveryHandlerDTO.getListenerNode()); Optional.ofNullable(dataChangedEventListenerCache.get(discoveryHandlerDTO.getDiscoveryId())).ifPresent(cacheKey -> { cacheKey.remove(key); - shenyuDiscoveryService.unwatch(key); + shenyuDiscoveryService.unWatchInstances(key); DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.PROXY_SELECTOR, DataEventTypeEnum.DELETE, Collections.singletonList(DiscoveryTransfer.INSTANCE.mapToData(proxySelectorDTO))); eventPublisher.publishEvent(dataChangedEvent); @@ -151,10 +152,21 @@ public void changeUpstream(final ProxySelectorDTO proxySelectorDTO, final List childData = shenyuDiscoveryService.getRegisterData(buildProxySelectorKey(discoveryHandlerDTO.getListenerNode())); - List discoveryUpstreamDataList = childData.stream().map(s -> GsonUtils.getGson().fromJson(s, DiscoveryUpstreamData.class)) - .collect(Collectors.toList()); + ShenyuInstanceRegisterRepository shenyuDiscoveryService = discoveryServiceCache.get(discoveryId); + final List instanceEntities = shenyuDiscoveryService.selectInstances(buildProxySelectorKey(discoveryHandlerDTO.getListenerNode())); + List discoveryUpstreamDataList = instanceEntities.stream().map(instanceEntity -> { + final DiscoveryUpstreamData discoveryUpstreamData = new DiscoveryUpstreamData(); + String uri = String.format("%s:%s", instanceEntity.getHost(), instanceEntity.getPort()); + discoveryUpstreamData.setUrl(uri); + discoveryUpstreamData.setWeight(instanceEntity.getWeight()); + discoveryUpstreamData.setStatus(instanceEntity.getStatus()); + discoveryUpstreamData.setProtocol("http://"); + if (discoveryUpstreamData.getNamespaceId() == null) { + discoveryUpstreamData.setNamespaceId(proxySelectorDTO.getNamespaceId()); + } + discoveryUpstreamData.setDiscoveryHandlerId(proxySelectorDTO.getId()); + return discoveryUpstreamData; + }).collect(Collectors.toList()); Set urlList = discoveryUpstreamDataList.stream().map(DiscoveryUpstreamData::getUrl).collect(Collectors.toSet()); List discoveryUpstreamDOS = discoveryUpstreamMapper.selectByDiscoveryHandlerId(discoveryHandlerDTO.getId()); Set dbUrlList = discoveryUpstreamDOS.stream().map(DiscoveryUpstreamDO::getUrl).collect(Collectors.toSet()); @@ -227,7 +239,7 @@ public void setApplicationEventPublisher(final ApplicationEventPublisher eventPu * @param discoveryId discoveryId * @return ShenyuDiscoveryService */ - public ShenyuDiscoveryService getShenyuDiscoveryService(final String discoveryId) { + public ShenyuInstanceRegisterRepository getShenyuDiscoveryService(final String discoveryId) { return discoveryServiceCache.get(discoveryId); } diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java index 87a9c75feb7e..082fcdfe0cbb 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java @@ -17,6 +17,8 @@ package org.apache.shenyu.admin.discovery; +import org.apache.shenyu.admin.discovery.listener.DataChangedEventListener; +import org.apache.shenyu.admin.discovery.listener.DiscoveryDataChangedEvent; import org.apache.shenyu.admin.exception.ShenyuAdminException; import org.apache.shenyu.admin.listener.DataChangedEvent; import org.apache.shenyu.admin.mapper.DiscoveryUpstreamMapper; @@ -25,7 +27,8 @@ import org.apache.shenyu.admin.transfer.DiscoveryTransfer; import org.apache.shenyu.common.enums.ConfigGroupEnum; import org.apache.shenyu.common.enums.DataEventTypeEnum; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; +import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import java.util.Collections; import java.util.Objects; @@ -47,20 +50,28 @@ public DefaultDiscoveryProcessor(final DiscoveryUpstreamMapper discoveryUpstream @Override public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxySelectorDTO proxySelectorDTO) { - ShenyuDiscoveryService shenyuDiscoveryService = getShenyuDiscoveryService(discoveryHandlerDTO.getDiscoveryId()); + ShenyuInstanceRegisterRepository shenyuInstanceRegisterRepository = getShenyuDiscoveryService(discoveryHandlerDTO.getDiscoveryId()); String key = buildProxySelectorKey(discoveryHandlerDTO.getListenerNode()); - if (Objects.isNull(shenyuDiscoveryService)) { + if (Objects.isNull(shenyuInstanceRegisterRepository)) { throw new ShenyuAdminException(String.format("before start ProxySelector you need init DiscoveryId=%s", discoveryHandlerDTO.getDiscoveryId())); } - if (!shenyuDiscoveryService.exists(key)) { - throw new ShenyuAdminException(String.format("shenyu discovery start watcher need you has this key %s in Discovery", key)); - } Set cacheKey = getCacheKey(discoveryHandlerDTO.getDiscoveryId()); if (Objects.nonNull(cacheKey) && cacheKey.contains(key)) { LOG.info("shenyu discovery has watcher key = {}", key); return; } - shenyuDiscoveryService.watch(key, getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO)); + final DataChangedEventListener discoveryDataChangedEventListener = getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO); + shenyuInstanceRegisterRepository.watchInstances(key, (selectKey, selectValue, event) -> { + if (event.equals(ChangedEventListener.Event.ADDED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.ADDED)); + } else if (event.equals(ChangedEventListener.Event.UPDATED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.UPDATED)); + } else if (event.equals(ChangedEventListener.Event.DELETED)) { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.DELETED)); + } else { + discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.IGNORED)); + } + }); cacheKey.add(key); DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.PROXY_SELECTOR, DataEventTypeEnum.CREATE, Collections.singletonList(DiscoveryTransfer.INSTANCE.mapToData(proxySelectorDTO))); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java index c37cbbb52bb8..e4b4b0fb2f44 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java @@ -19,6 +19,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.shenyu.admin.discovery.listener.DataChangedEventListener; +import org.apache.shenyu.admin.discovery.listener.DiscoveryDataChangedEvent; import org.apache.shenyu.admin.discovery.parse.KeyValueParser; import org.apache.shenyu.admin.listener.DataChangedEvent; import org.apache.shenyu.admin.mapper.DiscoveryUpstreamMapper; @@ -29,8 +31,6 @@ import org.apache.shenyu.common.enums.ConfigGroupEnum; import org.apache.shenyu.common.enums.DataEventTypeEnum; import org.apache.shenyu.common.utils.UUIDUtils; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; diff --git a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java similarity index 94% rename from shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListener.java rename to shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java index 9e7c97e72068..f8c5aa7c7b4f 100644 --- a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListener.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.shenyu.discovery.api.listener; +package org.apache.shenyu.admin.discovery.listener; /** * Data changed listener. */ public interface DataChangedEventListener { - + /** * when data changed, fire this event. - * + * * @param event data changed event */ void onChange(DiscoveryDataChangedEvent event); -} +} \ No newline at end of file diff --git a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEvent.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java similarity index 95% rename from shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEvent.java rename to shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java index 414034590675..2cf9cd97f1f4 100644 --- a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEvent.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java @@ -1,3 +1,4 @@ + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,19 +16,19 @@ * limitations under the License. */ -package org.apache.shenyu.discovery.api.listener; +package org.apache.shenyu.admin.discovery.listener; /** * Data changed event. */ public final class DiscoveryDataChangedEvent { - + private final String key; - + private final String value; - + private final Event event; - + /** * Instantiates a new Data changed event. * @@ -40,7 +41,7 @@ public DiscoveryDataChangedEvent(final String key, final String value, final Eve this.value = value; this.event = event; } - + /** * Gets key. * @@ -49,7 +50,7 @@ public DiscoveryDataChangedEvent(final String key, final String value, final Eve public String getKey() { return key; } - + /** * Gets value. * @@ -58,7 +59,7 @@ public String getKey() { public String getValue() { return value; } - + /** * Gets event. * @@ -67,12 +68,12 @@ public String getValue() { public Event getEvent() { return event; } - + /** * Data changed event. */ public enum Event { - + /** * Added event. */ diff --git a/shenyu-client/shenyu-client-core/pom.xml b/shenyu-client/shenyu-client-core/pom.xml index b21cb0f4ec1a..008e3798d4a0 100644 --- a/shenyu-client/shenyu-client-core/pom.xml +++ b/shenyu-client/shenyu-client-core/pom.xml @@ -63,7 +63,7 @@ org.apache.shenyu - shenyu-discovery-api + shenyu-registry-api ${project.version} diff --git a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java index 82701adb095e..d14fdd1e311f 100644 --- a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java +++ b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java @@ -20,10 +20,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shenyu.common.dto.DiscoveryUpstreamData; import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.common.utils.GsonUtils; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; import org.apache.shenyu.discovery.api.config.DiscoveryConfig; import org.apache.shenyu.register.common.config.ShenyuDiscoveryConfig; +import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; +import org.apache.shenyu.registry.api.config.RegisterConfig; +import org.apache.shenyu.registry.api.entity.InstanceEntity; import org.apache.shenyu.spi.ExtensionLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +32,7 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.Ordered; +import java.net.URI; import java.util.Objects; import java.util.Optional; import java.util.Properties; @@ -47,25 +49,24 @@ public class InstanceRegisterListener implements ApplicationListener { LOGGER.info("unregister upstream server by jvm runtime hook"); if (Objects.nonNull(discoveryService)) { - discoveryService.shutdown(); + discoveryService.close(); } })); } @@ -73,13 +74,21 @@ public InstanceRegisterListener(final DiscoveryUpstreamData discoveryUpstream, f @Override public void onApplicationEvent(final ContextRefreshedEvent event) { try { - if (StringUtils.isBlank(discoveryConfig.getType()) || StringUtils.equalsIgnoreCase(discoveryConfig.getType(), "local")) { + if (StringUtils.isBlank(discoveryConfig.getRegisterType()) || StringUtils.equalsIgnoreCase(discoveryConfig.getRegisterType(), "local")) { return; } - this.discoveryService = ExtensionLoader.getExtensionLoader(ShenyuDiscoveryService.class).getJoin(discoveryConfig.getType()); + this.discoveryService = ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class).getJoin(discoveryConfig.getRegisterType()); + discoveryConfig.getProps().put("watchPath", path); discoveryService.init(discoveryConfig); - discoveryService.register(path, GsonUtils.getInstance().toJson(currentInstanceUpstream)); - LOGGER.info("shenyu register into ShenyuDiscoveryService {} success", discoveryConfig.getType()); + InstanceEntity instance = new InstanceEntity(); + instance.setStatus(currentInstanceUpstream.getStatus()); + instance.setWeight(currentInstanceUpstream.getWeight()); + final URI uri = URI.create(currentInstanceUpstream.getProtocol() + currentInstanceUpstream.getUrl()); + instance.setPort(uri.getPort()); + instance.setHost(uri.getHost()); + instance.setAppName(discoveryConfig.getProps().getProperty("name")); + discoveryService.persistInstance(instance); + LOGGER.info("shenyu register into ShenyuDiscoveryService {} success", discoveryConfig.getRegisterType()); } catch (Exception e) { LOGGER.error("shenyu register into ShenyuDiscoveryService {} type find error", discoveryConfig.getType(), e); throw new ShenyuException(String.format("shenyu register into ShenyuDiscoveryService %s type find error", discoveryConfig.getType())); diff --git a/shenyu-discovery/pom.xml b/shenyu-discovery/pom.xml deleted file mode 100644 index 491fbc42e2bf..000000000000 --- a/shenyu-discovery/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - org.apache.shenyu - shenyu - 2.7.0-SNAPSHOT - - 4.0.0 - shenyu-discovery - pom - - - shenyu-discovery-api - shenyu-discovery-zookeeper - shenyu-discovery-etcd - shenyu-discovery-nacos - shenyu-discovery-eureka - - - diff --git a/shenyu-discovery/shenyu-discovery-api/pom.xml b/shenyu-discovery/shenyu-discovery-api/pom.xml deleted file mode 100644 index ea6ef5173693..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - org.apache.shenyu - shenyu-discovery - 2.7.0-SNAPSHOT - - 4.0.0 - shenyu-discovery-api - - - - org.apache.shenyu - shenyu-spi - ${project.version} - - - org.springframework - spring-test - test - - - - diff --git a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/ShenyuDiscoveryService.java b/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/ShenyuDiscoveryService.java deleted file mode 100644 index 9ff40c17748b..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/ShenyuDiscoveryService.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.api; - -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.spi.SPI; - -import java.util.List; - -/** - * The interface for shenyu discovery service. - */ -@SPI -public interface ShenyuDiscoveryService { - - /** - * Init shenyu discovery service . - * - * @param config the config - */ - void init(DiscoveryConfig config); - - /** - * Watch path , fire data changed event. - * - * @param key the key - * @param listener the listener - */ - void watch(String key, DataChangedEventListener listener); - - /** - * unwatch path. - * - * @param key key - */ - void unwatch(String key); - - /** - * Register data. - * - * @param key the key - * @param value the value - */ - void register(String key, String value); - - /** - * getData by key. - * - * @param key key - * @return value - */ - List getRegisterData(String key); - - /** - * exists. - * - * @param key key - * @return Boolean - */ - Boolean exists(String key); - - /** - * shutdown. - */ - void shutdown(); - -} diff --git a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/config/DiscoveryConfig.java b/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/config/DiscoveryConfig.java deleted file mode 100644 index 123fe9f2a51d..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/src/main/java/org/apache/shenyu/discovery/api/config/DiscoveryConfig.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.api.config; - -import java.util.Properties; - -/** - * The type Discovery config. - */ -public class DiscoveryConfig { - - private String name; - - private String type; - - private String serverList; - - private Properties props = new Properties(); - - /** - * Gets name. - * - * @return the name - */ - public String getName() { - return name; - } - - /** - * Sets name. - * - * @param name the name - */ - public void setName(final String name) { - this.name = name; - } - - /** - * Gets type. - * - * @return the type - */ - public String getType() { - return type; - } - - /** - * Sets type. - * - * @param type the type - */ - public void setType(final String type) { - this.type = type; - } - - /** - * Gets server list. - * - * @return the server list - */ - public String getServerList() { - return serverList; - } - - /** - * Sets server list. - * - * @param serverList the server list - */ - public void setServerList(final String serverList) { - this.serverList = serverList; - } - - /** - * Gets props. - * - * @return the props - */ - public Properties getProps() { - return props; - } - - /** - * Sets props. - * - * @param props the props - */ - public void setProps(final Properties props) { - this.props = props; - } -} diff --git a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/config/DiscoveryConfigTest.java b/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/config/DiscoveryConfigTest.java deleted file mode 100644 index cd06624f6270..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/config/DiscoveryConfigTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.api.config; - -import org.junit.Test; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; -import org.mockito.junit.jupiter.MockitoExtension; - -import java.util.Properties; -import java.util.function.BiConsumer; -import java.util.function.Function; - -/** - * The Test Case For {@link DiscoveryConfig}. - */ -@ExtendWith(MockitoExtension.class) -public class DiscoveryConfigTest { - - private final DiscoveryConfig discoveryConfig = new DiscoveryConfig(); - - @Test - public void testDiscoveryConfigProperties() { - // the discovery name - String name = "divide_default_discovery"; - // zookeeper nacos etcd consul - String type = "local"; - // the discovery pops (json) - String serverList = "{\"host\": \"localhost\"}"; - - testGetSet(DiscoveryConfig::getName, DiscoveryConfig::setName, name); - testGetSet(DiscoveryConfig::getType, DiscoveryConfig::setType, type); - testGetSet(DiscoveryConfig::getServerList, DiscoveryConfig::setServerList, serverList); - - Properties properties = Mockito.mock(Properties.class); - Assertions.assertNotNull(discoveryConfig.getProps()); - discoveryConfig.setProps(properties); - Assertions.assertEquals(properties, discoveryConfig.getProps()); - } - - /** - * abstract function to test properties get and set. - * - * @param getter Object Get Function - * @param setter Object Set Function - * @param value Object Function Value - * @param T - */ - private void testGetSet(final Function getter, - final BiConsumer setter, - final T value) { - Assertions.assertNull(getter.apply(discoveryConfig)); - setter.accept(discoveryConfig, value); - Assertions.assertEquals(getter.apply(discoveryConfig), value); - } -} diff --git a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListenerTest.java b/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListenerTest.java deleted file mode 100644 index f237e1c03be0..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DataChangedEventListenerTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.api.listener; - -import org.junit.Test; -import org.junit.jupiter.api.Assertions; - -import java.util.concurrent.atomic.AtomicReference; - -import static org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent.Event.ADDED; -import static org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent.Event.DELETED; -import static org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent.Event.IGNORED; -import static org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent.Event.UPDATED; - -/** - * The Test Case For {@link DataChangedEventListener}. - */ -public class DataChangedEventListenerTest { - - @Test - public void testOnChange() { - AtomicReference eventResult = new AtomicReference<>(""); - - DataChangedEventListener dataChangedEventListener = event -> { - DiscoveryDataChangedEvent.Event currentEvent = event.getEvent(); - switch (currentEvent) { - case ADDED: - // added logic... - eventResult.set(ADDED.name()); - break; - case UPDATED: - // updated logic... - eventResult.set(UPDATED.name()); - break; - case DELETED: - // deleted logic... - eventResult.set(DELETED.name()); - break; - case IGNORED: - // ignored logic... - eventResult.set(IGNORED.name()); - break; - default: - break; - } - }; - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent("key", "value", IGNORED); - dataChangedEventListener.onChange(dataChangedEvent); - - Assertions.assertEquals(eventResult.get(), IGNORED.name()); - } -} diff --git a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEventTest.java b/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEventTest.java deleted file mode 100644 index a6ce92b0f275..000000000000 --- a/shenyu-discovery/shenyu-discovery-api/src/test/java/org/apache/shenyu/discovery/api/listener/DiscoveryDataChangedEventTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.api.listener; - -import org.junit.Test; -import org.junit.jupiter.api.Assertions; - -/** - * The Test Case For {@link DiscoveryDataChangedEvent}. - */ -public class DiscoveryDataChangedEventTest { - - private final DiscoveryDataChangedEvent.Event event = DiscoveryDataChangedEvent.Event.IGNORED; - - @Test - public void testDiscoveryDataChangedEvent() { - String key = "key"; - String value = "value"; - DiscoveryDataChangedEvent discoveryDataChangedEvent = new DiscoveryDataChangedEvent(key, value, event); - Assertions.assertEquals(key, discoveryDataChangedEvent.getKey()); - Assertions.assertEquals(value, discoveryDataChangedEvent.getValue()); - Assertions.assertEquals(event, discoveryDataChangedEvent.getEvent()); - } - -} diff --git a/shenyu-discovery/shenyu-discovery-etcd/pom.xml b/shenyu-discovery/shenyu-discovery-etcd/pom.xml deleted file mode 100644 index 17f149060c85..000000000000 --- a/shenyu-discovery/shenyu-discovery-etcd/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - org.apache.shenyu - shenyu-discovery - 2.7.0-SNAPSHOT - - 4.0.0 - shenyu-discovery-etcd - - - - org.apache.shenyu - shenyu-discovery-api - ${project.version} - - - org.apache.shenyu - shenyu-common - ${project.version} - compile - - - io.etcd - jetcd-core - - - grpc-protobuf - io.grpc - - - grpc-stub - io.grpc - - - io.grpc - grpc-core - - - grpc-netty - io.grpc - - - - - io.grpc - grpc-core - ${grpc.version} - - - grpc-protobuf - io.grpc - ${grpc.version} - - - - grpc-stub - io.grpc - ${grpc.version} - - - - io.grpc - grpc-netty - - - - diff --git a/shenyu-discovery/shenyu-discovery-etcd/src/main/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryService.java b/shenyu-discovery/shenyu-discovery-etcd/src/main/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryService.java deleted file mode 100644 index bf3b44a6d950..000000000000 --- a/shenyu-discovery/shenyu-discovery-etcd/src/main/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryService.java +++ /dev/null @@ -1,255 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.etcd; - -import io.etcd.jetcd.ByteSequence; -import io.etcd.jetcd.Client; -import io.etcd.jetcd.Lease; -import io.etcd.jetcd.KV; -import io.etcd.jetcd.Watch; -import io.etcd.jetcd.kv.GetResponse; -import io.etcd.jetcd.lease.LeaseKeepAliveResponse; -import io.etcd.jetcd.options.GetOption; -import io.etcd.jetcd.options.PutOption; -import io.etcd.jetcd.options.WatchOption; -import io.etcd.jetcd.KeyValue; -import io.etcd.jetcd.watch.WatchEvent; -import io.grpc.stub.StreamObserver; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.common.utils.UUIDUtils; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.apache.shenyu.spi.Join; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; - -import static java.nio.charset.StandardCharsets.UTF_8; - -@Join -public class EtcdDiscoveryService implements ShenyuDiscoveryService { - - private static final Logger LOGGER = LoggerFactory.getLogger(EtcdDiscoveryService.class); - - private Client etcdClient; - - private final ConcurrentMap watchCache = new ConcurrentHashMap<>(); - - private long leaseId; - - private long ttl; - - private long timeout; - - private volatile boolean isShuttingDown; - - @Override - public void init(final DiscoveryConfig config) { - try { - if (this.etcdClient != null) { - return; - } - Properties props = config.getProps(); - this.timeout = Long.parseLong(props.getProperty("etcdTimeout", "3000")); - this.ttl = Long.parseLong(props.getProperty("etcdTTL", "5")); - this.etcdClient = Client.builder().endpoints(config.getServerList().split(",")).build(); - LOGGER.info("Etcd Discovery Service initialize successfully"); - if (leaseId == 0) { - initLease(); - } - } catch (Exception e) { - LOGGER.error("Error initializing Etcd Discovery Service", e); - throw new ShenyuException(e); - } - } - - private void initLease() { - Lease lease = null; - try { - lease = etcdClient.getLeaseClient(); - this.leaseId = lease.grant(ttl).get().getID(); - lease.keepAlive(leaseId, new StreamObserver<>() { - @Override - public void onNext(final LeaseKeepAliveResponse leaseKeepAliveResponse) { - } - - @Override - public void onError(final Throwable throwable) { - if (!isShuttingDown) { - LOGGER.error("etcd lease keep alive error", throwable); - } - } - - @Override - public void onCompleted() { - } - }); - } catch (InterruptedException | ExecutionException e) { - LOGGER.error("initLease error.", e); - if (lease != null && leaseId != 0) { - try { - lease.revoke(leaseId).get(); - leaseId = 0; - } catch (InterruptedException | ExecutionException ex) { - LOGGER.error("Failed to revoke lease after initialization error.", ex); - } - } - throw new ShenyuException(e); - } - } - - @Override - public void watch(final String key, final DataChangedEventListener listener) { - try { - GetOption build = GetOption.newBuilder().isPrefix(true).build(); - CompletableFuture getResponseCompletableFuture = etcdClient.getKVClient().get(bytesOf(key), build); - GetResponse getResponse = getResponseCompletableFuture.get(); - List kvs = getResponse.getKvs(); - for (KeyValue kv : kvs) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(kv.getKey().toString(), kv.getValue().toString(UTF_8), DiscoveryDataChangedEvent.Event.ADDED); - listener.onChange(dataChangedEvent); - } - Watch watch = etcdClient.getWatchClient(); - WatchOption option = WatchOption.newBuilder().isPrefix(true).withPrevKV(true).build(); - Watch.Watcher watcher = watch.watch(bytesOf(key), option, Watch.listener(response -> { - for (WatchEvent event : response.getEvents()) { - DiscoveryDataChangedEvent dataChangedEvent; - // ignore parent node - if (event.getKeyValue().getKey().equals(bytesOf(key))) { - return; - } - String value = event.getKeyValue().getValue().toString(StandardCharsets.UTF_8); - String path = event.getKeyValue().getKey().toString(StandardCharsets.UTF_8); - - if (Objects.nonNull(event.getKeyValue()) && Objects.nonNull(value)) { - switch (event.getEventType()) { - case PUT: - dataChangedEvent = event.getKeyValue().getCreateRevision() == event.getKeyValue().getModRevision() - ? new DiscoveryDataChangedEvent(path, value, DiscoveryDataChangedEvent.Event.ADDED) - : new DiscoveryDataChangedEvent(path, value, DiscoveryDataChangedEvent.Event.UPDATED); - break; - case DELETE: - dataChangedEvent = new DiscoveryDataChangedEvent(path, event.getPrevKV().getValue().toString(StandardCharsets.UTF_8), DiscoveryDataChangedEvent.Event.DELETED); - break; - default: - dataChangedEvent = new DiscoveryDataChangedEvent(path, value, DiscoveryDataChangedEvent.Event.IGNORED); - } - listener.onChange(dataChangedEvent); - } - } - })); - watchCache.put(key, watcher); - LOGGER.info("Added etcd watcher for key: {}", key); - } catch (Exception e) { - LOGGER.error("etcd client watch key: {} error", key, e); - throw new ShenyuException(e); - } - } - - @Override - public void unwatch(final String key) { - if (watchCache.containsKey(key)) { - watchCache.remove(key).close(); - LOGGER.info("Unwatched etcd key: {}", key); - } - } - - @Override - public void register(final String key, final String value) { - try { - KV kvClient = etcdClient.getKVClient(); - String uuid = UUIDUtils.getInstance().generateShortUuid(); - PutOption putOption = PutOption.newBuilder().withPrevKV().withLeaseId(leaseId).build(); - kvClient.put(bytesOf(key + "/" + uuid), bytesOf(value), putOption).get(timeout, TimeUnit.MILLISECONDS); - LOGGER.info("etcd client key: {} with value: {}", key, value); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - LOGGER.error("etcd client register (key:{},value:{}) error.", key, value, e); - throw new ShenyuException(e); - } - } - - @Override - public List getRegisterData(final String key) { - try { - KV kvClient = etcdClient.getKVClient(); - GetOption option = GetOption.newBuilder().isPrefix(true).build(); - GetResponse response = kvClient.get(bytesOf(key), option).get(); - return response.getKvs().stream() - .filter(o -> !o.getKey().equals(ByteSequence.from(key, StandardCharsets.UTF_8))) - .map(kv -> kv.getValue().toString(StandardCharsets.UTF_8)) - .collect(Collectors.toList()); - } catch (Exception e) { - LOGGER.error("etcd client get registered data with key: {} error", key, e); - throw new ShenyuException(e); - } - } - - @Override - public Boolean exists(final String key) { - try { - KV kvClient = etcdClient.getKVClient(); - GetOption option = GetOption.newBuilder().isPrefix(true).withCountOnly(true).build(); - GetResponse response = kvClient.get(bytesOf(key), option).get(); - return response.getCount() > 0; - } catch (InterruptedException | ExecutionException e) { - throw new ShenyuException(e); - } - } - - @Override - public void shutdown() { - try { - isShuttingDown = true; - for (Map.Entry entry : watchCache.entrySet()) { - Watch.Watcher watcher = entry.getValue(); - watcher.close(); - } - watchCache.clear(); - if (Objects.nonNull(etcdClient)) { - etcdClient.close(); - etcdClient = null; - leaseId = 0; - } - LOGGER.info("Shutting down EtcdDiscoveryService"); - } catch (Exception e) { - LOGGER.error("etcd client shutdown error", e); - throw new ShenyuException(e); - } finally { - isShuttingDown = false; - } - } - - private ByteSequence bytesOf(final String val) { - return ByteSequence.from(val, UTF_8); - } - -} diff --git a/shenyu-discovery/shenyu-discovery-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService b/shenyu-discovery/shenyu-discovery-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService deleted file mode 100644 index 90aad4e7e899..000000000000 --- a/shenyu-discovery/shenyu-discovery-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService +++ /dev/null @@ -1,18 +0,0 @@ -# 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 -# -# http://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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -etcd=org.apache.shenyu.discovery.etcd.EtcdDiscoveryService - diff --git a/shenyu-discovery/shenyu-discovery-etcd/src/test/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryServiceTest.java b/shenyu-discovery/shenyu-discovery-etcd/src/test/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryServiceTest.java deleted file mode 100644 index 355bed9b0da8..000000000000 --- a/shenyu-discovery/shenyu-discovery-etcd/src/test/java/org/apache/shenyu/discovery/etcd/EtcdDiscoveryServiceTest.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.etcd; - -import io.etcd.jetcd.ByteSequence; -import io.etcd.jetcd.Client; -import io.etcd.jetcd.ClientBuilder; -import io.etcd.jetcd.KV; -import io.etcd.jetcd.KeyValue; -import io.etcd.jetcd.Lease; -import io.etcd.jetcd.Watch; -import io.etcd.jetcd.kv.GetResponse; -import io.etcd.jetcd.kv.PutResponse; -import io.etcd.jetcd.lease.LeaseGrantResponse; -import io.etcd.jetcd.lease.LeaseKeepAliveResponse; -import io.etcd.jetcd.options.GetOption; -import io.etcd.jetcd.options.PutOption; -import io.etcd.jetcd.options.WatchOption; -import io.etcd.jetcd.watch.WatchEvent; -import io.etcd.jetcd.watch.WatchResponse; -import io.grpc.stub.StreamObserver; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.MockedStatic; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Properties; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - - -/** - * The test for {@link EtcdDiscoveryService } . - */ -public class EtcdDiscoveryServiceTest { - - private EtcdDiscoveryService etcdDiscoveryServiceUnderTest; - - private Client etcdClient; - - @BeforeEach - void setUp() throws Exception { - etcdDiscoveryServiceUnderTest = new EtcdDiscoveryService(); - etcdClient = mock(Client.class); - setField(EtcdDiscoveryService.class, "etcdClient", etcdClient); - } - - @AfterEach - void downTest() { - etcdDiscoveryServiceUnderTest.shutdown(); - verify(etcdClient).close(); - } - - private void setField(final Class clazz, final String fieldName, final Object value) throws NoSuchFieldException, IllegalAccessException { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(etcdDiscoveryServiceUnderTest, value); - field.setAccessible(false); - } - - @Test - public void testInit() throws ExecutionException, InterruptedException, NoSuchFieldException, IllegalAccessException { - setField(EtcdDiscoveryService.class, "etcdClient", null); - final ClientBuilder builder = mock(ClientBuilder.class); - when(builder.endpoints(anyString())).thenReturn(builder); - when(builder.build()).thenReturn(etcdClient); - final MockedStatic client = mockStatic(Client.class); - client.when(Client::builder).thenReturn(builder); - - final Lease lease = mock(Lease.class); - final CompletableFuture leaseGrantFuture = mock(CompletableFuture.class); - when(lease.grant(anyLong())).thenReturn(leaseGrantFuture); - final LeaseGrantResponse leaseGrantResponse = mock(LeaseGrantResponse.class); - when(leaseGrantFuture.get()).thenReturn(leaseGrantResponse); - when(etcdClient.getLeaseClient()).thenReturn(lease); - - ArrayList> observerList = new ArrayList<>(); - doAnswer(invocationOnMock -> { - observerList.add(invocationOnMock.getArgument(1)); - return lease; - }).when(lease).keepAlive(anyLong(), any()); - - final Properties props = new Properties(); - props.put("etcdTimeout", "3000"); - props.put("etcdTTL", "5"); - final DiscoveryConfig discoveryConfig = new DiscoveryConfig(); - discoveryConfig.setProps(props); - discoveryConfig.setServerList("localhost:2379"); - etcdDiscoveryServiceUnderTest.init(discoveryConfig); - final LeaseKeepAliveResponse leaseKeepAliveResponse = mock(LeaseKeepAliveResponse.class); - - observerList.forEach(observer -> { - observer.onNext(leaseKeepAliveResponse); - observer.onError(new ShenyuException("test")); - observer.onCompleted(); - }); - - doThrow(new InterruptedException("test")).when(leaseGrantFuture).get(); - assertDoesNotThrow(() -> etcdDiscoveryServiceUnderTest.init(discoveryConfig)); - } - - @Test - void testWatch() throws NoSuchFieldException, IllegalAccessException, ExecutionException, InterruptedException { - final String eventKey = "event_key"; - final String eventValue = "event_value"; - final String key = "key"; - - final Watch watch = mock(Watch.class); - when(watch.watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class))) - .thenReturn(mock(Watch.Watcher.class)); - final KV kvClient = mock(KV.class); - when(etcdClient.getKVClient()).thenReturn(kvClient); - final GetResponse getResponse = mock(GetResponse.class); - final CompletableFuture completableFuture = mock(CompletableFuture.class); - when(completableFuture.get()) - .thenReturn(getResponse); - when(kvClient.get(any(ByteSequence.class), any(GetOption.class))).thenReturn(completableFuture); - when(etcdClient.getWatchClient()).thenReturn(watch); - - ArrayList listeners = new ArrayList<>(); - doAnswer(invocationOnMock -> { - listeners.add(invocationOnMock.getArgument(2)); - return mock(Watch.Watcher.class); - }).when(watch).watch(any(ByteSequence.class), any(WatchOption.class), any(Watch.Listener.class)); - - final KeyValue keyValue = mock(KeyValue.class); - when(keyValue.getKey()).thenReturn(mock(ByteSequence.class)); - when(keyValue.getKey().toString(any())).thenReturn(eventKey); - when(keyValue.getValue()).thenReturn(mock(ByteSequence.class)); - when(keyValue.getValue().toString(any())).thenReturn(eventValue); - - ArrayList events = new ArrayList<>(); - for (WatchEvent.EventType eventType : WatchEvent.EventType.values()) { - WatchEvent event = mock(WatchEvent.class); - when(event.getEventType()).thenReturn(eventType); - when(event.getPrevKV()).thenReturn(keyValue); - when(event.getKeyValue()).thenReturn(keyValue); - events.add(event); - } - final WatchResponse watchResponse = mock(WatchResponse.class); - when(watchResponse.getEvents()).thenReturn(events); - final DataChangedEventListener mockListener = mock(DataChangedEventListener.class); - etcdDiscoveryServiceUnderTest.watch(key, mockListener); - listeners.forEach(listener -> listener.onNext(watchResponse)); - - final Field cacheField = etcdDiscoveryServiceUnderTest.getClass().getDeclaredField("watchCache"); - cacheField.setAccessible(true); - ConcurrentMap watchCache = (ConcurrentMap) cacheField.get(etcdDiscoveryServiceUnderTest); - Assertions.assertNotNull(watchCache.get(key)); - } - - @Test - public void testUnWatch() throws NoSuchFieldException, IllegalAccessException { - final String key = "key"; - etcdDiscoveryServiceUnderTest.unwatch(key); - final Field watchCacheField = etcdDiscoveryServiceUnderTest.getClass().getDeclaredField("watchCache"); - watchCacheField.setAccessible(true); - ConcurrentMap o = (ConcurrentMap) watchCacheField.get(etcdDiscoveryServiceUnderTest); - assertFalse(o.containsKey(key)); - } - - @Test - void registerTest() throws ExecutionException, InterruptedException, TimeoutException { - final String key = "key"; - final String value = "value"; - - final KV kvClient = mock(KV.class); - when(etcdClient.getKVClient()).thenReturn(kvClient); - - final PutResponse putResponse = mock(PutResponse.class); - final CompletableFuture completableFuture = mock(CompletableFuture.class); - when(completableFuture.get(anyLong(), any(TimeUnit.class))) - .thenReturn(putResponse); - when(kvClient.put(any(ByteSequence.class), any(ByteSequence.class), any(PutOption.class))) - .thenReturn(completableFuture); - etcdDiscoveryServiceUnderTest.register(key, value); - - doThrow(new InterruptedException()).when(completableFuture).get(anyLong(), any(TimeUnit.class)); - assertThrows(ShenyuException.class, () -> etcdDiscoveryServiceUnderTest.register(key, value)); - } - - @Test - void testGetRegisterData() throws InterruptedException, ExecutionException { - final String key = "key"; - final KV kv = mock(KV.class); - when(etcdClient.getKVClient()).thenReturn(kv); - final GetResponse getResponse = mock(GetResponse.class); - when(getResponse.getKvs()).thenReturn(Collections.emptyList()); - final CompletableFuture completableFuture = mock(CompletableFuture.class); - when(completableFuture.get()).thenReturn(getResponse); - when(kv.get(any(ByteSequence.class), any(GetOption.class))).thenReturn(completableFuture); - assertDoesNotThrow(() -> etcdDiscoveryServiceUnderTest.getRegisterData(key)); - doThrow(new InterruptedException("test")).when(completableFuture).get(); - assertThrows(ShenyuException.class, () -> etcdDiscoveryServiceUnderTest.getRegisterData(key)); - } - - @Test - void testExists() throws ExecutionException, InterruptedException { - final String key = "key"; - final KV kvClient = mock(KV.class); - when(etcdClient.getKVClient()).thenReturn(kvClient); - - final GetResponse getResponse = mock(GetResponse.class); - when(getResponse.getCount()).thenReturn(1L); - final CompletableFuture completableFuture = mock(CompletableFuture.class); - when(completableFuture.get()).thenReturn(getResponse); - when(kvClient.get(any(ByteSequence.class), any(GetOption.class))).thenReturn(completableFuture); - - final Boolean result = etcdDiscoveryServiceUnderTest.exists(key); - assertTrue(result); - doThrow(new InterruptedException("test")).when(completableFuture).get(); - assertThrows(ShenyuException.class, () -> etcdDiscoveryServiceUnderTest.exists(key)); - } - -} diff --git a/shenyu-discovery/shenyu-discovery-eureka/pom.xml b/shenyu-discovery/shenyu-discovery-eureka/pom.xml deleted file mode 100644 index aef83056bad0..000000000000 --- a/shenyu-discovery/shenyu-discovery-eureka/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - 4.0.0 - - org.apache.shenyu - shenyu-discovery - 2.7.0-SNAPSHOT - - - shenyu-discovery-eureka - - - - org.apache.shenyu - shenyu-discovery-api - ${project.version} - - - org.apache.shenyu - shenyu-common - ${project.version} - compile - - - com.netflix.eureka - eureka-client - - - com.netflix.eureka - eureka-client-jersey3 - 2.0.2 - - - - - diff --git a/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/CustomedEurekaConfig.java b/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/CustomedEurekaConfig.java deleted file mode 100644 index b5f0195b318c..000000000000 --- a/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/CustomedEurekaConfig.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.eureka; - -import com.netflix.appinfo.EurekaInstanceConfig; -import com.netflix.appinfo.MyDataCenterInstanceConfig; -import org.apache.commons.lang.StringUtils; - -import java.util.Map; - -public class CustomedEurekaConfig extends MyDataCenterInstanceConfig implements EurekaInstanceConfig { - - private String applicationName; - - private String instanceId; - - private String ipAddress; - - private int port = -1; - - private Map metadata; - - @Override - public String getInstanceId() { - if (StringUtils.isBlank(instanceId)) { - return super.getInstanceId(); - } - return instanceId; - } - - @Override - public String getIpAddress() { - if (StringUtils.isBlank(ipAddress)) { - return super.getIpAddress(); - } - return ipAddress; - } - - @Override - public int getNonSecurePort() { - if (port == -1) { - return super.getNonSecurePort(); - } - return port; - } - - @Override - public String getAppname() { - if (StringUtils.isBlank(applicationName)) { - return super.getAppname(); - } - return applicationName; - } - - @Override - public String getHostName(final boolean refresh) { - return this.getIpAddress(); - } - - @Override - public Map getMetadataMap() { - return metadata; - } - - /** - * Sets the instance ID. - * - * @param instanceId The unique identifier for the instance. - */ - public void setInstanceId(final String instanceId) { - this.instanceId = instanceId; - } - - /** - * Sets the IP address. - * - * @param ipAddress The IP address of the instance. - */ - public void setIpAddress(final String ipAddress) { - this.ipAddress = ipAddress; - } - - /** - * Sets the port number. - * - * @param port The port number where the service is running. - */ - public void setPort(final int port) { - this.port = port; - } - - /** - * Sets the application name. - * - * @param applicationName The name of the application. - */ - public void setApplicationName(final String applicationName) { - this.applicationName = applicationName; - } - - /** - * Sets the application name. - * - * @param metadata The metadata of the instance - */ - public void setMetadataMap(final Map metadata) { - this.metadata = metadata; - } -} diff --git a/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryService.java b/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryService.java deleted file mode 100644 index 2465590b2594..000000000000 --- a/shenyu-discovery/shenyu-discovery-eureka/src/main/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryService.java +++ /dev/null @@ -1,304 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.eureka; - -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; -import com.netflix.appinfo.EurekaInstanceConfig; -import com.netflix.appinfo.MyDataCenterInstanceConfig; -import com.netflix.discovery.EurekaClientConfig; -import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories; -import org.apache.shenyu.common.dto.DiscoveryUpstreamData; -import org.apache.shenyu.common.utils.GsonUtils; -import com.netflix.appinfo.ApplicationInfoManager; -import com.netflix.appinfo.InstanceInfo; -import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider; -import com.netflix.config.ConfigurationManager; -import com.netflix.discovery.EurekaClient; -import com.netflix.discovery.DiscoveryClient; -import com.netflix.discovery.DefaultEurekaClientConfig; -import org.apache.shenyu.common.concurrent.ShenyuThreadFactory; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.apache.shenyu.spi.Join; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -@Join -public class EurekaDiscoveryService implements ShenyuDiscoveryService { - private static final Logger LOGGER = LoggerFactory.getLogger(EurekaDiscoveryService.class); - - private ApplicationInfoManager applicationInfoManager; - - private EurekaClient eurekaClient; - - private DiscoveryConfig discoveryConfig; - - private final ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(10, ShenyuThreadFactory.create("scheduled-eureka-watcher", true)); - - private final ConcurrentMap> listenerThreadsMap = new ConcurrentHashMap<>(); - - private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); - - @Override - public void init(final DiscoveryConfig config) { - if (this.eurekaClient != null) { - LOGGER.info("Eureka naming service already registered"); - } - discoveryConfig = config; - try { - ConfigurationManager.loadProperties(getEurekaProperties(false)); - applicationInfoManager = initializeApplicationInfoManager(new MyDataCenterInstanceConfig()); - eurekaClient = initializeEurekaClient(applicationInfoManager, new DefaultEurekaClientConfig()); - LOGGER.info("Initializing EurekaDiscoveryService success"); - } catch (Exception e) { - LOGGER.error("Error initializing EurekaDiscoveryService", e); - clean(); - throw new ShenyuException(e); - } - } - - @Override - public void watch(final String key, final DataChangedEventListener listener) { - List initialInstances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); - instanceListMap.put(key, initialInstances); - for (InstanceInfo instance : initialInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getAppName(), - buildUpstreamJsonFromInstanceInfo(instance), DiscoveryDataChangedEvent.Event.ADDED); - listener.onChange(dataChangedEvent); - } - ScheduledFuture scheduledFuture = executorService.scheduleAtFixedRate(() -> { - try { - List previousInstances = instanceListMap.get(key); - List currentInstances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); - compareInstances(previousInstances, currentInstances, listener); - instanceListMap.put(key, currentInstances); - } catch (Exception e) { - LOGGER.error("EurekaDiscoveryService watch key: {} error", key, e); - throw new ShenyuException(e); - } - }, 0, 1, TimeUnit.SECONDS); - listenerThreadsMap.put(key, scheduledFuture); - } - - @Override - public void unwatch(final String key) { - try { - ScheduledFuture scheduledFuture = listenerThreadsMap.get(key); - if (Objects.nonNull(scheduledFuture)) { - scheduledFuture.cancel(true); - listenerThreadsMap.remove(key); - LOGGER.info("EurekaDiscoveryService unwatch key {} successfully", key); - } - } catch (Exception e) { - LOGGER.error("Error removing eureka watch task for key '{}': {}", key, e.getMessage(), e); - throw new ShenyuException(e); - } - } - - @Override - public void register(final String key, final String value) { - CustomedEurekaConfig customedEurekaConfig = new CustomedEurekaConfig(); - InstanceInfo instanceInfoFromJson = buildInstanceInfoFromUpstream(key, value); - customedEurekaConfig.setIpAddress(instanceInfoFromJson.getIPAddr()); - customedEurekaConfig.setPort(instanceInfoFromJson.getPort()); - customedEurekaConfig.setApplicationName(key); - customedEurekaConfig.setInstanceId(instanceInfoFromJson.getInstanceId()); - customedEurekaConfig.setMetadataMap(instanceInfoFromJson.getMetadata()); - try { - ConfigurationManager.loadProperties(getEurekaProperties(true)); - InstanceInfo instanceInfo = new EurekaConfigBasedInstanceInfoProvider(customedEurekaConfig).get(); - applicationInfoManager = new ApplicationInfoManager(customedEurekaConfig, instanceInfo); - eurekaClient = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig(), new Jersey3TransportClientFactories()); - applicationInfoManager.setInstanceStatus(InstanceInfo.InstanceStatus.UP); - } catch (Exception e) { - LOGGER.error("Error register eureka instance", e); - clean(); - throw new ShenyuException(e); - } - } - - @Override - public List getRegisterData(final String key) { - try { - List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); - List registerDataList = new ArrayList<>(); - for (InstanceInfo instanceInfo : instances) { - String instanceInfoJson = buildUpstreamJsonFromInstanceInfo(instanceInfo); - registerDataList.add(instanceInfoJson); - } - return registerDataList; - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - @Override - public Boolean exists(final String key) { - try { - List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); - return !instances.isEmpty(); - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - @Override - public void shutdown() { - try { - for (ScheduledFuture scheduledFuture : listenerThreadsMap.values()) { - scheduledFuture.cancel(true); - } - listenerThreadsMap.clear(); - if (Objects.nonNull(eurekaClient)) { - eurekaClient.getApplicationInfoManager().setInstanceStatus(InstanceInfo.InstanceStatus.DOWN); - eurekaClient.shutdown(); - } - LOGGER.info("Shutting down EurekaDiscoveryService"); - clean(); - } catch (Exception e) { - LOGGER.error("Shutting down EurekaDiscoveryService error", e); - throw new ShenyuException(e); - } - } - - private Properties getEurekaProperties(final boolean needRegister) { - Properties eurekaProperties = new Properties(); - eurekaProperties.setProperty("eureka.serviceUrl.default", discoveryConfig.getServerList()); - eurekaProperties.setProperty("eureka.client.refresh.interval", discoveryConfig.getProps().getProperty("eurekaClientRefreshInterval", "10")); - eurekaProperties.setProperty("eureka.client.registry-fetch-interval-seconds", discoveryConfig.getProps().getProperty("eurekaClientRegistryFetchIntervalSeconds", "10")); - eurekaProperties.setProperty("eureka.registration.enabled", String.valueOf(needRegister)); - - return eurekaProperties; - } - - private ApplicationInfoManager initializeApplicationInfoManager(final EurekaInstanceConfig instanceConfig) { - if (Objects.isNull(applicationInfoManager)) { - InstanceInfo instanceInfo = new EurekaConfigBasedInstanceInfoProvider(instanceConfig).get(); - applicationInfoManager = new ApplicationInfoManager(instanceConfig, instanceInfo); - } - - return applicationInfoManager; - } - - private EurekaClient initializeEurekaClient(final ApplicationInfoManager applicationInfoManager, final EurekaClientConfig clientConfig) { - if (Objects.isNull(eurekaClient)) { - eurekaClient = new DiscoveryClient(applicationInfoManager, clientConfig, new Jersey3TransportClientFactories()); - } - - return eurekaClient; - } - - private void clean() { - eurekaClient = null; - applicationInfoManager = null; - } - - private String buildUpstreamJsonFromInstanceInfo(final InstanceInfo instanceInfo) { - JsonObject upstreamJson = new JsonObject(); - upstreamJson.addProperty("url", instanceInfo.getIPAddr() + ":" + instanceInfo.getPort()); - upstreamJson.addProperty("weight", instanceInfo.getMetadata().get("weight")); - upstreamJson.addProperty("protocol", instanceInfo.getMetadata().get("protocol")); - upstreamJson.addProperty("props", instanceInfo.getMetadata().get("props")); - if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.UP) { - upstreamJson.addProperty("status", 0); - } else if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.DOWN) { - upstreamJson.addProperty("status", 1); - } - return GsonUtils.getInstance().toJson(upstreamJson); - } - - private void compareInstances(final List previousInstances, final List currentInstances, final DataChangedEventListener listener) { - Set addedInstances = currentInstances.stream() - .filter(item -> !previousInstances.contains(item)) - .collect(Collectors.toSet()); - if (!addedInstances.isEmpty()) { - for (InstanceInfo instance : addedInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getAppName(), - buildUpstreamJsonFromInstanceInfo(instance), DiscoveryDataChangedEvent.Event.ADDED); - listener.onChange(dataChangedEvent); - } - } - - Set deletedInstances = previousInstances.stream() - .filter(item -> !currentInstances.contains(item)) - .collect(Collectors.toSet()); - if (!deletedInstances.isEmpty()) { - for (InstanceInfo instance : deletedInstances) { - instance.setStatus(InstanceInfo.InstanceStatus.DOWN); - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getAppName(), - buildUpstreamJsonFromInstanceInfo(instance), DiscoveryDataChangedEvent.Event.DELETED); - listener.onChange(dataChangedEvent); - } - } - - Set updatedInstances = currentInstances.stream() - .filter(currentInstance -> previousInstances.stream() - .anyMatch(previousInstance -> currentInstance.getInstanceId().equals(previousInstance.getInstanceId()) && !currentInstance.equals(previousInstance))) - .collect(Collectors.toSet()); - if (!updatedInstances.isEmpty()) { - for (InstanceInfo instance : updatedInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getAppName(), - buildUpstreamJsonFromInstanceInfo(instance), DiscoveryDataChangedEvent.Event.UPDATED); - listener.onChange(dataChangedEvent); - } - } - } - - private InstanceInfo buildInstanceInfoFromUpstream(final String key, final String value) { - try { - DiscoveryUpstreamData upstreamData = GsonUtils.getInstance().fromJson(value, DiscoveryUpstreamData.class); - Map metadata = GsonUtils.getInstance().toObjectMap(upstreamData.getProps(), String.class); - metadata = metadata != null ? metadata : new HashMap<>(); - metadata.put("weight", String.valueOf(upstreamData.getWeight())); - metadata.put("protocol", String.valueOf(upstreamData.getProtocol())); - metadata.put("props", Optional.ofNullable(upstreamData.getProps()).orElse("{}")); - String[] urls = upstreamData.getUrl().split(":", 2); - return InstanceInfo.Builder.newBuilder() - .setAppName(key) - .setIPAddr(urls[0]) - .setPort(Integer.parseInt(urls[1])) - .setMetadata(metadata) - .setInstanceId(urls[0] + ":" + key + ":" + urls[1]) - .build(); - } catch (JsonSyntaxException jsonSyntaxException) { - LOGGER.error("The json format of value is wrong: {}", jsonSyntaxException.getMessage(), jsonSyntaxException); - throw new ShenyuException(jsonSyntaxException); - } - } - -} diff --git a/shenyu-discovery/shenyu-discovery-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService b/shenyu-discovery/shenyu-discovery-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService deleted file mode 100644 index 3e16a6ef0588..000000000000 --- a/shenyu-discovery/shenyu-discovery-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService +++ /dev/null @@ -1,17 +0,0 @@ -# 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 -# -# http://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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -eureka=org.apache.shenyu.discovery.eureka.EurekaDiscoveryService diff --git a/shenyu-discovery/shenyu-discovery-eureka/src/test/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryServiceTest.java b/shenyu-discovery/shenyu-discovery-eureka/src/test/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryServiceTest.java deleted file mode 100644 index db0959aecc58..000000000000 --- a/shenyu-discovery/shenyu-discovery-eureka/src/test/java/org/apache/shenyu/discovery/eureka/EurekaDiscoveryServiceTest.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.eureka; - -import com.google.gson.JsonObject; -import com.netflix.appinfo.ApplicationInfoManager; -import com.netflix.appinfo.InstanceInfo; -import com.netflix.discovery.EurekaClient; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.common.utils.GsonUtils; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertThrows; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -/** - * The test for {@link EurekaDiscoveryService} . - */ -class EurekaDiscoveryServiceTest { - - private EurekaDiscoveryService eurekaDiscoveryServiceUnderTest; - - private EurekaClient eurekaClient; - - private ApplicationInfoManager applicationInfoManager; - - @BeforeEach - void setUp() throws NoSuchFieldException, IllegalAccessException { - eurekaDiscoveryServiceUnderTest = new EurekaDiscoveryService(); - eurekaClient = mock(EurekaClient.class); - applicationInfoManager = mock(ApplicationInfoManager.class); - setField(eurekaDiscoveryServiceUnderTest.getClass(), "eurekaClient", eurekaClient); - setField(eurekaDiscoveryServiceUnderTest.getClass(), "applicationInfoManager", applicationInfoManager); - } - - @AfterEach - void downTest() { - when(eurekaClient.getApplicationInfoManager()).thenReturn(applicationInfoManager); - eurekaDiscoveryServiceUnderTest.shutdown(); - verify(applicationInfoManager).setInstanceStatus(InstanceInfo.InstanceStatus.DOWN); - verify(eurekaClient).shutdown(); - } - - private void setField(final Class clazz, final String fieldName, final Object value) throws NoSuchFieldException, IllegalAccessException { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(eurekaDiscoveryServiceUnderTest, value); - field.setAccessible(false); - } - - @Test - void testWatch() throws NoSuchFieldException, IllegalAccessException { - final String key = "testService"; - final DataChangedEventListener mockListener = mock(DataChangedEventListener.class); - final List initialInstances = new ArrayList<>(); - initialInstances.add(mock(InstanceInfo.class)); - - when(eurekaClient.getInstancesByVipAddressAndAppName(null, key, true)).thenReturn(initialInstances); - final ScheduledExecutorService mockExecutorService = mock(ScheduledExecutorService.class); - setField(eurekaDiscoveryServiceUnderTest.getClass(), "executorService", mockExecutorService); - - final ScheduledFuture mockFuture = mock(ScheduledFuture.class); - doReturn(mockFuture).when(mockExecutorService).scheduleAtFixedRate( - any(Runnable.class), - anyLong(), - anyLong(), - any(TimeUnit.class) - ); - - final ConcurrentMap> mockListenerThreadsMap = new ConcurrentHashMap<>(); - setField(eurekaDiscoveryServiceUnderTest.getClass(), "listenerThreadsMap", mockListenerThreadsMap); - - eurekaDiscoveryServiceUnderTest.watch(key, mockListener); - - verify(eurekaClient, times(1)).getInstancesByVipAddressAndAppName(null, key, true); - verify(mockExecutorService, times(1)).scheduleAtFixedRate(any(Runnable.class), eq(0L), eq(1L), eq(TimeUnit.SECONDS)); - verify(mockListener, times(initialInstances.size())).onChange(any(DiscoveryDataChangedEvent.class)); - - assertTrue(mockListenerThreadsMap.containsKey(key)); - assertEquals(mockFuture, mockListenerThreadsMap.get(key)); - } - - @Test - void testUnwatch() throws NoSuchFieldException, IllegalAccessException { - final String key = "testService"; - - final ScheduledFuture mockFuture = mock(ScheduledFuture.class); - final ConcurrentMap> mockListenerThreadsMap = new ConcurrentHashMap<>(); - mockListenerThreadsMap.put(key, mockFuture); - setField(eurekaDiscoveryServiceUnderTest.getClass(), "listenerThreadsMap", mockListenerThreadsMap); - - eurekaDiscoveryServiceUnderTest.unwatch(key); - - verify(mockFuture, times(1)).cancel(true); - assertFalse(mockListenerThreadsMap.containsKey(key)); - } - - @Test - void testGetRegisterData() { - final String key = "testService"; - final List instances = new ArrayList<>(); - instances.add(mock(InstanceInfo.class)); - when(eurekaClient.getInstancesByVipAddressAndAppName(null, key, true)).thenReturn(instances); - - final InstanceInfo instanceInfo = instances.get(0); - when(instanceInfo.getIPAddr()).thenReturn("127.0.0.1"); - when(instanceInfo.getPort()).thenReturn(8080); - final Map metadata = new HashMap<>(); - metadata.put("key1", "value1"); - when(instanceInfo.getMetadata()).thenReturn(metadata); - when(instanceInfo.getStatus()).thenReturn(InstanceInfo.InstanceStatus.UP); - - final List registerDataList = eurekaDiscoveryServiceUnderTest.getRegisterData(key); - - assertNotNull(registerDataList); - assertFalse(registerDataList.isEmpty()); - final String expectedJson = buildUpstreamJsonFromInstanceInfo(instanceInfo); - assertEquals(expectedJson, registerDataList.get(0)); - } - - @Test - void testExists() { - final String key = "testService"; - final List instances = new ArrayList<>(); - instances.add(mock(InstanceInfo.class)); - - // Mock this service exists - when(eurekaClient.getInstancesByVipAddressAndAppName(null, key, true)).thenReturn(instances); - assertTrue(eurekaDiscoveryServiceUnderTest.exists(key)); - - // Mock the service does not exist - when(eurekaClient.getInstancesByVipAddressAndAppName(null, key, true)).thenReturn(Collections.emptyList()); - assertFalse(eurekaDiscoveryServiceUnderTest.exists(key)); - - // Mock the throwing of Exception - when(eurekaClient.getInstancesByVipAddressAndAppName(null, key, true)).thenThrow(new ShenyuException("test")); - assertThrows(ShenyuException.class, () -> eurekaDiscoveryServiceUnderTest.exists(key)); - } - - /** - * Same as in EurekaDiscoveryService. - * - * @param instanceInfo Convert eureka instance to Json string - */ - private String buildUpstreamJsonFromInstanceInfo(final InstanceInfo instanceInfo) { - JsonObject upstreamJson = new JsonObject(); - upstreamJson.addProperty("url", instanceInfo.getIPAddr() + ":" + instanceInfo.getPort()); - upstreamJson.addProperty("weight", instanceInfo.getMetadata().get("weight")); - upstreamJson.addProperty("protocol", instanceInfo.getMetadata().get("protocol")); - upstreamJson.addProperty("props", instanceInfo.getMetadata().get("props")); - if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.UP) { - upstreamJson.addProperty("status", 0); - } else if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.DOWN) { - upstreamJson.addProperty("status", 1); - } - return GsonUtils.getInstance().toJson(upstreamJson); - } - -} diff --git a/shenyu-discovery/shenyu-discovery-nacos/pom.xml b/shenyu-discovery/shenyu-discovery-nacos/pom.xml deleted file mode 100644 index 163a962d9798..000000000000 --- a/shenyu-discovery/shenyu-discovery-nacos/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - org.apache.shenyu - shenyu-discovery - 2.7.0-SNAPSHOT - - 4.0.0 - shenyu-discovery-nacos - - - - org.apache.shenyu - shenyu-discovery-api - ${project.version} - - - org.apache.shenyu - shenyu-common - ${project.version} - compile - - - com.alibaba.nacos - nacos-client - - - - diff --git a/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java b/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java deleted file mode 100644 index a577b8ae6458..000000000000 --- a/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java +++ /dev/null @@ -1,274 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.nacos; - -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; -import org.apache.shenyu.common.dto.DiscoveryUpstreamData; -import org.apache.shenyu.common.utils.GsonUtils; -import com.alibaba.nacos.api.PropertyKeyConst; -import com.alibaba.nacos.api.exception.NacosException; -import com.alibaba.nacos.api.naming.NamingFactory; -import com.alibaba.nacos.api.naming.listener.EventListener; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.listener.NamingEvent; -import com.alibaba.nacos.api.naming.pojo.Instance; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.apache.shenyu.spi.Join; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.stream.Collectors; - -/** - * The type Nacos for shenyu discovery service. - */ -@Join -public class NacosDiscoveryService implements ShenyuDiscoveryService { - - private static final Logger LOGGER = LoggerFactory.getLogger(NacosDiscoveryService.class); - - private static final String NAMESPACE = "nacosNameSpace"; - - private final ConcurrentMap listenerMap = new ConcurrentHashMap<>(); - - private NamingService namingService; - - private String groupName; - - private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); - - @Override - public void init(final DiscoveryConfig config) { - if (this.namingService != null) { - LOGGER.info("Nacos naming service already registered"); - return; - } - Properties properties = config.getProps(); - Properties nacosProperties = new Properties(); - this.groupName = properties.getProperty("groupName", "SHENYU_GROUP"); - String serverAddr = config.getServerList(); - nacosProperties.put(PropertyKeyConst.SERVER_ADDR, serverAddr); - nacosProperties.put(PropertyKeyConst.NAMESPACE, properties.getProperty(NAMESPACE, "")); - nacosProperties.put(PropertyKeyConst.USERNAME, properties.getProperty(PropertyKeyConst.USERNAME, "")); - nacosProperties.put(PropertyKeyConst.PASSWORD, properties.getProperty(PropertyKeyConst.PASSWORD, "")); - nacosProperties.put(PropertyKeyConst.ACCESS_KEY, properties.getProperty(PropertyKeyConst.ACCESS_KEY, "")); - nacosProperties.put(PropertyKeyConst.SECRET_KEY, properties.getProperty(PropertyKeyConst.SECRET_KEY, "")); - try { - this.namingService = NamingFactory.createNamingService(nacosProperties); - LOGGER.info("Nacos naming service initialized success"); - } catch (NacosException e) { - LOGGER.error("Error initializing Nacos naming service", e); - throw new ShenyuException(e); - } - } - - @Override - public void watch(final String key, final DataChangedEventListener listener) { - try { - List initialInstances = namingService.selectInstances(key, groupName, true); - instanceListMap.put(key, initialInstances); - for (Instance instance : initialInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getServiceName(), - buildUpstreamJsonFromInstance(instance), DiscoveryDataChangedEvent.Event.ADDED); - listener.onChange(dataChangedEvent); - } - EventListener nacosListener = event -> { - if (event instanceof NamingEvent) { - try { - List previousInstances = instanceListMap.get(key); - List currentInstances = namingService.selectInstances(key, groupName, true); - compareInstances(previousInstances, currentInstances, listener); - instanceListMap.put(key, currentInstances); - } catch (NacosException e) { - throw new ShenyuException(e); - } - } - }; - namingService.subscribe(key, groupName, nacosListener); - listenerMap.put(key, nacosListener); - LOGGER.info("Subscribed to Nacos updates for key: {}", key); - } catch (NacosException e) { - LOGGER.error("nacosDiscoveryService error watching key: {}", key, e); - throw new ShenyuException(e); - } - } - - @Override - public void unwatch(final String key) { - try { - EventListener nacosListener = listenerMap.get(key); - if (Objects.nonNull(nacosListener)) { - namingService.unsubscribe(key, groupName, nacosListener); - listenerMap.remove(key); - LOGGER.info("Nacos Unwatch key: {}", key); - } - } catch (NacosException e) { - LOGGER.error("Error removing Nacos service listener: {}", e.getMessage(), e); - throw new ShenyuException(e); - } - } - - @Override - public void register(final String key, final String value) { - try { - Instance instance = buildInstanceFromUpstream(key, value); - namingService.registerInstance(key, groupName, instance); - LOGGER.info("Registering service with key: {} and value: {}", key, value); - } catch (NacosException nacosException) { - LOGGER.error("Error registering Nacos service instance: {}", nacosException.getMessage(), nacosException); - throw new ShenyuException(nacosException); - } - } - - @Override - public List getRegisterData(final String key) { - try { - List instances = namingService.selectInstances(key, groupName, true); - List registerData = new ArrayList<>(); - for (Instance instance : instances) { - String data = buildUpstreamJsonFromInstance(instance); - registerData.add(data); - } - return registerData; - } catch (NacosException e) { - LOGGER.error("Error getting Nacos service instances: {}", e.getMessage(), e); - throw new ShenyuException(e); - } - } - - @Override - public Boolean exists(final String key) { - try { - List instances = namingService.selectInstances(key, groupName, true); - return !instances.isEmpty(); - } catch (NacosException e) { - LOGGER.error("Error checking Nacos service existence: {}", e.getMessage(), e); - throw new ShenyuException(e); - } - } - - @Override - public void shutdown() { - try { - if (Objects.nonNull(this.namingService)) { - for (Map.Entry entry : listenerMap.entrySet()) { - String key = entry.getKey(); - EventListener listener = entry.getValue(); - this.namingService.unsubscribe(key, groupName, listener); - } - listenerMap.clear(); - this.namingService.shutDown(); - this.namingService = null; - LOGGER.info("Shutting down NacosDiscoveryService"); - } - } catch (NacosException e) { - LOGGER.error("Error shutting down NacosDiscoveryService", e); - throw new ShenyuException(e); - } - } - - private void compareInstances(final List previousInstances, final List currentInstances, final DataChangedEventListener listener) { - Set addedInstances = currentInstances.stream() - .filter(item -> !previousInstances.contains(item)) - .collect(Collectors.toSet()); - if (!addedInstances.isEmpty()) { - for (Instance instance: addedInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getServiceName(), - buildUpstreamJsonFromInstance(instance), DiscoveryDataChangedEvent.Event.ADDED); - listener.onChange(dataChangedEvent); - } - } - - Set deletedInstances = previousInstances.stream() - .filter(item -> !currentInstances.contains(item)) - .collect(Collectors.toSet()); - if (!deletedInstances.isEmpty()) { - for (Instance instance: deletedInstances) { - instance.setHealthy(false); - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getServiceName(), - buildUpstreamJsonFromInstance(instance), DiscoveryDataChangedEvent.Event.DELETED); - listener.onChange(dataChangedEvent); - } - } - - Set updatedInstances = currentInstances.stream() - .filter(currentInstance -> previousInstances.stream() - .anyMatch(previousInstance -> currentInstance.getInstanceId().equals(previousInstance.getInstanceId()) && !currentInstance.equals(previousInstance))) - .collect(Collectors.toSet()); - if (!updatedInstances.isEmpty()) { - for (Instance instance: updatedInstances) { - DiscoveryDataChangedEvent dataChangedEvent = new DiscoveryDataChangedEvent(instance.getServiceName(), - buildUpstreamJsonFromInstance(instance), DiscoveryDataChangedEvent.Event.UPDATED); - listener.onChange(dataChangedEvent); - } - } - } - - private String buildUpstreamJsonFromInstance(final Instance instance) { - JsonObject upstreamJson = new JsonObject(); - upstreamJson.addProperty("url", instance.getIp() + ":" + instance.getPort()); - // status 0:true, 1:false - upstreamJson.addProperty("status", instance.isHealthy() ? 0 : 1); - upstreamJson.addProperty("weight", instance.getWeight()); - Map metadata = instance.getMetadata(); - upstreamJson.addProperty("props", metadata.get("props")); - upstreamJson.addProperty("protocol", metadata.get("protocol")); - return GsonUtils.getInstance().toJson(upstreamJson); - } - - private Instance buildInstanceFromUpstream(final String key, final String value) { - try { - Instance instance = new Instance(); - DiscoveryUpstreamData upstreamData = GsonUtils.getInstance().fromJson(value, DiscoveryUpstreamData.class); - String[] urls = upstreamData.getUrl().split(":", 2); - instance.setServiceName(key); - instance.setIp(urls[0]); - instance.setPort(Integer.parseInt(urls[1])); - instance.setWeight(upstreamData.getWeight()); - Map metaData = new HashMap<>(); - metaData.put("props", Optional.ofNullable(upstreamData.getProps()).orElse("{}")); - metaData.put("protocol", upstreamData.getProtocol()); - instance.setMetadata(metaData); - instance.setInstanceId(upstreamData.getUrl()); - return instance; - } catch (JsonSyntaxException jsonSyntaxException) { - LOGGER.error("The json format of value is wrong: {}", jsonSyntaxException.getMessage(), jsonSyntaxException); - throw new ShenyuException(jsonSyntaxException); - } - } -} - - - - - diff --git a/shenyu-discovery/shenyu-discovery-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService b/shenyu-discovery/shenyu-discovery-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService deleted file mode 100644 index 2e05f227dfcb..000000000000 --- a/shenyu-discovery/shenyu-discovery-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService +++ /dev/null @@ -1,17 +0,0 @@ -# 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 -# -# http://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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -nacos=org.apache.shenyu.discovery.nacos.NacosDiscoveryService diff --git a/shenyu-discovery/shenyu-discovery-nacos/src/test/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryServiceTest.java b/shenyu-discovery/shenyu-discovery-nacos/src/test/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryServiceTest.java deleted file mode 100644 index 68d5392c82c1..000000000000 --- a/shenyu-discovery/shenyu-discovery-nacos/src/test/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryServiceTest.java +++ /dev/null @@ -1,249 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.nacos; - -import com.alibaba.nacos.api.exception.NacosException; -import com.alibaba.nacos.api.naming.NamingFactory; -import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.api.naming.listener.EventListener; -import com.alibaba.nacos.api.naming.listener.NamingEvent; -import com.alibaba.nacos.api.naming.pojo.Instance; -import com.google.gson.JsonObject; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.common.utils.GsonUtils; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.MockedStatic; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ConcurrentMap; - -import static org.junit.Assert.assertThrows; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -/** - * The test for {@link NacosDiscoveryService} . - */ -class NacosDiscoveryServiceTest { - - private NacosDiscoveryService nacosDiscoveryServiceUnderTest; - - private NamingService namingService; - - @BeforeEach - void setUp() throws NoSuchFieldException, IllegalAccessException { - nacosDiscoveryServiceUnderTest = new NacosDiscoveryService(); - namingService = mock(NamingService.class); - setField(nacosDiscoveryServiceUnderTest.getClass(), "namingService", namingService); - setField(nacosDiscoveryServiceUnderTest.getClass(), "groupName", "SHENYU_GROUP"); - } - - @AfterEach - void downTest() throws NacosException { - nacosDiscoveryServiceUnderTest.shutdown(); - verify(namingService).shutDown(); - } - - private void setField(final Class clazz, final String fieldName, final Object value) throws NoSuchFieldException, IllegalAccessException { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(nacosDiscoveryServiceUnderTest, value); - field.setAccessible(false); - } - - private Object getField(final T object, final String fieldName) throws NoSuchFieldException, IllegalAccessException { - Class clazz = object.getClass(); - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - Object value = field.get(object); - field.setAccessible(false); - return value; - } - - @Test - void testInit() throws NoSuchFieldException, IllegalAccessException { - // Set the discovery config - setField(nacosDiscoveryServiceUnderTest.getClass(), "namingService", null); - DiscoveryConfig config = new DiscoveryConfig(); - Properties properties = new Properties(); - config.setServerList("127.0.0.1:8848"); - properties.setProperty("groupName", "SHENYU_GROUP"); - config.setProps(properties); - - try (MockedStatic mockedNamingFactory = mockStatic(NamingFactory.class)) { - // Mock the successful creation of NamingService - mockedNamingFactory.when(() -> NamingFactory.createNamingService(any(Properties.class))) - .thenReturn(namingService); - nacosDiscoveryServiceUnderTest.init(config); - mockedNamingFactory.verify(() -> NamingFactory.createNamingService(any(Properties.class))); - assertEquals(namingService, getField(nacosDiscoveryServiceUnderTest, "namingService")); - // Mock the situation where NamingService fails to be created and throws an exception - mockedNamingFactory.when(() -> NamingFactory.createNamingService(any(Properties.class))) - .thenThrow(new NacosException()); - assertDoesNotThrow(() -> nacosDiscoveryServiceUnderTest.init(config)); - } - } - - @Test - void testWatch() throws NacosException, NoSuchFieldException, IllegalAccessException { - final DataChangedEventListener mockListener = mock(DataChangedEventListener.class); - // Construct instance information - final String key = "test"; - final String key2 = "test2"; - Instance instance1 = new Instance(); - instance1.setIp("192.168.1.1"); - instance1.setPort(8080); - instance1.setServiceName(key); - instance1.setInstanceId(key); - - Instance instance2 = new Instance(); - instance2.setIp("192.168.1.2"); - instance2.setPort(8081); - instance2.setServiceName(key2); - instance2.setInstanceId(key2); - - List initialInstances = new ArrayList<>(); - initialInstances.add(instance1); - List updatedInstances = Arrays.asList(instance1, instance2); - - // Mock the behavior of namingService.subscribe - when(namingService.selectInstances(key, "SHENYU_GROUP", true)) - .thenReturn(initialInstances) - .thenReturn(updatedInstances); - doAnswer(invocation -> { - EventListener nacosListener = invocation.getArgument(2); - NamingEvent event = new NamingEvent(key, updatedInstances); - nacosListener.onEvent(event); - return null; - }).when(namingService).subscribe(anyString(), anyString(), any(EventListener.class)); - nacosDiscoveryServiceUnderTest.watch(key, mockListener); - // Verify that methods are called correctly - verify(mockListener, atLeastOnce()).onChange(any(DiscoveryDataChangedEvent.class)); - verify(namingService).subscribe(anyString(), anyString(), any(EventListener.class)); - verify(namingService, times(2)).selectInstances(key, "SHENYU_GROUP", true); - // Verify the field content of listenerMap：it should be non-empty - ConcurrentMap listenerMap = (ConcurrentMap) getField(nacosDiscoveryServiceUnderTest, "listenerMap"); - assertNotNull(listenerMap.get(key)); - } - - @Test - void testUnwatch() throws NoSuchFieldException, IllegalAccessException { - final String key = "test"; - nacosDiscoveryServiceUnderTest.unwatch(key); - ConcurrentMap listenerMap = (ConcurrentMap) getField(nacosDiscoveryServiceUnderTest, "listenerMap"); - assertFalse(listenerMap.containsKey(key)); - } - - @Test - void testRegister() throws NacosException { - final String key = "test"; - final String value = "{\"weight\":20,\"url\":\"127.0.0.1:8080\"}"; - - doNothing().when(namingService).registerInstance(anyString(), anyString(), any(Instance.class)); - nacosDiscoveryServiceUnderTest.register(key, value); - // Verify whether the method is called correctly - verify(namingService).registerInstance(anyString(), anyString(), any(Instance.class)); - // Mock the wrong json format - assertThrows(ShenyuException.class, () -> nacosDiscoveryServiceUnderTest.register(key, "test")); - // Mock the throwing of registerInstance exception - doThrow(new NacosException()).when(namingService).registerInstance(anyString(), anyString(), any(Instance.class)); - assertThrows(ShenyuException.class, () -> nacosDiscoveryServiceUnderTest.register(key, value)); - } - - @Test - void testGetRegisterData() throws NacosException { - final String key = "test"; - Instance instance1 = new Instance(); - instance1.setIp("192.168.1.1"); - instance1.setPort(8080); - - Instance instance2 = new Instance(); - instance2.setIp("192.168.1.2"); - instance2.setPort(8081); - - final List mockInstances = Arrays.asList(instance1, instance2); - when(namingService.selectInstances(key, "SHENYU_GROUP", true)).thenReturn(mockInstances); - final List result = nacosDiscoveryServiceUnderTest.getRegisterData(key); - verify(namingService).selectInstances(key, "SHENYU_GROUP", true); - - // Verify that the data format is consistent - assertEquals(mockInstances.size(), result.size()); - for (int i = 0; i < mockInstances.size(); i++) { - Instance instance = mockInstances.get(i); - String expectedJson = buildInstanceInfoJson(instance); - assertEquals(expectedJson, result.get(i)); - } - } - - @Test - void testExists() throws NacosException { - List mockInstances = new ArrayList<>(); - mockInstances.add(mock(Instance.class)); - // Mock this service exists - when(namingService.selectInstances(anyString(), anyString(), anyBoolean())).thenReturn(mockInstances); - assertTrue(nacosDiscoveryServiceUnderTest.exists("key")); - // Mock the service does not exist - when(namingService.selectInstances(anyString(), anyString(), anyBoolean())).thenReturn(Collections.emptyList()); - assertFalse(nacosDiscoveryServiceUnderTest.exists("key")); - // Mock the throwing of NacosException - when(namingService.selectInstances(anyString(), anyString(), anyBoolean())).thenThrow(new NacosException()); - assertThrows(ShenyuException.class, () -> nacosDiscoveryServiceUnderTest.exists("key")); - } - - /** - * Same as in NacosDiscoveryService. - * - * @param instance Convert Nacos instance to Json string - */ - private String buildInstanceInfoJson(final Instance instance) { - JsonObject instanceJson = new JsonObject(); - instanceJson.addProperty("url", instance.getIp() + ":" + instance.getPort()); - // status 0:true, 1:false - instanceJson.addProperty("status", instance.isHealthy() ? 0 : 1); - instanceJson.addProperty("weight", instance.getWeight()); - - return GsonUtils.getInstance().toJson(instanceJson); - } - -} - diff --git a/shenyu-discovery/shenyu-discovery-zookeeper/pom.xml b/shenyu-discovery/shenyu-discovery-zookeeper/pom.xml deleted file mode 100644 index 4c256839465e..000000000000 --- a/shenyu-discovery/shenyu-discovery-zookeeper/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - org.apache.shenyu - shenyu-discovery - 2.7.0-SNAPSHOT - - 4.0.0 - shenyu-discovery-zookeeper - - - - org.apache.shenyu - shenyu-discovery-api - ${project.version} - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - - - org.apache.shenyu - shenyu-common - ${project.version} - compile - - - - diff --git a/shenyu-discovery/shenyu-discovery-zookeeper/src/main/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryService.java b/shenyu-discovery/shenyu-discovery-zookeeper/src/main/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryService.java deleted file mode 100644 index b5250cb2cdb8..000000000000 --- a/shenyu-discovery/shenyu-discovery-zookeeper/src/main/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryService.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.zookeeper; - -import org.apache.commons.lang3.StringUtils; -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.CuratorFrameworkFactory; -import org.apache.curator.framework.recipes.cache.ChildData; -import org.apache.curator.framework.recipes.cache.TreeCache; -import org.apache.curator.framework.recipes.cache.TreeCacheListener; -import org.apache.curator.framework.state.ConnectionState; -import org.apache.curator.retry.ExponentialBackoffRetry; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.shenyu.spi.Join; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.data.Stat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.List; -import java.util.ArrayList; -import java.util.concurrent.TimeUnit; - -/** - * The type Zookeeper for shenyu discovery service. - */ -@Join -public class ZookeeperDiscoveryService implements ShenyuDiscoveryService { - - private static final Logger LOGGER = LoggerFactory.getLogger(ZookeeperDiscoveryService.class); - - private CuratorFramework client; - - private final Map nodeDataMap = new HashMap<>(); - - private final Map cacheMap = new HashMap<>(); - - @Override - public void init(final DiscoveryConfig config) { - if (this.client != null) { - LOGGER.info("ZooKeeper naming service already registered"); - return; - } - String baseSleepTimeMilliseconds = config.getProps().getProperty("baseSleepTimeMilliseconds", "1000"); - String maxRetries = config.getProps().getProperty("maxRetries", "3"); - String maxSleepTimeMilliseconds = config.getProps().getProperty("maxSleepTimeMilliseconds", "1000"); - String connectionTimeoutMilliseconds = config.getProps().getProperty("connectionTimeoutMilliseconds", "1000"); - String sessionTimeoutMilliseconds = config.getProps().getProperty("sessionTimeoutMilliseconds", "1000"); - String namespace = config.getProps().getProperty("namespace", ""); - String digest = config.getProps().getProperty("digest", null); - ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(Integer.parseInt(baseSleepTimeMilliseconds), Integer.parseInt(maxRetries), Integer.parseInt(maxSleepTimeMilliseconds)); - CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder() - .connectString(config.getServerList()) - .retryPolicy(retryPolicy) - .connectionTimeoutMs(Integer.parseInt(connectionTimeoutMilliseconds)) - .sessionTimeoutMs(Integer.parseInt(sessionTimeoutMilliseconds)) - .namespace(namespace); - if (StringUtils.isNoneBlank(digest)) { - builder.authorization("digest", digest.getBytes(StandardCharsets.UTF_8)); - } - this.client = builder.build(); - this.start(); - } - - private void start() { - this.client.getConnectionStateListenable().addListener((c, newState) -> { - if (newState == ConnectionState.RECONNECTED) { - nodeDataMap.forEach((k, v) -> { - if (!this.exists(k)) { - this.createOrUpdate(k, v, CreateMode.EPHEMERAL); - LOGGER.info("zookeeper client register instance success: key={}|value={}", k, v); - } - }); - } - }); - this.client.start(); - try { - if (!this.client.blockUntilConnected(30, TimeUnit.SECONDS)) { - throw new ShenyuException("shenyu start ZookeeperDiscoveryService failure 30 seconds timeout"); - } - } catch (InterruptedException e) { - throw new ShenyuException(e); - } - } - - @Override - public Boolean exists(final String key) { - try { - return null != client.checkExists().forPath(key); - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - private void createOrUpdate(final String key, final String value, final CreateMode mode) { - String val = StringUtils.isEmpty(value) ? "" : value; - try { - this.client.create().orSetData().creatingParentsIfNeeded().withMode(mode).forPath(key, val.getBytes(StandardCharsets.UTF_8)); - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - @Override - public void watch(final String key, final DataChangedEventListener listener) { - try { - TreeCache treeCache = new TreeCache(client, key); - TreeCacheListener treeCacheListener = (curatorFramework, event) -> { - ChildData data = event.getData(); - DiscoveryDataChangedEvent dataChangedEvent; - if (Objects.nonNull(data) && Objects.nonNull(data.getData())) { - String currentPath = data.getPath(); - String currentData = new String(data.getData(), StandardCharsets.UTF_8); - LOGGER.info("shenyu find resultData ={}", currentData); - Stat stat = data.getStat(); - boolean isEphemeral = Objects.nonNull(stat) && stat.getEphemeralOwner() > 0; - if (!isEphemeral) { - LOGGER.info("shenyu Ignore non-ephemeral node changes"); - return; - } - switch (event.getType()) { - case NODE_ADDED: - dataChangedEvent = new DiscoveryDataChangedEvent(currentPath, currentData, DiscoveryDataChangedEvent.Event.ADDED); - break; - case NODE_UPDATED: - dataChangedEvent = new DiscoveryDataChangedEvent(currentPath, currentData, DiscoveryDataChangedEvent.Event.UPDATED); - break; - case NODE_REMOVED: - dataChangedEvent = new DiscoveryDataChangedEvent(currentPath, currentData, DiscoveryDataChangedEvent.Event.DELETED); - break; - default: - dataChangedEvent = new DiscoveryDataChangedEvent(currentPath, currentData, DiscoveryDataChangedEvent.Event.IGNORED); - break; - } - listener.onChange(dataChangedEvent); - } - }; - treeCache.getListenable().addListener(treeCacheListener); - treeCache.start(); - cacheMap.put(key, treeCache); - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - @Override - public void unwatch(final String key) { - if (cacheMap.containsKey(key)) { - cacheMap.remove(key).close(); - } - } - - @Override - public void register(final String key, final String value) { - String seqPath = key + "/seq_"; - this.createOrUpdate(seqPath, value, CreateMode.EPHEMERAL_SEQUENTIAL); - } - - @Override - public List getRegisterData(final String key) { - try { - List children = client.getChildren().forPath(key); - List datas = new ArrayList<>(); - for (String child : children) { - String nodePath = key + "/" + child; - byte[] data = client.getData().forPath(nodePath); - datas.add(new String(data, StandardCharsets.UTF_8)); - } - return datas; - } catch (Exception e) { - throw new ShenyuException(e); - } - } - - @Override - public void shutdown() { - try { - //close treeCache - for (String key : cacheMap.keySet()) { - cacheMap.get(key).close(); - } - this.client.close(); - this.client = null; - LOGGER.info("Shutting down ZookeeperDiscoveryService"); - } catch (Exception e) { - throw new ShenyuException(e); - } - - } -} diff --git a/shenyu-discovery/shenyu-discovery-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService b/shenyu-discovery/shenyu-discovery-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService deleted file mode 100644 index 3ef671d6078e..000000000000 --- a/shenyu-discovery/shenyu-discovery-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.discovery.api.ShenyuDiscoveryService +++ /dev/null @@ -1,17 +0,0 @@ -# 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 -# -# http://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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -zookeeper=org.apache.shenyu.discovery.zookeeper.ZookeeperDiscoveryService diff --git a/shenyu-discovery/shenyu-discovery-zookeeper/src/test/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryServiceTest.java b/shenyu-discovery/shenyu-discovery-zookeeper/src/test/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryServiceTest.java deleted file mode 100644 index 32cbfa2aa434..000000000000 --- a/shenyu-discovery/shenyu-discovery-zookeeper/src/test/java/org/apache/shenyu/discovery/zookeeper/ZookeeperDiscoveryServiceTest.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * 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 - * - * http://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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.shenyu.discovery.zookeeper; - -import org.apache.curator.CuratorZookeeperClient; -import org.apache.curator.framework.CuratorFramework; -import org.apache.curator.framework.WatcherRemoveCuratorFramework; -import org.apache.curator.framework.api.ACLBackgroundPathAndBytesable; -import org.apache.curator.framework.api.CreateBuilder; -import org.apache.curator.framework.api.CreateBuilder2; -import org.apache.curator.framework.api.GetChildrenBuilder; -import org.apache.curator.framework.api.ProtectACLCreateModeStatPathAndBytesable; -import org.apache.curator.framework.imps.ExistsBuilderImpl; -import org.apache.curator.framework.listen.Listenable; -import org.apache.curator.framework.recipes.cache.TreeCache; -import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; -import org.apache.zookeeper.data.Stat; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertThrows; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -class ZookeeperDiscoveryServiceTest { - - private ZookeeperDiscoveryService zookeeperDiscoveryServiceUnderTest; - - private CuratorFramework curatorFramework; - - @BeforeEach - void setUp() throws Exception { - zookeeperDiscoveryServiceUnderTest = new ZookeeperDiscoveryService(); - curatorFramework = mock(CuratorFramework.class); - DiscoveryConfig discoveryConfig = new DiscoveryConfig(); - discoveryConfig.setServerList("localhost:2181"); - discoveryConfig.setProps(new Properties()); - curatorFramework.start(); - curatorFramework.blockUntilConnected(30, TimeUnit.SECONDS); - setField(zookeeperDiscoveryServiceUnderTest.getClass(), "client", curatorFramework); - - } - - @AfterEach - void downTest() { - zookeeperDiscoveryServiceUnderTest.shutdown(); - verify(curatorFramework).close(); - } - - private void setField(final Class clazz, final String fieldName, final Object value) throws NoSuchFieldException, IllegalAccessException { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(zookeeperDiscoveryServiceUnderTest, value); - field.setAccessible(false); - } - - @Test - void testExists() throws Exception { - assertThrows(ShenyuException.class, () -> zookeeperDiscoveryServiceUnderTest.exists("key")); - ExistsBuilderImpl existsBuilder = mock(ExistsBuilderImpl.class); - when(curatorFramework.checkExists()).thenReturn(existsBuilder); - when(existsBuilder.forPath(anyString())).thenReturn(mock(Stat.class)); - final Boolean result = zookeeperDiscoveryServiceUnderTest.exists("key"); - Assertions.assertTrue(result); - } - - @Test - void registerTest() throws Exception { - assertThrows(ShenyuException.class, () -> - zookeeperDiscoveryServiceUnderTest.register("/test", "hello")); - CreateBuilder createBuilder = mock(CreateBuilder.class); - when(curatorFramework.create()).thenReturn(createBuilder); - CreateBuilder2 createBuilder2 = mock(CreateBuilder2.class); - when(createBuilder.orSetData()).thenReturn(createBuilder2); - ProtectACLCreateModeStatPathAndBytesable protectACLCreateModeStatPathAndBytesable = mock(ProtectACLCreateModeStatPathAndBytesable.class); - when(createBuilder2.creatingParentsIfNeeded()).thenReturn(protectACLCreateModeStatPathAndBytesable); - ACLBackgroundPathAndBytesable pathAndBytesable = mock(ACLBackgroundPathAndBytesable.class); - when(protectACLCreateModeStatPathAndBytesable.withMode(any())).thenReturn(pathAndBytesable); - when(pathAndBytesable.forPath(anyString(), any(byte[].class))).thenReturn(null); - zookeeperDiscoveryServiceUnderTest.register("/test", "hello"); - } - - @Test - void getRegisterDataTest() throws Exception { - assertThrows(ShenyuException.class, () -> zookeeperDiscoveryServiceUnderTest.getRegisterData("/test")); - GetChildrenBuilder getChildrenBuilder = mock(GetChildrenBuilder.class); - when(curatorFramework.getChildren()).thenReturn(getChildrenBuilder); - when(getChildrenBuilder.forPath(anyString())).thenReturn(new ArrayList<>()); - List children = zookeeperDiscoveryServiceUnderTest.getRegisterData("/test"); - Assertions.assertEquals(0, children.size()); - } - - @Test - void testWatch() throws NoSuchFieldException, IllegalAccessException, InvocationTargetException { - final DataChangedEventListener mockListener = mock(DataChangedEventListener.class); - CuratorZookeeperClient curatorZookeeperClient = mock(CuratorZookeeperClient.class); - WatcherRemoveCuratorFramework watcherRemoveCuratorFramework = mock(WatcherRemoveCuratorFramework.class); - when(curatorFramework.newWatcherRemoveCuratorFramework()).thenReturn(watcherRemoveCuratorFramework); - when(curatorFramework.getZookeeperClient()).thenReturn(curatorZookeeperClient); - when(curatorZookeeperClient.isConnected()).thenReturn(true); - final Listenable listenable = mock(Listenable.class); - when(watcherRemoveCuratorFramework.getConnectionStateListenable()).thenReturn(listenable); - when(watcherRemoveCuratorFramework.getZookeeperClient()).thenReturn(mock(CuratorZookeeperClient.class)); - zookeeperDiscoveryServiceUnderTest.watch("/key", mockListener); - Field cacheField = zookeeperDiscoveryServiceUnderTest.getClass().getDeclaredField("cacheMap"); - cacheField.setAccessible(true); - Map cacheMap = (Map) cacheField.get(zookeeperDiscoveryServiceUnderTest); - Assertions.assertNotNull(cacheMap.get("/key")); - } - - @Test - void testUnwatch() throws NoSuchFieldException, IllegalAccessException { - zookeeperDiscoveryServiceUnderTest.unwatch("/key"); - Field cacheField = zookeeperDiscoveryServiceUnderTest.getClass().getDeclaredField("cacheMap"); - cacheField.setAccessible(true); - Map cacheMap = (Map) cacheField.get(zookeeperDiscoveryServiceUnderTest); - Assertions.assertNull(cacheMap.get("/key")); - } -} diff --git a/shenyu-examples/shenyu-examples-grpc/pom.xml b/shenyu-examples/shenyu-examples-grpc/pom.xml index da179d157a95..b17156198ecf 100644 --- a/shenyu-examples/shenyu-examples-grpc/pom.xml +++ b/shenyu-examples/shenyu-examples-grpc/pom.xml @@ -61,11 +61,6 @@ spring-boot-starter-actuator - - org.apache.shenyu - shenyu-discovery-zookeeper - ${project.version} - javax.annotation javax.annotation-api diff --git a/shenyu-examples/shenyu-examples-http-swagger3/pom.xml b/shenyu-examples/shenyu-examples-http-swagger3/pom.xml index 4d4313e81ea0..6b76696b18f5 100644 --- a/shenyu-examples/shenyu-examples-http-swagger3/pom.xml +++ b/shenyu-examples/shenyu-examples-http-swagger3/pom.xml @@ -40,37 +40,6 @@ ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.springframework.boot spring-boot-starter diff --git a/shenyu-examples/shenyu-examples-http/pom.xml b/shenyu-examples/shenyu-examples-http/pom.xml index bfb9ea521cec..c26066fc016a 100644 --- a/shenyu-examples/shenyu-examples-http/pom.xml +++ b/shenyu-examples/shenyu-examples-http/pom.xml @@ -45,30 +45,6 @@ spring-boot-starter - - - - - - - - - - - - - - - - - - - - - - - - org.springframework.boot spring-boot-starter-actuator diff --git a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml index 01edc630e02f..9cfa3b0e99a5 100644 --- a/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml +++ b/shenyu-examples/shenyu-examples-websocket/shenyu-example-spring-native-websocket/pom.xml @@ -75,11 +75,6 @@ - - org.apache.shenyu - shenyu-discovery-zookeeper - ${project.version} - diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java index acf831610e72..b91bbf7079ae 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java @@ -17,8 +17,9 @@ package org.apache.shenyu.registry.api; -import org.apache.shenyu.registry.api.entity.InstanceEntity; import org.apache.shenyu.registry.api.config.RegisterConfig; +import org.apache.shenyu.registry.api.entity.InstanceEntity; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.spi.SPI; import java.util.Collections; @@ -55,6 +56,23 @@ default List selectInstances(final String selectKey) { return Collections.emptyList(); } + /** + * watchInstances. + * + * @param key key + * @param changedEventListener changedEventListener + */ + default void watchInstances(String key, ChangedEventListener changedEventListener) { + } + + /** + * unWatchInstances. + * + * @param key key + */ + default void unWatchInstances(String key) { + } + /** * Close. */ diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java index 9c7d27a53848..63013c00c6ed 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java @@ -32,6 +32,10 @@ public class InstanceEntity { private Integer port; private URI uri; + + private int status; + + private int weight; /** * Instantiates a new Instance register dto. @@ -141,6 +145,42 @@ public void setUri(final URI uri) { this.uri = uri; } + /** + * status. + * + * @return Status + */ + public int getStatus() { + return status; + } + + /** + * set status. + * + * @param status status + */ + public void setStatus(int status) { + this.status = status; + } + + /** + * weight. + * + * @return Weight + */ + public int getWeight() { + return weight; + } + + /** + * set weight. + * + * @param weight weight + */ + public void setWeight(int weight) { + this.weight = weight; + } + @Override public boolean equals(final Object o) { if (this == o) { diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java new file mode 100644 index 000000000000..4a912c687ec3 --- /dev/null +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java @@ -0,0 +1,35 @@ +package org.apache.shenyu.registry.api.event; + +@FunctionalInterface +public interface ChangedEventListener { + + /** + * Data changed event. + */ + public enum Event { + + /** + * Added event. + */ + ADDED, + /** + * Updated event. + */ + UPDATED, + /** + * Deleted event. + */ + DELETED, + /** + * Ignored event. + */ + IGNORED + } + + /** + * On event. + * + * @param event the event + */ + void onEvent(final String key, final String value, final Event event); +} diff --git a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java index 2946013b3ab5..73d174bfe273 100644 --- a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java +++ b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java @@ -92,10 +92,10 @@ public void onCompleted() { * @param key watch key. * @param listener watch listener. */ - public void watchKeyChanges(final String key, final Watch.Listener listener) { + public Watch.Watcher watchKeyChanges(final String key, final Watch.Listener listener) { WatchOption option = WatchOption.newBuilder().isPrefix(true).build(); - client.getWatchClient().watch(bytesOf(key), option, listener); + return client.getWatchClient().watch(bytesOf(key), option, listener); } diff --git a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java index 78ef9e7027e0..d8951a7fd50b 100644 --- a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java @@ -20,10 +20,12 @@ import io.etcd.jetcd.Watch; import io.etcd.jetcd.watch.WatchEvent; import org.apache.shenyu.common.constant.Constants; +import org.apache.shenyu.common.exception.ShenyuException; import org.apache.shenyu.common.utils.GsonUtils; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; import org.apache.shenyu.registry.api.entity.InstanceEntity; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.registry.api.path.InstancePathConstants; import org.apache.shenyu.spi.Join; import org.slf4j.Logger; @@ -34,10 +36,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.function.Function; import java.util.stream.Collectors; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * The type Etcd instance register repository. */ @@ -50,6 +57,8 @@ public class EtcdInstanceRegisterRepository implements ShenyuInstanceRegisterRep private final Map> watcherInstanceRegisterMap = new HashMap<>(); + private final ConcurrentMap watchCache = new ConcurrentHashMap<>(); + @Override public void init(final RegisterConfig config) { Properties props = config.getProps(); @@ -104,6 +113,48 @@ public List selectInstances(final String selectKey) { return instanceEntities; } + @Override + public void watchInstances(String watchKey, ChangedEventListener listener) { + try { + Map serverNodes = client.getKeysMapByPrefix(watchKey); + serverNodes.forEach((k, v) -> listener.onEvent(k, v, ChangedEventListener.Event.ADDED)); + final Watch.Watcher watcher = this.client.watchKeyChanges(watchKey, Watch.listener(response -> { + for (WatchEvent event : response.getEvents()) { + String value = event.getKeyValue().getValue().toString(UTF_8); + String path = event.getKeyValue().getKey().toString(UTF_8); + switch (event.getEventType()) { + case PUT: + if (event.getKeyValue().getCreateRevision() == event.getKeyValue().getModRevision()) { + listener.onEvent(path, value, ChangedEventListener.Event.ADDED); + } else { + listener.onEvent(path, value, ChangedEventListener.Event.UPDATED); + } + LOGGER.info("watch key {} updated, value is {}", watchKey, value); + continue; + case DELETE: + listener.onEvent(path, value, ChangedEventListener.Event.DELETED); + LOGGER.info("watch key {} deleted, key is {}", watchKey, path); + continue; + default: + } + } + })); + watchCache.put(watchKey, watcher); + LOGGER.info("etcd added watcher for key: {}", watchKey); + } catch (Exception e) { + LOGGER.error("etcd client watch key: {} error", watchKey, e); + throw new ShenyuException(e); + } + } + + @Override + public void unWatchInstances(String key) { + if (watchCache.containsKey(key)) { + watchCache.remove(key).close(); + LOGGER.info("etcd Unwatched etcd key: {}", key); + } + } + private URI getURI(final String instanceRegisterJsonStr, final int port, final String host) { String scheme = (instanceRegisterJsonStr.contains("https") || instanceRegisterJsonStr.contains("HTTPS")) ? "https" : "http"; String uri = String.format("%s://%s:%s", scheme, host, port); @@ -118,6 +169,19 @@ private String buildInstanceNodeName(final InstanceEntity instance) { @Override public void close() { - client.close(); + try { + for (Map.Entry entry : watchCache.entrySet()) { + Watch.Watcher watcher = entry.getValue(); + watcher.close(); + } + watchCache.clear(); + if (Objects.nonNull(client)) { + client.close(); + } + LOGGER.info("Shutting down EtcdDiscoveryService"); + } catch (Exception e) { + LOGGER.error("etcd client shutdown error", e); + throw new ShenyuException(e); + } } } diff --git a/shenyu-registry/shenyu-registry-eureka/pom.xml b/shenyu-registry/shenyu-registry-eureka/pom.xml index 7d70f4f682cf..1c692f3f61a6 100644 --- a/shenyu-registry/shenyu-registry-eureka/pom.xml +++ b/shenyu-registry/shenyu-registry-eureka/pom.xml @@ -39,25 +39,8 @@ com.netflix.eureka - eureka-client - - - - org.springframework.cloud - spring-cloud-netflix-eureka-client - 4.1.3 - - - - org.springframework.boot - spring-boot - provided - - - - org.springframework - spring-web - provided + eureka-client-jersey3 + 2.0.2 diff --git a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java index 2923356d69c5..f1f2b3826a64 100644 --- a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java @@ -17,6 +17,7 @@ package org.apache.shenyu.registry.eureka; +import com.google.gson.JsonObject; import com.netflix.appinfo.ApplicationInfoManager; import com.netflix.appinfo.DataCenterInfo; import com.netflix.appinfo.EurekaInstanceConfig; @@ -30,22 +31,31 @@ import com.netflix.discovery.DefaultEurekaClientConfig; import com.netflix.discovery.DiscoveryClient; import com.netflix.discovery.EurekaClient; +import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories; import org.apache.commons.lang.StringUtils; +import org.apache.shenyu.common.concurrent.ShenyuThreadFactory; +import org.apache.shenyu.common.exception.ShenyuException; +import org.apache.shenyu.common.utils.GsonUtils; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; import org.apache.shenyu.registry.api.entity.InstanceEntity; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.spi.Join; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier; -import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; -import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories; import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Join @@ -59,7 +69,11 @@ public class EurekaInstanceRegisterRepository implements ShenyuInstanceRegisterR private EurekaInstanceConfig eurekaInstanceConfig; - private RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs; + private final ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(10, ShenyuThreadFactory.create("scheduled-eureka-watcher", true)); + + private final ConcurrentMap> listenerThreadsMap = new ConcurrentHashMap<>(); + + private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); @Override public void init(final RegisterConfig config) { @@ -87,11 +101,10 @@ public boolean shouldRegisterWithEureka() { return false; } }; - restTemplateDiscoveryClientOptionalArgs - = new RestTemplateDiscoveryClientOptionalArgs(new DefaultEurekaClientHttpRequestFactorySupplier()); + LOGGER.info("eureka registry init..."); eurekaClient = new DiscoveryClient(new ApplicationInfoManager(eurekaInstanceConfig, new EurekaConfigBasedInstanceInfoProvider(eurekaInstanceConfig).get()), eurekaClientNotRegisterEurekaConfig, - new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); + new Jersey3TransportClientFactories()); } @Override @@ -109,8 +122,138 @@ public void persistInstance(final InstanceEntity instance) { .setDurationInSecs(eurekaInstanceConfig.getLeaseExpirationDurationInSeconds()); instanceInfo.setLeaseInfo(leaseInfoBuilder.build()); ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(eurekaInstanceConfig, instanceInfo); - new DiscoveryClient(applicationInfoManager, eurekaClientConfig, - new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); + new DiscoveryClient(applicationInfoManager, eurekaClientConfig, new Jersey3TransportClientFactories()); + LOGGER.info("eureka registry persistInstance success: {}", instanceInfo); + } + + @Override + public List selectInstances(final String selectKey) { + return getInstances(selectKey); + } + + @Override + public void watchInstances(String key, ChangedEventListener listener) { + try { + List initialInstances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); + instanceListMap.put(key, initialInstances); + for (InstanceInfo instance : initialInstances) { + listener.onEvent(key, buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.ADDED); + } + ScheduledFuture scheduledFuture = executorService.scheduleAtFixedRate(() -> { + try { + List previousInstances = instanceListMap.get(key); + List currentInstances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); + compareInstances(previousInstances, currentInstances, listener); + instanceListMap.put(key, currentInstances); + } catch (Exception e) { + LOGGER.error("eureka registry eurekaDiscoveryService watch key: {} error", key, e); + throw new ShenyuException(e); + } + }, 0, 1, TimeUnit.SECONDS); + listenerThreadsMap.put(key, scheduledFuture); + LOGGER.info("eureka registry subscribed to eureka updates for key: {}", key); + } catch (Exception e) { + LOGGER.error("eureka registry error watching key: {}", key, e); + throw new ShenyuException(e); + } + } + + @Override + public void unWatchInstances(String key) { + try { + ScheduledFuture scheduledFuture = listenerThreadsMap.get(key); + if (Objects.nonNull(scheduledFuture)) { + scheduledFuture.cancel(true); + listenerThreadsMap.remove(key); + LOGGER.info("eureka registry unwatch key {} successfully", key); + } + } catch (Exception e) { + LOGGER.error("eureka registry error removing eureka watch task for key {} {}", key, e.getMessage(), e); + throw new ShenyuException(e); + } + } + + private void compareInstances(final List previousInstances, final List currentInstances, final ChangedEventListener listener) { + Set addedInstances = currentInstances.stream() + .filter(item -> !previousInstances.contains(item)) + .collect(Collectors.toSet()); + if (!addedInstances.isEmpty()) { + for (InstanceInfo instance : addedInstances) { + listener.onEvent(instance.getAppName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.ADDED); + } + } + + Set deletedInstances = previousInstances.stream() + .filter(item -> !currentInstances.contains(item)) + .collect(Collectors.toSet()); + if (!deletedInstances.isEmpty()) { + for (InstanceInfo instance : deletedInstances) { + instance.setStatus(InstanceInfo.InstanceStatus.DOWN); + listener.onEvent(instance.getAppName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.DELETED); + } + } + + Set updatedInstances = currentInstances.stream() + .filter(currentInstance -> previousInstances.stream() + .anyMatch(previousInstance -> currentInstance.getInstanceId().equals(previousInstance.getInstanceId()) && !currentInstance.equals(previousInstance))) + .collect(Collectors.toSet()); + if (!updatedInstances.isEmpty()) { + for (InstanceInfo instance : updatedInstances) { + listener.onEvent(instance.getAppName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.UPDATED); + } + } + } + + private String buildUpstreamJsonFromInstance(final InstanceInfo instanceInfo) { + JsonObject upstreamJson = new JsonObject(); + upstreamJson.addProperty("url", instanceInfo.getIPAddr() + ":" + instanceInfo.getPort()); + upstreamJson.addProperty("weight", instanceInfo.getMetadata().get("weight")); + upstreamJson.addProperty("protocol", instanceInfo.getMetadata().get("protocol")); + upstreamJson.addProperty("props", instanceInfo.getMetadata().get("props")); + if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.UP) { + upstreamJson.addProperty("status", 0); + } else if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.DOWN) { + upstreamJson.addProperty("status", 1); + } + return GsonUtils.getInstance().toJson(upstreamJson); + } + + private List getInstances(final String selectKey) { + List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, selectKey, true); + return instances.stream() + .map(i -> InstanceEntity.builder() + .appName(i.getAppName()).host(i.getHostName()).port(i.getPort()).uri(getURI(i)) + .build() + ).collect(Collectors.toList()); + } + + private URI getURI(final InstanceInfo instance) { + boolean secure = instance.isPortEnabled(InstanceInfo.PortType.SECURE); + String scheme = secure ? "https" : "http"; + int port = instance.getPort(); + if (port <= 0) { + port = secure ? 443 : 80; + } + String uri = String.format("%s://%s:%s", scheme, instance.getIPAddr(), port); + return URI.create(uri); + } + + @Override + public void close() { + try { + for (ScheduledFuture scheduledFuture : listenerThreadsMap.values()) { + scheduledFuture.cancel(true); + } + listenerThreadsMap.clear(); + if (Objects.nonNull(eurekaClient)) { + eurekaClient.getApplicationInfoManager().setInstanceStatus(InstanceInfo.InstanceStatus.DOWN); + eurekaClient.shutdown(); + } + LOGGER.info("eureka registry shutting down..."); + } catch (Exception e) { + LOGGER.error("eureka registry shutting down error", e); + throw new ShenyuException(e); + } } /** @@ -188,34 +331,4 @@ public InstanceInfo.Builder instanceInfoBuilder() { } return builder; } - - @Override - public List selectInstances(final String selectKey) { - return getInstances(selectKey); - } - - private List getInstances(final String selectKey) { - List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, selectKey, true); - return instances.stream() - .map(i -> InstanceEntity.builder() - .appName(i.getAppName()).host(i.getHostName()).port(i.getPort()).uri(getURI(i)) - .build() - ).collect(Collectors.toList()); - } - - private URI getURI(final InstanceInfo instance) { - boolean secure = instance.isPortEnabled(InstanceInfo.PortType.SECURE); - String scheme = secure ? "https" : "http"; - int port = instance.getPort(); - if (port <= 0) { - port = secure ? 443 : 80; - } - String uri = String.format("%s://%s:%s", scheme, instance.getIPAddr(), port); - return URI.create(uri); - } - - @Override - public void close() { - Optional.ofNullable(eurekaClient).ifPresent(EurekaClient::shutdown); - } } diff --git a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java index 4c06e5af87e0..a690fc3b23f0 100644 --- a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java @@ -21,12 +21,17 @@ import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.listener.EventListener; +import com.alibaba.nacos.api.naming.listener.NamingEvent; import com.alibaba.nacos.api.naming.pojo.Instance; +import com.google.gson.JsonObject; import org.apache.shenyu.common.constant.Constants; import org.apache.shenyu.common.exception.ShenyuException; +import org.apache.shenyu.common.utils.GsonUtils; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; import org.apache.shenyu.registry.api.entity.InstanceEntity; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.spi.Join; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +40,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.stream.Collectors; /** * The type Nacos instance register repository. @@ -45,6 +55,10 @@ public class NacosInstanceRegisterRepository implements ShenyuInstanceRegisterRe private static final Logger LOGGER = LoggerFactory.getLogger(NacosInstanceRegisterRepository.class); + private final ConcurrentMap listenerMap = new ConcurrentHashMap<>(); + + private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); + private static final String NAMESPACE = "nacosNameSpace"; private NamingService namingService; @@ -64,6 +78,7 @@ public void init(final RegisterConfig config) { nacosProperties.put(PropertyKeyConst.ACCESS_KEY, properties.getProperty(PropertyKeyConst.ACCESS_KEY, "")); nacosProperties.put(PropertyKeyConst.SECRET_KEY, properties.getProperty(PropertyKeyConst.SECRET_KEY, "")); try { + LOGGER.info("nacos registry init..."); this.namingService = NamingFactory.createNamingService(nacosProperties); } catch (NacosException e) { throw new ShenyuException(e); @@ -81,7 +96,7 @@ public void persistInstance(final InstanceEntity instance) { inst.setInstanceId(buildInstanceNodeName(instance)); inst.setServiceName(instance.getAppName()); namingService.registerInstance(instance.getAppName(), groupName, inst); - LOGGER.info("nacos client register success: {}", inst); + LOGGER.info("nacos registry persistInstance success: {}", inst); } catch (NacosException e) { throw new ShenyuException(e); } @@ -92,6 +107,93 @@ public List selectInstances(final String selectKey) { return getInstanceRegisterDTOS(selectKey); } + @Override + public void watchInstances(String key, ChangedEventListener listener) { + try { + List initialInstances = namingService.selectInstances(key, groupName, true); + instanceListMap.put(key, initialInstances); + for (Instance instance : initialInstances) { + listener.onEvent(key, buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.ADDED); + } + EventListener nacosListener = event -> { + if (event instanceof NamingEvent) { + try { + List previousInstances = instanceListMap.get(key); + List currentInstances = namingService.selectInstances(key, groupName, true); + compareInstances(previousInstances, currentInstances, listener); + instanceListMap.put(key, currentInstances); + } catch (NacosException e) { + throw new ShenyuException(e); + } + } + }; + namingService.subscribe(key, groupName, nacosListener); + listenerMap.put(key, nacosListener); + LOGGER.info("nacos registry subscribed to nacos updates for key: {}", key); + } catch (NacosException e) { + LOGGER.error("nacos registry error watching key: {}", key, e); + throw new ShenyuException(e); + } + } + + @Override + public void unWatchInstances(String key) { + try { + EventListener nacosListener = listenerMap.get(key); + if (Objects.nonNull(nacosListener)) { + namingService.unsubscribe(key, groupName, nacosListener); + listenerMap.remove(key); + LOGGER.info("nacos registry unwatch key: {}", key); + } + } catch (NacosException e) { + LOGGER.error("nacos registry error removing nacos service listener...", e); + throw new ShenyuException(e); + } + } + + private void compareInstances(final List previousInstances, final List currentInstances, final ChangedEventListener listener) { + Set addedInstances = currentInstances.stream() + .filter(item -> !previousInstances.contains(item)) + .collect(Collectors.toSet()); + if (!addedInstances.isEmpty()) { + for (Instance instance: addedInstances) { + listener.onEvent(instance.getServiceName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.ADDED); + } + } + + Set deletedInstances = previousInstances.stream() + .filter(item -> !currentInstances.contains(item)) + .collect(Collectors.toSet()); + if (!deletedInstances.isEmpty()) { + for (Instance instance: deletedInstances) { + instance.setHealthy(false); + listener.onEvent(instance.getServiceName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.DELETED); + } + } + + Set updatedInstances = currentInstances.stream() + .filter(currentInstance -> previousInstances.stream() + .anyMatch(previousInstance -> currentInstance.getInstanceId().equals(previousInstance.getInstanceId()) && !currentInstance.equals(previousInstance))) + .collect(Collectors.toSet()); + if (!updatedInstances.isEmpty()) { + for (Instance instance: updatedInstances) { + listener.onEvent(instance.getServiceName(), buildUpstreamJsonFromInstance(instance), ChangedEventListener.Event.UPDATED); + } + } + } + + private String buildUpstreamJsonFromInstance(final Instance instance) { + JsonObject upstreamJson = new JsonObject(); + upstreamJson.addProperty("url", instance.getIp() + ":" + instance.getPort()); + // status 0:true, 1:false + upstreamJson.addProperty("status", instance.isHealthy() ? 0 : 1); + upstreamJson.addProperty("weight", instance.getWeight()); + Map metadata = instance.getMetadata(); + upstreamJson.addProperty("props", metadata.get("props")); + upstreamJson.addProperty("protocol", metadata.get("protocol")); + return GsonUtils.getInstance().toJson(upstreamJson); + } + private String buildInstanceNodeName(final InstanceEntity instance) { String host = instance.getHost(); int port = instance.getPort(); @@ -135,8 +237,19 @@ private URI getURI(final Map metadata, final Instance instance) @Override public void close() { try { - namingService.shutDown(); + if (Objects.nonNull(this.namingService)) { + for (Map.Entry entry : listenerMap.entrySet()) { + String key = entry.getKey(); + EventListener listener = entry.getValue(); + this.namingService.unsubscribe(key, groupName, listener); + } + listenerMap.clear(); + this.namingService.shutDown(); + this.namingService = null; + LOGGER.info("nacos registry shutting down..."); + } } catch (NacosException e) { + LOGGER.error("nacos registry shutting down error ", e); throw new ShenyuException(e); } } diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java index da6b6a1f4887..2526985a7f74 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java @@ -23,8 +23,8 @@ import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.api.CuratorWatcher; import org.apache.curator.framework.recipes.cache.ChildData; -import org.apache.curator.framework.recipes.cache.TreeCache; -import org.apache.curator.framework.recipes.cache.TreeCacheListener; +import org.apache.curator.framework.recipes.cache.CuratorCache; +import org.apache.curator.framework.recipes.cache.CuratorCacheListener; import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.utils.CloseableUtils; import org.apache.shenyu.common.exception.ShenyuException; @@ -43,25 +43,22 @@ public class ZookeeperClient { private static final Logger LOG = LoggerFactory.getLogger(ZookeeperClient.class); - private final ZookeeperConfig config; - private final CuratorFramework client; - private final Map caches = new ConcurrentHashMap<>(); + private final Map caches = new ConcurrentHashMap<>(); public ZookeeperClient(final ZookeeperConfig zookeeperConfig) { - this.config = zookeeperConfig; - ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(config.getBaseSleepTimeMilliseconds(), config.getMaxRetries(), config.getMaxSleepTimeMilliseconds()); + ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMilliseconds(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepTimeMilliseconds()); CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder() - .connectString(config.getServerLists()) + .connectString(zookeeperConfig.getServerLists()) .retryPolicy(retryPolicy) - .connectionTimeoutMs(config.getConnectionTimeoutMilliseconds()) - .sessionTimeoutMs(config.getSessionTimeoutMilliseconds()) - .namespace(config.getNamespace()); + .connectionTimeoutMs(zookeeperConfig.getConnectionTimeoutMilliseconds()) + .sessionTimeoutMs(zookeeperConfig.getSessionTimeoutMilliseconds()) + .namespace(zookeeperConfig.getNamespace()); - if (!StringUtils.isEmpty(config.getDigest())) { - builder.authorization("digest", config.getDigest().getBytes(StandardCharsets.UTF_8)); + if (!StringUtils.isEmpty(zookeeperConfig.getDigest())) { + builder.authorization("digest", zookeeperConfig.getDigest().getBytes(StandardCharsets.UTF_8)); } this.client = builder.build(); @@ -85,7 +82,7 @@ public void start() { */ public void close() { // close all caches - for (Map.Entry cache : caches.entrySet()) { + for (Map.Entry cache : caches.entrySet()) { CloseableUtils.closeQuietly(cache.getValue()); } // close client @@ -137,11 +134,11 @@ public String getDirectly(final String key) { * @return value. */ public String get(final String key) { - TreeCache cache = findFromCache(key); + CuratorCache cache = findFromCache(key); if (Objects.isNull(cache)) { return getDirectly(key); } - ChildData data = cache.getCurrentData(key); + ChildData data = cache.get(key).orElse(null); if (Objects.isNull(data)) { return getDirectly(key); } @@ -221,7 +218,7 @@ public List getChildren(final String key) { * @param path path. * @return cache. */ - public TreeCache getCache(final String path) { + public CuratorCache getCache(final String path) { return caches.get(path); } @@ -231,12 +228,12 @@ public TreeCache getCache(final String path) { * @param listeners listeners. * @return cache. */ - public TreeCache addCache(final String path, final TreeCacheListener... listeners) { - TreeCache cache = TreeCache.newBuilder(client, path).build(); + public CuratorCache addCache(final String path, final CuratorCacheListener... listeners) { + CuratorCache cache = CuratorCache.build(client, path); caches.put(path, cache); if (ArrayUtils.isNotEmpty(listeners)) { - for (TreeCacheListener listener : listeners) { - cache.getListenable().addListener(listener); + for (CuratorCacheListener listener : listeners) { + cache.listenable().addListener(listener); } } try { @@ -266,8 +263,8 @@ public List subscribeChildrenChanges(final String key, final CuratorWatc * @param key key. * @return cache. */ - private TreeCache findFromCache(final String key) { - for (Map.Entry cache : caches.entrySet()) { + private CuratorCache findFromCache(final String key) { + for (Map.Entry cache : caches.entrySet()) { if (key.startsWith(cache.getKey())) { return cache.getValue(); } diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java index 7462f28af310..04d756c69f9f 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java @@ -17,22 +17,28 @@ package org.apache.shenyu.registry.zookeeper; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.curator.framework.api.CuratorWatcher; +import org.apache.curator.framework.recipes.cache.CuratorCache; import org.apache.curator.framework.state.ConnectionState; import org.apache.shenyu.common.constant.Constants; +import org.apache.shenyu.common.exception.ShenyuException; import org.apache.shenyu.common.utils.GsonUtils; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; import org.apache.shenyu.registry.api.entity.InstanceEntity; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.registry.api.path.InstancePathConstants; import org.apache.shenyu.spi.Join; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -52,8 +58,12 @@ public class ZookeeperInstanceRegisterRepository implements ShenyuInstanceRegist private ZookeeperClient client; + private String watchPath; + private final Map nodeDataMap = new HashMap<>(); + private final Map cacheMap = new HashMap<>(); + private final Map> watcherInstanceRegisterMap = new HashMap<>(); @Override @@ -65,6 +75,7 @@ public void init(final RegisterConfig config) { int baseSleepTime = Integer.parseInt(props.getProperty("baseSleepTime", "1000")); int maxRetries = Integer.parseInt(props.getProperty("maxRetries", "3")); int maxSleepTime = Integer.parseInt(props.getProperty("maxSleepTime", String.valueOf(Integer.MAX_VALUE))); + watchPath = props.getProperty("watchPath", null); ZookeeperConfig zkConfig = new ZookeeperConfig(config.getServerLists()); zkConfig.setBaseSleepTimeMilliseconds(baseSleepTime) @@ -77,19 +88,19 @@ public void init(final RegisterConfig config) { if (!StringUtils.isEmpty(digest)) { zkConfig.setDigest(digest); } - LOGGER.info("zookeeper init"); this.client = new ZookeeperClient(zkConfig); this.client.getClient().getConnectionStateListenable().addListener((c, newState) -> { if (newState == ConnectionState.RECONNECTED) { nodeDataMap.forEach((k, v) -> { if (!client.isExist(k)) { client.createOrUpdate(k, v, CreateMode.EPHEMERAL); - LOGGER.info("zookeeper client register instance success: {}", v); + LOGGER.info("zookeeper registry client register instance success: {}", v); } }); } }); + LOGGER.info("zookeeper registry init..."); client.start(); } @@ -104,45 +115,100 @@ public void persistInstance(final InstanceEntity instance) { String nodeData = GsonUtils.getInstance().toJson(instance); nodeDataMap.put(realNode, nodeData); client.createOrUpdate(realNode, nodeData, CreateMode.EPHEMERAL); + LOGGER.info("zookeeper registry persistInstance success: {}", nodeData); } @Override public List selectInstances(final String selectKey) { - final String watchKey = InstancePathConstants.buildInstanceParentPath(selectKey); - final Function, List> getInstanceRegisterFun = childrenList -> childrenList.stream().map(childPath -> { - String instanceRegisterJsonStr = client.get(InstancePathConstants.buildRealNode(watchKey, childPath)); - InstanceEntity instanceEntity = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, InstanceEntity.class); - instanceEntity.setUri(getURI(instanceRegisterJsonStr, instanceEntity.getPort(), instanceEntity.getHost())); - return instanceEntity; - }).collect(Collectors.toList()); - - if (watcherInstanceRegisterMap.containsKey(selectKey)) { - return watcherInstanceRegisterMap.get(selectKey); - } + try { + final String watchKey = StringUtils.isNotBlank(watchPath) ? + InstancePathConstants.buildRealNode(watchPath, selectKey) : InstancePathConstants.buildInstanceParentPath(selectKey); + final Function, List> getInstanceRegisterFun = childrenList -> childrenList.stream().map(childPath -> { + String instanceRegisterJsonStr = client.get(InstancePathConstants.buildRealNode(watchKey, childPath)); + InstanceEntity instanceEntity = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, InstanceEntity.class); + instanceEntity.setUri(getURI(instanceRegisterJsonStr, instanceEntity.getPort(), instanceEntity.getHost())); + if (instanceEntity.getUri() == null) { + final HashMap hashMap = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, HashMap.class); + final String address = MapUtils.getString(hashMap, "address", null); + final Integer port = MapUtils.getInteger(hashMap, "port", null); + instanceEntity.setUri(getURI(instanceRegisterJsonStr, port, address)); + } + return instanceEntity; + }).collect(Collectors.toList()); - List childrenPathList = client.subscribeChildrenChanges(watchKey, new CuratorWatcher() { - @Override - public void process(final WatchedEvent event) { - try { - String path = Objects.isNull(event.getPath()) ? selectKey : event.getPath(); - List childrenList = StringUtils.isNotBlank(path) ? client.subscribeChildrenChanges(path, this) - : Collections.emptyList(); - if (!childrenList.isEmpty()) { - watcherInstanceRegisterMap.put(selectKey, getInstanceRegisterFun.apply(childrenList)); + if (watcherInstanceRegisterMap.containsKey(selectKey)) { + return watcherInstanceRegisterMap.get(selectKey); + } + + List childrenPathList = client.subscribeChildrenChanges(watchKey, new CuratorWatcher() { + @Override + public void process(final WatchedEvent event) { + try { + String path = Objects.isNull(event.getPath()) ? selectKey : event.getPath(); + List childrenList = StringUtils.isNotBlank(path) ? client.subscribeChildrenChanges(path, this) + : Collections.emptyList(); + if (!childrenList.isEmpty()) { + watcherInstanceRegisterMap.put(selectKey, getInstanceRegisterFun.apply(childrenList)); + } + } catch (Exception e) { + watcherInstanceRegisterMap.remove(selectKey); + LOGGER.error("zookeeper registry client subscribeChildrenChanges watch interrupt error:", e); } - } catch (Exception e) { - watcherInstanceRegisterMap.remove(selectKey); - LOGGER.error("zookeeper client subscribeChildrenChanges watch interrupt error:", e); } - } - }); + }); + + final List instanceEntities = getInstanceRegisterFun.apply(childrenPathList); + watcherInstanceRegisterMap.put(selectKey, instanceEntities); + return instanceEntities; + } catch (Exception e) { + LOGGER.error("zookeeper registry client selectInstances error:", e); + return Collections.emptyList(); + } + } - final List instanceEntities = getInstanceRegisterFun.apply(childrenPathList); - watcherInstanceRegisterMap.put(selectKey, instanceEntities); - return instanceEntities; + @Override + public void watchInstances(String key, ChangedEventListener listener) { + try { + CuratorCache treeCache = client.addCache(key, (type, oldData, data) -> { + if (!Objects.nonNull(data) || !Objects.nonNull(data.getData())) { + return; + } + String currentPath = data.getPath(); + String currentData = new String(data.getData(), StandardCharsets.UTF_8); + LOGGER.info("shenyu find resultData ={}", currentData); + Stat stat = data.getStat(); + boolean isEphemeral = Objects.nonNull(stat) && stat.getEphemeralOwner() > 0; + if (!isEphemeral) { + LOGGER.info("shenyu Ignore non-ephemeral node changes path {}", currentPath); + return; + } + switch (type) { + case NODE_CREATED: + listener.onEvent(currentPath, currentData, ChangedEventListener.Event.ADDED); + break; + case NODE_CHANGED: + listener.onEvent(currentPath, currentData, ChangedEventListener.Event.UPDATED); + break; + case NODE_DELETED: + listener.onEvent(currentPath, currentData, ChangedEventListener.Event.DELETED); + break; + default: + listener.onEvent(currentPath, currentData, ChangedEventListener.Event.IGNORED); + break; + } + }); + cacheMap.put(key, treeCache); + LOGGER.info("zookeeper registry subscribed to eureka updates for key: {}", key); + } catch (Exception e) { + LOGGER.error("zookeeper registry error watching key: {}", key, e); + throw new ShenyuException(e); + } } - private URI getURI(final String instanceRegisterJsonStr, final int port, final String host) { + private URI getURI(final String instanceRegisterJsonStr, final Integer port, final String host) { + if (port == null || host == null) { + return null; + } String scheme = (instanceRegisterJsonStr.contains("https") || instanceRegisterJsonStr.contains("HTTPS")) ? "https" : "http"; String uri = String.format("%s://%s:%s", scheme, host, port); return URI.create(uri); @@ -150,7 +216,19 @@ private URI getURI(final String instanceRegisterJsonStr, final int port, final S @Override public void close() { - client.close(); + try { + watcherInstanceRegisterMap.clear(); + //close treeCache + for (String key : cacheMap.keySet()) { + cacheMap.get(key).close(); + } + this.client.close(); + this.client = null; + LOGGER.info("zookeeper registry shutting down..."); + } catch (Exception e) { + LOGGER.error("zookeeper registry shutting down error", e); + throw new ShenyuException(e); + } } private String buildInstanceNodeName(final InstanceEntity instance) { diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java index 55d4bc537ec8..2d590ca422e0 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java @@ -29,8 +29,8 @@ import org.apache.curator.framework.api.GetDataBuilder; import org.apache.curator.framework.api.ProtectACLCreateModeStatPathAndBytesable; import org.apache.curator.framework.imps.ExistsBuilderImpl; -import org.apache.curator.framework.recipes.cache.TreeCache; -import org.apache.curator.framework.recipes.cache.TreeCacheListener; +import org.apache.curator.framework.recipes.cache.CuratorCacheListener; +import org.apache.curator.framework.recipes.cache.CuratorCache; import org.apache.shenyu.common.exception.ShenyuException; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.data.Stat; @@ -168,7 +168,7 @@ void createOrUpdate() throws Exception { @Test void cacheTest() throws Exception { - assertThrows(ShenyuException.class, () -> client.addCache("/path", mock(TreeCacheListener.class), mock(TreeCacheListener.class))); + assertThrows(ShenyuException.class, () -> client.addCache("/path", mock(CuratorCacheListener.class), mock(CuratorCacheListener.class))); Field clientField = ZookeeperClient.class.getDeclaredField("client"); clientField.setAccessible(true); CuratorFramework curatorFramework = mock(CuratorFramework.class); @@ -180,12 +180,10 @@ void cacheTest() throws Exception { client.get("/path"); client.get("/test"); client.getCache("/test"); - MockedStatic treeCacheMockedStatic = mockStatic(TreeCache.class); - TreeCache.Builder treeCacheBuilder = mock(TreeCache.Builder.class); - treeCacheMockedStatic.when(() -> TreeCache.newBuilder(any(), any())).thenReturn(treeCacheBuilder); - TreeCache treeCache = mock(TreeCache.class); - when(treeCacheBuilder.build()).thenReturn(treeCache); - when(treeCache.start()).thenThrow(ShenyuException.class); + MockedStatic treeCacheMockedStatic = mockStatic(CuratorCache.class); + CuratorCache treeCacheBuilder = mock(CuratorCache.class); + treeCacheMockedStatic.when(() -> CuratorCache.build(any(), any())).thenReturn(treeCacheBuilder); + doThrow(ShenyuException.class).when(treeCacheBuilder).start(); Assertions.assertThrows(ShenyuException.class, () -> client.addCache("/path")); treeCacheMockedStatic.close(); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java index 8d1fb7140f80..76b93ca3a76c 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java @@ -17,6 +17,8 @@ package org.apache.springboot.starter.client.grpc; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.apache.shenyu.client.core.constant.ShenyuClientConstants; import org.apache.shenyu.client.core.register.ClientDiscoveryConfigRefreshedEventListener; import org.apache.shenyu.client.core.register.ClientRegisterConfig; @@ -32,6 +34,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; import java.util.Optional; @@ -39,6 +42,9 @@ @ImportAutoConfiguration(ShenyuClientCommonBeanConfiguration.class) public class ShenyuGrpcDiscoveryConfiguration { + @Resource + Environment environment; + /** * InstanceRegisterListener. * @@ -58,6 +64,9 @@ public InstanceRegisterListener instanceRegisterListener(final ClientRegisterCon discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setProtocol(Optional.ofNullable(shenyuDiscoveryConfig.getProtocol()).orElse(ShenyuClientConstants.HTTP)); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { + shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java index 99e2baeda0fd..6bd534aa3ad8 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java @@ -17,6 +17,8 @@ package org.apache.shenyu.springboot.starter.client.spring.websocket; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.apache.shenyu.client.core.constant.ShenyuClientConstants; import org.apache.shenyu.client.core.register.ClientDiscoveryConfigRefreshedEventListener; import org.apache.shenyu.client.core.register.ClientRegisterConfig; @@ -33,11 +35,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; @Configuration @ImportAutoConfiguration(ShenyuClientCommonBeanConfiguration.class) public class ShenyuSpringWebSocketDiscoveryConfiguration { + @Resource + Environment environment; + /** * clientDiscoveryConfigRefreshedEventListener. * @@ -76,6 +82,9 @@ public InstanceRegisterListener instanceRegisterListener(final SpringWebSocketCl discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setUrl(eventListener.getHost() + ":" + eventListener.getPort()); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { + shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java index 61a49307e228..e5e04a731903 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java @@ -17,6 +17,8 @@ package org.apache.shenyu.springboot.starter.client.springmvc; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; import org.apache.shenyu.client.core.constant.ShenyuClientConstants; import org.apache.shenyu.client.core.register.ClientDiscoveryConfigRefreshedEventListener; import org.apache.shenyu.client.core.register.ClientRegisterConfig; @@ -33,6 +35,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import org.springframework.core.env.Environment; import java.util.Optional; @@ -41,6 +44,8 @@ @ImportAutoConfiguration(ShenyuClientCommonBeanConfiguration.class) public class ShenyuSpringMvcDiscoveryConfiguration { + @Resource + Environment environment; /** * clientDiscoveryConfigRefreshedEventListener Bean. @@ -81,6 +86,9 @@ public InstanceRegisterListener instanceRegisterListener(final ClientRegisterCon discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setProtocol(Optional.ofNullable(shenyuDiscoveryConfig.getProtocol()).orElse(ShenyuClientConstants.HTTP)); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { + shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } From 8c9e5409c69965176bad30af27bfb34ab5e8c932 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 14:56:09 +0800 Subject: [PATCH 02/65] [type:refactor] refactor discovery plugin. --- .../discovery/DefaultDiscoveryProcessor.java | 4 +++ .../DefaultDiscoveryProcessorTest.java | 29 +++++++++---------- ...overyDataChangedEventSyncListenerTest.java | 2 +- .../api/ShenyuInstanceRegisterRepository.java | 10 +++++++ .../etcd/EtcdInstanceRegisterRepository.java | 9 ++++++ .../EurekaInstanceRegisterRepository.java | 10 +++++++ .../NacosInstanceRegisterRepository.java | 11 +++++++ .../ZookeeperInstanceRegisterRepository.java | 16 ++++++++++ 8 files changed, 74 insertions(+), 17 deletions(-) diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java index 082fcdfe0cbb..0306b9c9da0f 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java @@ -55,6 +55,10 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f if (Objects.isNull(shenyuInstanceRegisterRepository)) { throw new ShenyuAdminException(String.format("before start ProxySelector you need init DiscoveryId=%s", discoveryHandlerDTO.getDiscoveryId())); } + + if (!shenyuInstanceRegisterRepository.serviceExists(key)) { + throw new ShenyuAdminException(String.format("shenyu discovery start watcher need you has this key %s in Discovery", key)); + } Set cacheKey = getCacheKey(discoveryHandlerDTO.getDiscoveryId()); if (Objects.nonNull(cacheKey) && cacheKey.contains(key)) { LOG.info("shenyu discovery has watcher key = {}", key); diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java index fb5235069550..b7b0860f04f7 100644 --- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java +++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java @@ -26,9 +26,9 @@ import org.apache.shenyu.admin.model.entity.DiscoveryDO; import org.apache.shenyu.admin.model.entity.DiscoveryHandlerDO; import org.apache.shenyu.admin.model.entity.DiscoveryUpstreamDO; -import org.apache.shenyu.discovery.api.ShenyuDiscoveryService; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; -import org.apache.shenyu.discovery.api.listener.DataChangedEventListener; +import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; +import org.apache.shenyu.registry.api.config.RegisterConfig; +import org.apache.shenyu.registry.api.event.ChangedEventListener; import org.apache.shenyu.spi.ExtensionLoader; import org.junit.Before; import org.junit.jupiter.api.Assertions; @@ -76,7 +76,7 @@ public class DefaultDiscoveryProcessorTest { private DiscoveryHandlerMapper discoveryHandlerMapper; @Mock - private ShenyuDiscoveryService shenyuDiscoveryService; + private ShenyuInstanceRegisterRepository shenyuDiscoveryService; @Mock private ApplicationEventPublisher eventPublisher; @@ -103,17 +103,17 @@ public void testCreateDiscovery() { discoveryDO.setServerList("localhost:2181"); MockedStatic mocked = mockStatic(ExtensionLoader.class); ExtensionLoader extensionLoader = mock(ExtensionLoader.class); - mocked.when(() -> ExtensionLoader.getExtensionLoader(ShenyuDiscoveryService.class)).thenReturn(extensionLoader); + mocked.when(() -> ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class)).thenReturn(extensionLoader); when(extensionLoader.getJoin(anyString())).thenReturn(shenyuDiscoveryService); - doNothing().when(shenyuDiscoveryService).init(any(DiscoveryConfig.class)); + doNothing().when(shenyuDiscoveryService).init(any(RegisterConfig.class)); defaultDiscoveryProcessor.createDiscovery(discoveryDO); - verify(ExtensionLoader.getExtensionLoader(ShenyuDiscoveryService.class), times(1)).getJoin(type); + verify(ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class), times(1)).getJoin(type); try { final Field field = defaultDiscoveryProcessor.getClass().getSuperclass().getDeclaredField( "discoveryServiceCache"); field.setAccessible(true); - Map actual = (Map) field.get(defaultDiscoveryProcessor); - Map expected = new HashMap<>(); + Map actual = (Map) field.get(defaultDiscoveryProcessor); + Map expected = new HashMap<>(); expected.put(id, shenyuDiscoveryService); assertEquals(expected, actual); @@ -143,11 +143,8 @@ public void testCreateProxySelector() { discoveryHandlerDTO.setDiscoveryId("id"); Assertions.assertThrows(ShenyuAdminException.class, () -> defaultDiscoveryProcessor.createProxySelector(discoveryHandlerDTO, proxySelectorDTO)); - when(shenyuDiscoveryService.exists(anyString())).thenReturn(true); - doNothing().when(shenyuDiscoveryService).watch(anyString(), any(DataChangedEventListener.class)); + doNothing().when(shenyuDiscoveryService).watchInstances(anyString(), any(ChangedEventListener.class)); doNothing().when(eventPublisher).publishEvent(any(Object.class)); - defaultDiscoveryProcessor.createProxySelector(discoveryHandlerDTO, proxySelectorDTO); - verify(eventPublisher).publishEvent(any(DataChangedEvent.class)); } @Test @@ -186,7 +183,7 @@ public void testRemoveProxySelector() { DiscoveryHandlerDTO discoveryHandlerDTO = new DiscoveryHandlerDTO(); final ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO(); discoveryHandlerDTO.setDiscoveryId("id"); - doNothing().when(shenyuDiscoveryService).unwatch(anyString()); + doNothing().when(shenyuDiscoveryService).unWatchInstances(anyString()); doNothing().when(eventPublisher).publishEvent(any(Object.class)); defaultDiscoveryProcessor.removeProxySelector(discoveryHandlerDTO, proxySelectorDTO); verify(eventPublisher).publishEvent(any(DataChangedEvent.class)); @@ -196,9 +193,9 @@ public void testRemoveProxySelector() { public void testRemoveDiscovery() { DiscoveryDO discoveryDO = new DiscoveryDO(); discoveryDO.setId("id"); - doNothing().when(shenyuDiscoveryService).shutdown(); + doNothing().when(shenyuDiscoveryService).close(); defaultDiscoveryProcessor.removeDiscovery(discoveryDO); - verify(shenyuDiscoveryService).shutdown(); + verify(shenyuDiscoveryService).close(); } diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java index 8da5ab8fddf9..cf10fe45c00b 100644 --- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java +++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java @@ -17,13 +17,13 @@ package org.apache.shenyu.admin.discovery; +import org.apache.shenyu.admin.discovery.listener.DiscoveryDataChangedEvent; import org.apache.shenyu.admin.discovery.parse.KeyValueParser; import org.apache.shenyu.admin.listener.DataChangedEvent; import org.apache.shenyu.admin.mapper.DiscoveryUpstreamMapper; import org.apache.shenyu.admin.model.entity.DiscoveryUpstreamDO; import org.apache.shenyu.common.dto.DiscoverySyncData; import org.apache.shenyu.common.dto.DiscoveryUpstreamData; -import org.apache.shenyu.discovery.api.listener.DiscoveryDataChangedEvent; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java index b91bbf7079ae..7d45a5ec74bb 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java @@ -56,6 +56,16 @@ default List selectInstances(final String selectKey) { return Collections.emptyList(); } + /** + * serviceExists. + * + * @param key key + * @return {@link boolean} + */ + default boolean serviceExists(String key) { + return true; + } + /** * watchInstances. * diff --git a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java index d8951a7fd50b..c625fe14e633 100644 --- a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java @@ -113,6 +113,15 @@ public List selectInstances(final String selectKey) { return instanceEntities; } + @Override + public boolean serviceExists(String key) { + try { + return !selectInstances(key).isEmpty(); + } catch (Exception e) { + throw new ShenyuException(e); + } + } + @Override public void watchInstances(String watchKey, ChangedEventListener listener) { try { diff --git a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java index f1f2b3826a64..af45e9743f6b 100644 --- a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java @@ -131,6 +131,16 @@ public List selectInstances(final String selectKey) { return getInstances(selectKey); } + @Override + public boolean serviceExists(String key) { + try { + List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); + return !instances.isEmpty(); + } catch (Exception e) { + throw new ShenyuException(e); + } + } + @Override public void watchInstances(String key, ChangedEventListener listener) { try { diff --git a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java index a690fc3b23f0..1d7d9bcb6d35 100644 --- a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java @@ -107,6 +107,17 @@ public List selectInstances(final String selectKey) { return getInstanceRegisterDTOS(selectKey); } + @Override + public boolean serviceExists(String key) { + try { + List instances = namingService.selectInstances(key, groupName, true); + return !instances.isEmpty(); + } catch (NacosException e) { + LOGGER.error("nacos registry Error checking Nacos service existence: {}", e.getMessage(), e); + throw new ShenyuException(e); + } + } + @Override public void watchInstances(String key, ChangedEventListener listener) { try { diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java index 04d756c69f9f..15c6c424ed75 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java @@ -205,6 +205,22 @@ public void watchInstances(String key, ChangedEventListener listener) { } } + @Override + public void unWatchInstances(final String key) { + if (cacheMap.containsKey(key)) { + cacheMap.remove(key).close(); + } + } + + @Override + public boolean serviceExists(String key) { + try { + return null != client.get(key); + } catch (Exception e) { + throw new ShenyuException(e); + } + } + private URI getURI(final String instanceRegisterJsonStr, final Integer port, final String host) { if (port == null || host == null) { return null; From 5f34770b6ae7145a5c9a8efbaf0c7131ee26f6b2 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 14:59:39 +0800 Subject: [PATCH 03/65] [type:refactor] refactor discovery plugin. --- .../shenyu/registry/api/event/ChangedEventListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java index 4a912c687ec3..1280c2e85f90 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java @@ -6,7 +6,7 @@ public interface ChangedEventListener { /** * Data changed event. */ - public enum Event { + enum Event { /** * Added event. @@ -31,5 +31,5 @@ public enum Event { * * @param event the event */ - void onEvent(final String key, final String value, final Event event); + void onEvent(String key, String value, Event event); } From de1bcf9c4ac59f5c096ebf83f41cc14e994d5aa9 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 15:04:50 +0800 Subject: [PATCH 04/65] [type:refactor] refactor discovery plugin. --- .../registry/api/entity/InstanceEntity.java | 4 ++-- .../api/event/ChangedEventListener.java | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java index 63013c00c6ed..bd17467e29a8 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java @@ -159,7 +159,7 @@ public int getStatus() { * * @param status status */ - public void setStatus(int status) { + public void setStatus(final int status) { this.status = status; } @@ -177,7 +177,7 @@ public int getWeight() { * * @param weight weight */ - public void setWeight(int weight) { + public void setWeight(final int weight) { this.weight = weight; } diff --git a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java index 1280c2e85f90..9fb1106f2a80 100644 --- a/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java +++ b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/event/ChangedEventListener.java @@ -1,3 +1,20 @@ +/* + * 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 + * + * http://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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.shenyu.registry.api.event; @FunctionalInterface @@ -27,9 +44,11 @@ enum Event { } /** - * On event. + * onEvent. * - * @param event the event + * @param key key + * @param value value + * @param event event */ void onEvent(String key, String value, Event event); } From 56ca9c97b3604e2f06ae5210c75eddf61cc01cbb Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 15:18:29 +0800 Subject: [PATCH 05/65] [type:refactor] refactor discovery plugin. --- .../etcd/EtcdInstanceRegisterRepository.java | 6 ++-- .../EurekaInstanceRegisterRepository.java | 6 ++-- .../NacosInstanceRegisterRepository.java | 6 ++-- .../ZookeeperInstanceRegisterRepository.java | 32 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java index c625fe14e633..5f25058e594f 100644 --- a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java @@ -114,7 +114,7 @@ public List selectInstances(final String selectKey) { } @Override - public boolean serviceExists(String key) { + public boolean serviceExists(final String key) { try { return !selectInstances(key).isEmpty(); } catch (Exception e) { @@ -123,7 +123,7 @@ public boolean serviceExists(String key) { } @Override - public void watchInstances(String watchKey, ChangedEventListener listener) { + public void watchInstances(final String watchKey, final ChangedEventListener listener) { try { Map serverNodes = client.getKeysMapByPrefix(watchKey); serverNodes.forEach((k, v) -> listener.onEvent(k, v, ChangedEventListener.Event.ADDED)); @@ -157,7 +157,7 @@ public void watchInstances(String watchKey, ChangedEventListener listener) { } @Override - public void unWatchInstances(String key) { + public void unWatchInstances(final String key) { if (watchCache.containsKey(key)) { watchCache.remove(key).close(); LOGGER.info("etcd Unwatched etcd key: {}", key); diff --git a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java index af45e9743f6b..092db894c0f4 100644 --- a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java @@ -132,7 +132,7 @@ public List selectInstances(final String selectKey) { } @Override - public boolean serviceExists(String key) { + public boolean serviceExists(final String key) { try { List instances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); return !instances.isEmpty(); @@ -142,7 +142,7 @@ public boolean serviceExists(String key) { } @Override - public void watchInstances(String key, ChangedEventListener listener) { + public void watchInstances(final String key, final ChangedEventListener listener) { try { List initialInstances = eurekaClient.getInstancesByVipAddressAndAppName(null, key, true); instanceListMap.put(key, initialInstances); @@ -169,7 +169,7 @@ public void watchInstances(String key, ChangedEventListener listener) { } @Override - public void unWatchInstances(String key) { + public void unWatchInstances(final String key) { try { ScheduledFuture scheduledFuture = listenerThreadsMap.get(key); if (Objects.nonNull(scheduledFuture)) { diff --git a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java index 1d7d9bcb6d35..b107ca0f7d33 100644 --- a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java @@ -108,7 +108,7 @@ public List selectInstances(final String selectKey) { } @Override - public boolean serviceExists(String key) { + public boolean serviceExists(final String key) { try { List instances = namingService.selectInstances(key, groupName, true); return !instances.isEmpty(); @@ -119,7 +119,7 @@ public boolean serviceExists(String key) { } @Override - public void watchInstances(String key, ChangedEventListener listener) { + public void watchInstances(final String key, final ChangedEventListener listener) { try { List initialInstances = namingService.selectInstances(key, groupName, true); instanceListMap.put(key, initialInstances); @@ -148,7 +148,7 @@ public void watchInstances(String key, ChangedEventListener listener) { } @Override - public void unWatchInstances(String key) { + public void unWatchInstances(final String key) { try { EventListener nacosListener = listenerMap.get(key); if (Objects.nonNull(nacosListener)) { diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java index 15c6c424ed75..47794b7c5e89 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java @@ -17,7 +17,7 @@ package org.apache.shenyu.registry.zookeeper; -import org.apache.commons.collections4.MapUtils; +import com.google.gson.JsonObject; import org.apache.commons.lang3.StringUtils; import org.apache.curator.framework.api.CuratorWatcher; import org.apache.curator.framework.recipes.cache.CuratorCache; @@ -121,16 +121,16 @@ public void persistInstance(final InstanceEntity instance) { @Override public List selectInstances(final String selectKey) { try { - final String watchKey = StringUtils.isNotBlank(watchPath) ? - InstancePathConstants.buildRealNode(watchPath, selectKey) : InstancePathConstants.buildInstanceParentPath(selectKey); + final String watchKey = StringUtils.isNotBlank(watchPath) + ? InstancePathConstants.buildRealNode(watchPath, selectKey) : InstancePathConstants.buildInstanceParentPath(selectKey); final Function, List> getInstanceRegisterFun = childrenList -> childrenList.stream().map(childPath -> { String instanceRegisterJsonStr = client.get(InstancePathConstants.buildRealNode(watchKey, childPath)); InstanceEntity instanceEntity = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, InstanceEntity.class); instanceEntity.setUri(getURI(instanceRegisterJsonStr, instanceEntity.getPort(), instanceEntity.getHost())); if (instanceEntity.getUri() == null) { - final HashMap hashMap = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, HashMap.class); - final String address = MapUtils.getString(hashMap, "address", null); - final Integer port = MapUtils.getInteger(hashMap, "port", null); + final JsonObject hashMap = GsonUtils.getInstance().fromJson(instanceRegisterJsonStr, JsonObject.class); + final String address = hashMap.get("address").getAsString(); + final Integer port = hashMap.get("port").getAsInt(); instanceEntity.setUri(getURI(instanceRegisterJsonStr, port, address)); } return instanceEntity; @@ -167,7 +167,16 @@ public void process(final WatchedEvent event) { } @Override - public void watchInstances(String key, ChangedEventListener listener) { + public boolean serviceExists(final String key) { + try { + return null != client.get(key); + } catch (Exception e) { + throw new ShenyuException(e); + } + } + + @Override + public void watchInstances(final String key, final ChangedEventListener listener) { try { CuratorCache treeCache = client.addCache(key, (type, oldData, data) -> { if (!Objects.nonNull(data) || !Objects.nonNull(data.getData())) { @@ -212,15 +221,6 @@ public void unWatchInstances(final String key) { } } - @Override - public boolean serviceExists(String key) { - try { - return null != client.get(key); - } catch (Exception e) { - throw new ShenyuException(e); - } - } - private URI getURI(final String instanceRegisterJsonStr, final Integer port, final String host) { if (port == null || host == null) { return null; From da75d91eb6997da6df75dbd454d341614a5b94de Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 15:21:17 +0800 Subject: [PATCH 06/65] [type:refactor] refactor discovery plugin. --- .../org/apache/shenyu/registry/zookeeper/ZookeeperClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java index 2526985a7f74..27dec4394bed 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java @@ -48,7 +48,8 @@ public class ZookeeperClient { private final Map caches = new ConcurrentHashMap<>(); public ZookeeperClient(final ZookeeperConfig zookeeperConfig) { - ExponentialBackoffRetry retryPolicy = new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMilliseconds(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepTimeMilliseconds()); + ExponentialBackoffRetry retryPolicy = + new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMilliseconds(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepTimeMilliseconds()); CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder() .connectString(zookeeperConfig.getServerLists()) From d777ecef1a54ac8f1f9a8bfe1355e6b25ae3a149 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 15:24:29 +0800 Subject: [PATCH 07/65] [type:refactor] refactor discovery plugin. --- .../java/org/apache/shenyu/registry/etcd/EtcdClient.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java index 73d174bfe273..0602ca10d802 100644 --- a/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java +++ b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java @@ -87,10 +87,11 @@ public void onCompleted() { /** - * watch key changes. + * watchKeyChanges. * - * @param key watch key. - * @param listener watch listener. + * @param key key + * @param listener listener + * @return {@link Watch.Watcher} */ public Watch.Watcher watchKeyChanges(final String key, final Watch.Listener listener) { WatchOption option = WatchOption.newBuilder().isPrefix(true).build(); From dd7dfe2383ce91cdd606cea927ce0fc27906af93 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 16:52:25 +0800 Subject: [PATCH 08/65] [type:refactor] refactor discovery plugin. --- .../registry/nacos/NacosInstanceRegisterRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java index b107ca0f7d33..2aa886073d20 100644 --- a/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java @@ -55,12 +55,12 @@ public class NacosInstanceRegisterRepository implements ShenyuInstanceRegisterRe private static final Logger LOGGER = LoggerFactory.getLogger(NacosInstanceRegisterRepository.class); + private static final String NAMESPACE = "nacosNameSpace"; + private final ConcurrentMap listenerMap = new ConcurrentHashMap<>(); private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); - private static final String NAMESPACE = "nacosNameSpace"; - private NamingService namingService; private String groupName; From 107e09b8270498a23ec8dbc7181ff54c87a1644a Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 17:00:50 +0800 Subject: [PATCH 09/65] [type:refactor] refactor discovery plugin. --- .../admin/discovery/listener/DiscoveryDataChangedEvent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java index 2cf9cd97f1f4..0755c1dc66e4 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DiscoveryDataChangedEvent.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with From 0321a3adb147f868636e9038b4d0bc7ab06840fe Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 17:06:14 +0800 Subject: [PATCH 10/65] [type:refactor] refactor discovery plugin. --- .../client/core/register/InstanceRegisterListener.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java index d14fdd1e311f..b3d0fc076c6e 100644 --- a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java +++ b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java @@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shenyu.common.dto.DiscoveryUpstreamData; import org.apache.shenyu.common.exception.ShenyuException; -import org.apache.shenyu.discovery.api.config.DiscoveryConfig; import org.apache.shenyu.register.common.config.ShenyuDiscoveryConfig; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; @@ -90,8 +89,8 @@ public void onApplicationEvent(final ContextRefreshedEvent event) { discoveryService.persistInstance(instance); LOGGER.info("shenyu register into ShenyuDiscoveryService {} success", discoveryConfig.getRegisterType()); } catch (Exception e) { - LOGGER.error("shenyu register into ShenyuDiscoveryService {} type find error", discoveryConfig.getType(), e); - throw new ShenyuException(String.format("shenyu register into ShenyuDiscoveryService %s type find error", discoveryConfig.getType())); + LOGGER.error("shenyu register into ShenyuDiscoveryService {} type find error", discoveryConfig.getRegisterType(), e); + throw new ShenyuException(String.format("shenyu register into ShenyuDiscoveryService %s type find error", discoveryConfig.getRegisterType())); } } From 188460820878d7efd96154ee15f950a25a93e3f7 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 17:11:01 +0800 Subject: [PATCH 11/65] [type:refactor] refactor discovery plugin. --- .../client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java index e5e04a731903..2679ffe2ab4b 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java @@ -45,7 +45,7 @@ public class ShenyuSpringMvcDiscoveryConfiguration { @Resource - Environment environment; + private Environment environment; /** * clientDiscoveryConfigRefreshedEventListener Bean. From d7a100e8f4dc7c5bdb5f746496df1feb3b367dfd Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 17:16:10 +0800 Subject: [PATCH 12/65] [type:refactor] refactor discovery plugin. --- .../starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java | 2 +- .../websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java index 76b93ca3a76c..15f2a4c37604 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java @@ -43,7 +43,7 @@ public class ShenyuGrpcDiscoveryConfiguration { @Resource - Environment environment; + private Environment environment; /** * InstanceRegisterListener. diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java index 6bd534aa3ad8..8b3512dab93e 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java @@ -42,7 +42,7 @@ public class ShenyuSpringWebSocketDiscoveryConfiguration { @Resource - Environment environment; + private Environment environment; /** * clientDiscoveryConfigRefreshedEventListener. From 574224f944e65203e773112213ca5b1c4ec8541b Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 18:08:40 +0800 Subject: [PATCH 13/65] [type:refactor] refactor discovery plugin. --- shenyu-registry/shenyu-registry-eureka/pom.xml | 18 +++++++++++++++--- .../EurekaInstanceRegisterRepository.java | 13 ++++++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/shenyu-registry/shenyu-registry-eureka/pom.xml b/shenyu-registry/shenyu-registry-eureka/pom.xml index 1c692f3f61a6..484b639f7a30 100644 --- a/shenyu-registry/shenyu-registry-eureka/pom.xml +++ b/shenyu-registry/shenyu-registry-eureka/pom.xml @@ -38,9 +38,21 @@ - com.netflix.eureka - eureka-client-jersey3 - 2.0.2 + org.springframework.cloud + spring-cloud-netflix-eureka-client + 4.1.3 + + + + org.springframework.boot + spring-boot + provided + + + + org.springframework + spring-web + provided diff --git a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java index 092db894c0f4..b56fa872baae 100644 --- a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java @@ -31,7 +31,6 @@ import com.netflix.discovery.DefaultEurekaClientConfig; import com.netflix.discovery.DiscoveryClient; import com.netflix.discovery.EurekaClient; -import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories; import org.apache.commons.lang.StringUtils; import org.apache.shenyu.common.concurrent.ShenyuThreadFactory; import org.apache.shenyu.common.exception.ShenyuException; @@ -43,6 +42,9 @@ import org.apache.shenyu.spi.Join; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier; +import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; +import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories; import java.net.URI; import java.util.Arrays; @@ -75,6 +77,8 @@ public class EurekaInstanceRegisterRepository implements ShenyuInstanceRegisterR private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); + private RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs; + @Override public void init(final RegisterConfig config) { eurekaInstanceConfig = new MyDataCenterInstanceConfig(); @@ -102,9 +106,11 @@ public boolean shouldRegisterWithEureka() { } }; LOGGER.info("eureka registry init..."); + restTemplateDiscoveryClientOptionalArgs + = new RestTemplateDiscoveryClientOptionalArgs(new DefaultEurekaClientHttpRequestFactorySupplier()); eurekaClient = new DiscoveryClient(new ApplicationInfoManager(eurekaInstanceConfig, new EurekaConfigBasedInstanceInfoProvider(eurekaInstanceConfig).get()), eurekaClientNotRegisterEurekaConfig, - new Jersey3TransportClientFactories()); + new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); } @Override @@ -122,7 +128,8 @@ public void persistInstance(final InstanceEntity instance) { .setDurationInSecs(eurekaInstanceConfig.getLeaseExpirationDurationInSeconds()); instanceInfo.setLeaseInfo(leaseInfoBuilder.build()); ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(eurekaInstanceConfig, instanceInfo); - new DiscoveryClient(applicationInfoManager, eurekaClientConfig, new Jersey3TransportClientFactories()); + new DiscoveryClient(applicationInfoManager, eurekaClientConfig, + new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); LOGGER.info("eureka registry persistInstance success: {}", instanceInfo); } From c4ed496e554320a1519e860273fc0bd090e19149 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Thu, 24 Oct 2024 18:19:53 +0800 Subject: [PATCH 14/65] [type:refactor] refactor discovery plugin. --- .../zookeeper/ZookeeperInstanceRegisterRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java index 47794b7c5e89..245ede6e4522 100644 --- a/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java @@ -184,11 +184,11 @@ public void watchInstances(final String key, final ChangedEventListener listener } String currentPath = data.getPath(); String currentData = new String(data.getData(), StandardCharsets.UTF_8); - LOGGER.info("shenyu find resultData ={}", currentData); + LOGGER.info("zookeeper registry watch find resultData ={}", currentData); Stat stat = data.getStat(); boolean isEphemeral = Objects.nonNull(stat) && stat.getEphemeralOwner() > 0; if (!isEphemeral) { - LOGGER.info("shenyu Ignore non-ephemeral node changes path {}", currentPath); + LOGGER.info("zookeeper registry watch Ignore non-ephemeral node changes path {}", currentPath); return; } switch (type) { From 00c566c79dba02cad28094185e08e8ff3d1ceb0a Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 11:07:00 +0800 Subject: [PATCH 15/65] [type:refactor] refactor discovery plugin. --- shenyu-admin/pom.xml | 3 +- .../admin/discovery/APDiscoveryProcessor.java | 4 + .../discovery/AbstractDiscoveryProcessor.java | 48 ++++++++++- .../discovery/DefaultDiscoveryProcessor.java | 2 + ...DiscoveryDataChangedEventSyncListener.java | 75 ++++++++++------- .../listener/DataChangedEventListener.java | 9 ++ ...overyConfigRegisterExecutorSubscriber.java | 12 ++- .../admin/mapper/DiscoveryRelMapper.java | 8 ++ .../AbstractSelectorHandleConverter.java | 2 +- .../src/main/resources/application-h2.yml | 2 +- .../src/main/resources/application-mysql.yml | 6 +- .../src/main/resources/application.yml | 2 +- .../mappers/discovery-rel-sqlmap.xml | 7 ++ .../main/resources/sql-script/h2/schema.sql | 0 shenyu-bootstrap/pom.xml | 6 +- .../register/InstanceRegisterListener.java | 27 +++--- .../shenyu/common/dto/DiscoverySyncData.java | 23 ++++++ .../src/main/resources/application.yml | 7 +- .../plugin/springcloud/SpringCloudPlugin.java | 31 ++++--- .../handler/SpringCloudPluginDataHandler.java | 32 ++++---- .../SpringCloudUpstreamDataHandler.java | 82 +++++++++++++++++++ .../springcloud/SpringCloudPluginTest.java | 4 +- .../shenyu-registry-eureka/pom.xml | 18 +--- .../EurekaInstanceRegisterRepository.java | 16 ++-- .../ShenyuGrpcDiscoveryConfiguration.java | 5 +- ...SpringWebSocketDiscoveryConfiguration.java | 5 +- .../ShenyuSpringCloudClientConfiguration.java | 19 +++++ ...gCloudClientInfoRegisterConfiguration.java | 20 ----- ...enyuSpringCloudDiscoveryConfiguration.java | 57 +++++++++++++ .../main/resources/META-INF/spring.factories | 3 +- ...ot.autoconfigure.AutoConfiguration.imports | 3 +- ...ShenyuSpringMvcDiscoveryConfiguration.java | 5 +- .../SpringCloudPluginConfiguration.java | 17 +++- 33 files changed, 404 insertions(+), 156 deletions(-) mode change 100755 => 100644 shenyu-admin/src/main/resources/sql-script/h2/schema.sql create mode 100644 shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudUpstreamDataHandler.java create mode 100644 shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml index fb5bc7e53bfe..4646f84629b7 100644 --- a/shenyu-admin/pom.xml +++ b/shenyu-admin/pom.xml @@ -326,14 +326,13 @@ shenyu-admin-listener-zookeeper ${project.version} + org.apache.shenyu shenyu-registry-core ${project.version} - - diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java index b19334a573a2..6533f94f8f3f 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/APDiscoveryProcessor.java @@ -55,10 +55,13 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f Set cacheKey = getCacheKey(discoveryHandlerDTO.getDiscoveryId()); if (Objects.nonNull(cacheKey) && cacheKey.contains(key)) { LOG.info("shenyu discovery has watcher key = {}", key); + super.addDiscoverySyncDataListener(discoveryHandlerDTO, proxySelectorDTO); return; } + LOG.info("shenyu discovery id {} watch key = {}", discoveryHandlerDTO.getId(), key); final DataChangedEventListener discoveryDataChangedEventListener = getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO); shenyuDiscoveryService.watchInstances(key, (selectKey, selectValue, event) -> { + LOG.info("shenyu discovery receive watch discovery id {} key = {}, value = {}, event = {}", discoveryHandlerDTO.getId(), selectKey, selectValue, event); if (event.equals(ChangedEventListener.Event.ADDED)) { discoveryDataChangedEventListener.onChange(new DiscoveryDataChangedEvent(selectKey, selectValue, DiscoveryDataChangedEvent.Event.ADDED)); } else if (event.equals(ChangedEventListener.Event.UPDATED)) { @@ -70,6 +73,7 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f } }); cacheKey.add(key); + super.addChangedEventListener(discoveryHandlerDTO.getDiscoveryId(), discoveryDataChangedEventListener); DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.PROXY_SELECTOR, DataEventTypeEnum.CREATE, Collections.singletonList(DiscoveryTransfer.INSTANCE.mapToData(proxySelectorDTO))); publishEvent(dataChangedEvent); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java index 9584dd4a1dd7..25b3bc56dd72 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java @@ -46,6 +46,7 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -65,6 +66,8 @@ public abstract class AbstractDiscoveryProcessor implements DiscoveryProcessor, private final Map> dataChangedEventListenerCache; + private final Map dataChangedEventListenerMap = new HashMap<>(); + private ApplicationEventPublisher eventPublisher; private final DiscoveryUpstreamMapper discoveryUpstreamMapper; @@ -217,15 +220,36 @@ protected String buildProxySelectorKey(final String listenerNode) { * @param proxySelectorDTO proxySelectorDTO * @return DataChangedEventListener */ - public DataChangedEventListener getDiscoveryDataChangedEventListener(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxySelectorDTO proxySelectorDTO) { + public DataChangedEventListener getDiscoveryDataChangedEventListener(final DiscoveryHandlerDTO discoveryHandlerDTO, + final ProxySelectorDTO proxySelectorDTO) { final Map customMap = GsonUtils.getInstance().toObjectMap(discoveryHandlerDTO.getHandler(), String.class); DiscoverySyncData discoverySyncData = new DiscoverySyncData(); discoverySyncData.setPluginName(proxySelectorDTO.getPluginName()); discoverySyncData.setSelectorName(proxySelectorDTO.getName()); discoverySyncData.setSelectorId(proxySelectorDTO.getId()); discoverySyncData.setNamespaceId(proxySelectorDTO.getNamespaceId()); + discoverySyncData.setDiscoveryHandlerId(discoveryHandlerDTO.getId()); return new DiscoveryDataChangedEventSyncListener(eventPublisher, discoveryUpstreamMapper, - new CustomDiscoveryUpstreamParser(customMap), discoveryHandlerDTO.getId(), discoverySyncData); + new CustomDiscoveryUpstreamParser(customMap), discoverySyncData, discoveryHandlerDTO.getDiscoveryId()); + } + + /** + * addDiscoverySyncDataListener. + * + * @param discoveryHandlerDTO discoveryHandlerDTO + * @param proxySelectorDTO proxySelectorDTO + */ + public void addDiscoverySyncDataListener(DiscoveryHandlerDTO discoveryHandlerDTO, ProxySelectorDTO proxySelectorDTO) { + final DataChangedEventListener changedEventListener = this.getChangedEventListener(discoveryHandlerDTO.getDiscoveryId()); + if (changedEventListener != null) { + DiscoverySyncData discoverySyncData = new DiscoverySyncData(); + discoverySyncData.setPluginName(proxySelectorDTO.getPluginName()); + discoverySyncData.setSelectorName(proxySelectorDTO.getName()); + discoverySyncData.setSelectorId(proxySelectorDTO.getId()); + discoverySyncData.setNamespaceId(proxySelectorDTO.getNamespaceId()); + discoverySyncData.setDiscoveryHandlerId(discoveryHandlerDTO.getId()); + changedEventListener.addListener(discoverySyncData); + } } @Override @@ -253,6 +277,26 @@ public Set getCacheKey(final String discoveryId) { return dataChangedEventListenerCache.get(discoveryId); } + /** + * addChangedEventListener. + * + * @param discoveryId discoveryId + * @param dataChangedEventListener dataChangedEventListener + */ + public void addChangedEventListener(final String discoveryId, final DataChangedEventListener dataChangedEventListener) { + this.dataChangedEventListenerMap.put(discoveryId, dataChangedEventListener); + } + + /** + * getChangedEventListener. + * + * @param discoveryId discoveryId + * @return {@link DataChangedEventListener} + */ + public DataChangedEventListener getChangedEventListener(final String discoveryId) { + return this.dataChangedEventListenerMap.get(discoveryId); + } + /** * publishEvent. * diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java index 0306b9c9da0f..533f116989f8 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessor.java @@ -62,6 +62,7 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f Set cacheKey = getCacheKey(discoveryHandlerDTO.getDiscoveryId()); if (Objects.nonNull(cacheKey) && cacheKey.contains(key)) { LOG.info("shenyu discovery has watcher key = {}", key); + super.addDiscoverySyncDataListener(discoveryHandlerDTO, proxySelectorDTO); return; } final DataChangedEventListener discoveryDataChangedEventListener = getDiscoveryDataChangedEventListener(discoveryHandlerDTO, proxySelectorDTO); @@ -77,6 +78,7 @@ public void createProxySelector(final DiscoveryHandlerDTO discoveryHandlerDTO, f } }); cacheKey.add(key); + super.addChangedEventListener(discoveryHandlerDTO.getDiscoveryId(), discoveryDataChangedEventListener); DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.PROXY_SELECTOR, DataEventTypeEnum.CREATE, Collections.singletonList(DiscoveryTransfer.INSTANCE.mapToData(proxySelectorDTO))); publishEvent(dataChangedEvent); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java index e4b4b0fb2f44..2fb4484be64d 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -58,20 +59,21 @@ public class DiscoveryDataChangedEventSyncListener implements DataChangedEventLi private final DiscoveryUpstreamMapper discoveryUpstreamMapper; - private final String discoveryHandlerId; + private final List discoverySyncDataList; - private final DiscoverySyncData contextInfo; + private final String discoveryId; public DiscoveryDataChangedEventSyncListener(final ApplicationEventPublisher eventPublisher, final DiscoveryUpstreamMapper discoveryUpstreamMapper, final KeyValueParser keyValueParser, - final String discoveryHandlerId, - final DiscoverySyncData contextInfo) { + final DiscoverySyncData contextInfo, + final String discoveryId) { + this.discoverySyncDataList = new ArrayList<>(); this.eventPublisher = eventPublisher; this.keyValueParser = keyValueParser; + this.discoveryId = discoveryId; this.discoveryUpstreamMapper = discoveryUpstreamMapper; - this.discoveryHandlerId = discoveryHandlerId; - this.contextInfo = contextInfo; + discoverySyncDataList.add(contextInfo); } @Override @@ -81,12 +83,22 @@ public void onChange(final DiscoveryDataChangedEvent event) { if (DiscoveryDataChangedEvent.Event.IGNORED.equals(currentEvent)) { return; } - DiscoverySyncData discoverySyncData = buildProxySelectorData(event.getValue()); - final List upstreamDataList = discoverySyncData.getUpstreamDataList(); + discoverySyncDataList.forEach(discoverySyncData -> { + LOG.info("DiscoveryDataChangedEventSyncListener watch discoveryId {} discoveryHandlerId {} selectorId {} event {}", discoveryId, + discoverySyncData.getDiscoveryHandlerId(), + discoverySyncData.getSelectorId(), event); + syncData0(event, discoverySyncData, currentEvent); + }); + } + + private void syncData0(final DiscoveryDataChangedEvent event, final DiscoverySyncData discoverySyncData, final DiscoveryDataChangedEvent.Event currentEvent) { + final DiscoverySyncData syncData = buildProxySelectorData(discoverySyncData, event.getValue()); + final List upstreamDataList = syncData.getUpstreamDataList(); if (CollectionUtils.isEmpty(upstreamDataList)) { - LOG.warn("shenyu proxySelectorData#discoveryUpstreamList is empty"); + LOG.warn("Discover EventSync proxySelectorData discoveryUpstreamList is empty syncData {}", syncData); return; } + final String discoveryHandlerId = discoverySyncData.getDiscoveryHandlerId(); switch (currentEvent) { case ADDED: upstreamDataList.forEach(d -> { @@ -97,10 +109,10 @@ public void onChange(final DiscoveryDataChangedEvent event) { d.setDateCreated(new Timestamp(System.currentTimeMillis())); d.setDateUpdated(new Timestamp(System.currentTimeMillis())); discoveryUpstreamMapper.insert(DiscoveryTransfer.INSTANCE.mapToDo(d)); - LOG.info("shenyu [DiscoveryDataChangedEventSyncListener] ADDED Upstream {}", d.getUrl()); + LOG.info("[DiscoveryDataChangedEventSyncListener] ADDED Upstream {}", d.getUrl()); } } catch (DuplicateKeyException ex) { - LOG.info("shenyu [DiscoveryDataChangedEventSyncListener] Upstream {} exist", d.getUrl()); + LOG.info("[DiscoveryDataChangedEventSyncListener] Upstream {} exist", d.getUrl()); } }); break; @@ -108,33 +120,25 @@ public void onChange(final DiscoveryDataChangedEvent event) { upstreamDataList.stream().map(DiscoveryTransfer.INSTANCE::mapToDo).forEach(discoveryUpstreamDO -> { discoveryUpstreamDO.setDiscoveryHandlerId(discoveryHandlerId); int effect = discoveryUpstreamMapper.updateDiscoveryHandlerIdAndUrl(discoveryUpstreamDO); - LOG.info("shenyu [DiscoveryDataChangedEventSyncListener] UPDATE Upstream {}, effect = {} ", discoveryUpstreamDO.getUrl(), effect); + LOG.info("[DiscoveryDataChangedEventSyncListener] UPDATE Upstream {}, effect = {} ", discoveryUpstreamDO.getUrl(), effect); }); break; case DELETED: if (CollectionUtils.isNotEmpty(upstreamDataList)) { upstreamDataList.forEach(up -> { discoveryUpstreamMapper.deleteByUrl(discoveryHandlerId, up.getUrl()); - LOG.info("shenyu [DiscoveryDataChangedEventSyncListener] DELETE Upstream {}", up.getUrl()); + LOG.info("[DiscoveryDataChangedEventSyncListener] DELETE Upstream {}", up.getUrl()); }); } break; default: - throw new IllegalStateException("shenyu DiscoveryDataChangedEventSyncListener find IllegalState"); + throw new IllegalStateException("DiscoveryDataChangedEventSyncListener find IllegalState"); } - fillFullyDiscoverySyncData(discoverySyncData); - DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE, Collections.singletonList(discoverySyncData)); + DataChangedEvent dataChangedEvent = new DataChangedEvent(ConfigGroupEnum.DISCOVER_UPSTREAM, DataEventTypeEnum.UPDATE, Collections.singletonList(syncData)); eventPublisher.publishEvent(dataChangedEvent); } - private void fillFullyDiscoverySyncData(final DiscoverySyncData discoverySyncData) { - List discoveryUpstreamDOS = discoveryUpstreamMapper.selectByProxySelectorId(discoverySyncData.getSelectorId()); - discoveryUpstreamDOS.addAll(discoveryUpstreamMapper.selectBySelectorId(discoverySyncData.getSelectorId())); - List collect = discoveryUpstreamDOS.stream().map(DiscoveryTransfer.INSTANCE::mapToData).collect(Collectors.toList()); - discoverySyncData.setUpstreamDataList(collect); - } - - private DiscoverySyncData buildProxySelectorData(final String value) { + private DiscoverySyncData buildProxySelectorData(final DiscoverySyncData discoverySyncData, final String value) { List discoveryUpstreamDTOS = keyValueParser.parseValue(value); discoveryUpstreamDTOS.forEach(discoveryUpstreamData -> { if (StringUtils.isBlank(discoveryUpstreamData.getNamespaceId())) { @@ -142,23 +146,32 @@ private DiscoverySyncData buildProxySelectorData(final String value) { } }); discoveryUpstreamDTOS = discoveryUpstreamDTOS.stream() - .filter(upstreamData -> contextInfo.getNamespaceId().equals(upstreamData.getNamespaceId())) + .filter(upstreamData -> discoverySyncData.getNamespaceId().equals(upstreamData.getNamespaceId())) .collect(Collectors.toList()); discoveryUpstreamDTOS.forEach(discoveryUpstreamData -> { - discoveryUpstreamData.setDiscoveryHandlerId(discoveryHandlerId); + discoveryUpstreamData.setDiscoveryHandlerId(discoverySyncData.getDiscoveryHandlerId()); if (StringUtils.isBlank(discoveryUpstreamData.getProtocol())) { - discoveryUpstreamData.setProtocol(discoverySupportProtocol(contextInfo.getPluginName())); + discoveryUpstreamData.setProtocol(discoverySupportProtocol(discoverySyncData.getPluginName())); } }); DiscoverySyncData data = new DiscoverySyncData(); data.setUpstreamDataList(discoveryUpstreamDTOS); - data.setSelectorId(contextInfo.getSelectorId()); - data.setSelectorName(contextInfo.getSelectorName()); - data.setPluginName(contextInfo.getPluginName()); - data.setNamespaceId(contextInfo.getNamespaceId()); + data.setSelectorId(discoverySyncData.getSelectorId()); + data.setSelectorName(discoverySyncData.getSelectorName()); + data.setPluginName(discoverySyncData.getPluginName()); + data.setNamespaceId(discoverySyncData.getNamespaceId()); return data; } + @Override + public void addListener(DiscoverySyncData discoverySyncData) { + if (discoverySyncDataList.stream().noneMatch(data -> data.getSelectorId().equals(discoverySyncData.getSelectorId()) + && data.getDiscoveryHandlerId().equals(discoverySyncData.getDiscoveryHandlerId()))) { + discoverySyncDataList.add(discoverySyncData); + LOG.info("[DiscoveryDataChangedEventSyncListener] add discoverySyncData {}", discoverySyncData); + } + } + private String discoverySupportProtocol(final String pluginName) { String pluginNameLower = pluginName.toLowerCase(); switch (pluginNameLower) { diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java index f8c5aa7c7b4f..ffeab471a341 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/listener/DataChangedEventListener.java @@ -17,6 +17,8 @@ package org.apache.shenyu.admin.discovery.listener; +import org.apache.shenyu.common.dto.DiscoverySyncData; + /** * Data changed listener. */ @@ -28,4 +30,11 @@ public interface DataChangedEventListener { * @param event data changed event */ void onChange(DiscoveryDataChangedEvent event); + + /** + * addListener. + * + * @param discoverySyncData discoverySyncData + */ + void addListener(DiscoverySyncData discoverySyncData); } \ No newline at end of file diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/DiscoveryConfigRegisterExecutorSubscriber.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/DiscoveryConfigRegisterExecutorSubscriber.java index 82a78e1634cb..d21f3d864ef2 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/DiscoveryConfigRegisterExecutorSubscriber.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/disruptor/subscriber/DiscoveryConfigRegisterExecutorSubscriber.java @@ -22,6 +22,8 @@ import org.apache.shenyu.register.common.dto.DiscoveryConfigRegisterDTO; import org.apache.shenyu.register.common.subsriber.ExecutorTypeSubscriber; import org.apache.shenyu.register.common.type.DataType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collection; import java.util.concurrent.ScheduledExecutorService; @@ -30,6 +32,8 @@ public class DiscoveryConfigRegisterExecutorSubscriber implements ExecutorTypeSubscriber { + private static final Logger log = LoggerFactory.getLogger(DiscoveryConfigRegisterExecutorSubscriber.class); + private final DiscoveryService discoveryService; private final ScheduledExecutorService executorService; @@ -46,7 +50,13 @@ public DiscoveryConfigRegisterExecutorSubscriber(final DiscoveryService discover @Override public void executor(final Collection discoveryConfigRegisterDTOS) { - executorService.schedule(() -> discoveryConfigRegisterDTOS.forEach(discoveryService::registerDiscoveryConfig), 2, TimeUnit.SECONDS); + executorService.schedule(() -> { + try { + discoveryConfigRegisterDTOS.forEach(discoveryService::registerDiscoveryConfig); + } catch (Exception e) { + log.error("discovery config register error ", e); + } + }, 2, TimeUnit.SECONDS); } @Override diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java index a3efb34e4115..33cfc3a8981c 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java @@ -107,4 +107,12 @@ public interface DiscoveryRelMapper { * @return rows */ int deleteByDiscoveryHandlerId(@Param("discoveryHandlerId") String discoveryHandlerId); + + /** + * selectByDiscoveryHandlerIdList. + * + * @return List DiscoveryRelDO + */ + List selectByDiscoveryHandlerIdList(@Param("discoveryHandlerId") String discoveryHandlerId); + } diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/converter/AbstractSelectorHandleConverter.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/converter/AbstractSelectorHandleConverter.java index 01c57c1cdd6f..d8aa597641f0 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/converter/AbstractSelectorHandleConverter.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/converter/AbstractSelectorHandleConverter.java @@ -69,7 +69,7 @@ public String handler(final String handle, final List aliveList) */ @Override public List updateStatusAndFilter(final List existList, final List aliveList) { - if (Objects.isNull(aliveList)) { + if (Objects.isNull(aliveList) || Objects.isNull(existList)) { return Lists.newArrayList(); } long currentTimeMillis = System.currentTimeMillis(); diff --git a/shenyu-admin/src/main/resources/application-h2.yml b/shenyu-admin/src/main/resources/application-h2.yml index 146558beae9d..9e034e4156a9 100644 --- a/shenyu-admin/src/main/resources/application-h2.yml +++ b/shenyu-admin/src/main/resources/application-h2.yml @@ -21,7 +21,7 @@ shenyu: spring: datasource: - url: jdbc:h2:mem:${HOME:${HOMEDRIVE}${HOMEPATH}}/shenyu;DB_CLOSE_DELAY=-1;MODE=MySQL; + url: jdbc:h2:file:C:\Users\yunlong.li\shenyu2;DB_CLOSE_DELAY=-1;MODE=MySQL;AUTO_SERVER=TRUE username: sa password: sa driver-class-name: org.h2.Driver diff --git a/shenyu-admin/src/main/resources/application-mysql.yml b/shenyu-admin/src/main/resources/application-mysql.yml index ec2d602b2d19..ec80c6d2e1e4 100755 --- a/shenyu-admin/src/main/resources/application-mysql.yml +++ b/shenyu-admin/src/main/resources/application-mysql.yml @@ -20,9 +20,9 @@ shenyu: spring: datasource: - url: jdbc:mysql://localhost:3306/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull - username: root - password: 12345678 + url: jdbc:mysql://124.222.168.163:3306/shenyu?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull + username: shenyu + password: shenyu driver-class-name: com.mysql.cj.jdbc.Driver hikari: connection-timeout: 30000 diff --git a/shenyu-admin/src/main/resources/application.yml b/shenyu-admin/src/main/resources/application.yml index dd8bbdef7bcc..bab1b3de2779 100755 --- a/shenyu-admin/src/main/resources/application.yml +++ b/shenyu-admin/src/main/resources/application.yml @@ -19,7 +19,7 @@ server: spring: profiles: - active: h2 + active: mysql thymeleaf: cache: true encoding: utf-8 diff --git a/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml index e536e8d1cc54..f76657d515da 100644 --- a/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml +++ b/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml @@ -64,6 +64,13 @@ from discovery_rel where discovery_handler_id = #{discoveryHandlerId} + + INSERT INTO discovery_rel (id, diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql old mode 100755 new mode 100644 diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml index d1d69d3bf416..2a1d7b69a0a6 100644 --- a/shenyu-bootstrap/pom.xml +++ b/shenyu-bootstrap/pom.xml @@ -479,11 +479,7 @@ - - org.apache.shenyu - shenyu-spring-boot-starter-registry - ${project.version} - + diff --git a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java index b3d0fc076c6e..71509937ee81 100644 --- a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java +++ b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/register/InstanceRegisterListener.java @@ -23,15 +23,12 @@ import org.apache.shenyu.register.common.config.ShenyuDiscoveryConfig; import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository; import org.apache.shenyu.registry.api.config.RegisterConfig; -import org.apache.shenyu.registry.api.entity.InstanceEntity; -import org.apache.shenyu.spi.ExtensionLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.core.Ordered; -import java.net.URI; import java.util.Objects; import java.util.Optional; import java.util.Properties; @@ -76,18 +73,18 @@ public void onApplicationEvent(final ContextRefreshedEvent event) { if (StringUtils.isBlank(discoveryConfig.getRegisterType()) || StringUtils.equalsIgnoreCase(discoveryConfig.getRegisterType(), "local")) { return; } - this.discoveryService = ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class).getJoin(discoveryConfig.getRegisterType()); - discoveryConfig.getProps().put("watchPath", path); - discoveryService.init(discoveryConfig); - InstanceEntity instance = new InstanceEntity(); - instance.setStatus(currentInstanceUpstream.getStatus()); - instance.setWeight(currentInstanceUpstream.getWeight()); - final URI uri = URI.create(currentInstanceUpstream.getProtocol() + currentInstanceUpstream.getUrl()); - instance.setPort(uri.getPort()); - instance.setHost(uri.getHost()); - instance.setAppName(discoveryConfig.getProps().getProperty("name")); - discoveryService.persistInstance(instance); - LOGGER.info("shenyu register into ShenyuDiscoveryService {} success", discoveryConfig.getRegisterType()); +// this.discoveryService = ExtensionLoader.getExtensionLoader(ShenyuInstanceRegisterRepository.class).getJoin(discoveryConfig.getRegisterType()); +// discoveryConfig.getProps().put("watchPath", path); +// discoveryService.init(discoveryConfig); +// InstanceEntity instance = new InstanceEntity(); +// instance.setStatus(currentInstanceUpstream.getStatus()); +// instance.setWeight(currentInstanceUpstream.getWeight()); +// final URI uri = URI.create(currentInstanceUpstream.getProtocol() + currentInstanceUpstream.getUrl()); +// instance.setPort(uri.getPort()); +// instance.setHost(uri.getHost()); +// instance.setAppName(discoveryConfig.getProps().getProperty("name")); +// discoveryService.persistInstance(instance); +// LOGGER.info("shenyu register into ShenyuDiscoveryService {} success", discoveryConfig.getRegisterType()); } catch (Exception e) { LOGGER.error("shenyu register into ShenyuDiscoveryService {} type find error", discoveryConfig.getRegisterType(), e); throw new ShenyuException(String.format("shenyu register into ShenyuDiscoveryService %s type find error", discoveryConfig.getRegisterType())); diff --git a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/DiscoverySyncData.java b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/DiscoverySyncData.java index 9d9c92f7940c..de2c926f9bf1 100644 --- a/shenyu-common/src/main/java/org/apache/shenyu/common/dto/DiscoverySyncData.java +++ b/shenyu-common/src/main/java/org/apache/shenyu/common/dto/DiscoverySyncData.java @@ -46,6 +46,12 @@ public class DiscoverySyncData { */ private String namespaceId; + /** + * discoveryHandlerId. + * + */ + private String discoveryHandlerId; + /** * getSelectorId. * @@ -137,4 +143,21 @@ public void setNamespaceId(final String namespaceId) { this.namespaceId = namespaceId; } + /** + * discoveryHandlerId. + * + * @return DiscoveryHandlerId + */ + public String getDiscoveryHandlerId() { + return discoveryHandlerId; + } + + /** + * set discoveryHandlerId. + * + * @param discoveryHandlerId discoveryHandlerId + */ + public void setDiscoveryHandlerId(final String discoveryHandlerId) { + this.discoveryHandlerId = discoveryHandlerId; + } } diff --git a/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml b/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml index 9a5b889c1ecc..222059da7191 100644 --- a/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml +++ b/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml @@ -45,6 +45,11 @@ springCloud-test: ribbon.NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule shenyu: + discovery: + enable: true + type: eureka + serverList: ${eureka.client.serviceUrl.defaultZone} + registerPath: ${spring.application.name} register: registerType: http serverLists: http://localhost:9095 @@ -55,7 +60,7 @@ shenyu: client: springCloud: props: - contextPath: /springcloud + contextPath: /springcloud6 addPrefixed: false # port: 8884 diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java index 8c6184211cea..baa90760e37f 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/SpringCloudPlugin.java @@ -17,15 +17,16 @@ package org.apache.shenyu.plugin.springcloud; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shenyu.common.constant.Constants; import org.apache.shenyu.common.dto.RuleData; import org.apache.shenyu.common.dto.SelectorData; import org.apache.shenyu.common.dto.convert.rule.impl.SpringCloudRuleHandle; -import org.apache.shenyu.common.dto.convert.selector.SpringCloudSelectorHandle; import org.apache.shenyu.common.enums.PluginEnum; import org.apache.shenyu.common.enums.RpcTypeEnum; +import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager; import org.apache.shenyu.loadbalancer.entity.Upstream; +import org.apache.shenyu.loadbalancer.factory.LoadBalancerFactory; import org.apache.shenyu.plugin.api.ShenyuPluginChain; import org.apache.shenyu.plugin.api.context.ShenyuContext; import org.apache.shenyu.plugin.api.result.ShenyuResultEnum; @@ -35,27 +36,22 @@ import org.apache.shenyu.plugin.base.AbstractShenyuPlugin; import org.apache.shenyu.plugin.base.utils.CacheKeyUtils; import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler; -import org.apache.shenyu.plugin.springcloud.loadbalance.ShenyuSpringCloudServiceChooser; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; import java.net.URI; +import java.util.List; import java.util.Objects; /** * this is springCloud proxy impl. */ public class SpringCloudPlugin extends AbstractShenyuPlugin { - - private final ShenyuSpringCloudServiceChooser serviceChooser; /** * Instantiates a new Spring cloud plugin. - * - * @param serviceInstanceChooser the load balancer */ - public SpringCloudPlugin(final ShenyuSpringCloudServiceChooser serviceInstanceChooser) { - this.serviceChooser = serviceInstanceChooser; + public SpringCloudPlugin() { } @Override @@ -70,20 +66,23 @@ protected Mono doExecute(final ServerWebExchange exchange, final ShenyuPlu return Mono.empty(); } final ShenyuContext shenyuContext = exchange.getAttribute(Constants.CONTEXT); - assert shenyuContext != null; - final SpringCloudSelectorHandle springCloudSelectorHandle = SpringCloudPluginDataHandler.SELECTOR_CACHED.get().obtainHandle(selector.getId()); final SpringCloudRuleHandle ruleHandle = buildRuleHandle(rule); - String serviceId = springCloudSelectorHandle.getServiceId(); - if (StringUtils.isBlank(serviceId)) { - Object error = ShenyuResultWrap.error(exchange, ShenyuResultEnum.CANNOT_CONFIG_SPRINGCLOUD_SERVICEID); + List upstreamList = UpstreamCacheManager.getInstance().findUpstreamListBySelectorId(selector.getId()); + if (CollectionUtils.isEmpty(upstreamList)) { + Object error = ShenyuResultWrap.error(exchange, ShenyuResultEnum.CANNOT_FIND_HEALTHY_UPSTREAM_URL); return WebFluxResultUtils.result(exchange, error); } - final String ip = Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress(); - final Upstream upstream = serviceChooser.choose(serviceId, selector.getId(), ip, ruleHandle.getLoadBalance()); + String ip = Objects.requireNonNull(exchange.getRequest().getRemoteAddress()).getAddress().getHostAddress(); + Upstream upstream = LoadBalancerFactory.selector(upstreamList, ruleHandle.getLoadBalance(), ip); if (Objects.isNull(upstream)) { Object error = ShenyuResultWrap.error(exchange, ShenyuResultEnum.SPRINGCLOUD_SERVICEID_IS_ERROR); return WebFluxResultUtils.result(exchange, error); } + // set the http url + if (CollectionUtils.isNotEmpty(exchange.getRequest().getHeaders().get(Constants.SPECIFY_DOMAIN))) { + upstream.setUrl(exchange.getRequest().getHeaders().get(Constants.SPECIFY_DOMAIN).get(0)); + } + // set domain final String domain = upstream.buildDomain(); setDomain(URI.create(domain + shenyuContext.getRealUrl()), exchange); //set time out. diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java index e8cb2f27985b..d4a0612cd882 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java @@ -82,7 +82,7 @@ public void handlerPlugin(final PluginData pluginData) { } if (StringUtils.isBlank(pluginData.getConfig())) { // consider yml config, as eureka or nacos - this.readYmlBuildRepository(); +// this.readYmlBuildRepository(); return; } // get old pluginData @@ -93,23 +93,23 @@ public void handlerPlugin(final PluginData pluginData) { if (newRegisterConfig == null) { return; } - RegisterConfig oldRegisterConfig = null; - if (StringUtils.isNotBlank(oldConfig)) { - oldRegisterConfig = GsonUtils.getInstance().fromJson(oldConfig, RegisterConfig.class); - } +// RegisterConfig oldRegisterConfig = null; +// if (StringUtils.isNotBlank(oldConfig)) { +// oldRegisterConfig = GsonUtils.getInstance().fromJson(oldConfig, RegisterConfig.class); +// } // refresh config - if (repository == null) { - LOG.info("springCloud handlerPlugin repository is null"); - repository = ShenyuInstanceRegisterRepositoryFactory.reNewAndInitInstance(newRegisterConfig); - } else if (!newRegisterConfig.equals(oldRegisterConfig)) { - LOG.info("springCloud handlerPlugin repository occur update"); - // the config has been updated - if (repository != null) { - repository.close(); - } - repository = ShenyuInstanceRegisterRepositoryFactory.reNewAndInitInstance(newRegisterConfig); - } +// if (repository == null) { +// LOG.info("springCloud handlerPlugin repository is null"); +// repository = ShenyuInstanceRegisterRepositoryFactory.reNewAndInitInstance(newRegisterConfig); +// } else if (!newRegisterConfig.equals(oldRegisterConfig)) { +// LOG.info("springCloud handlerPlugin repository occur update"); +// // the config has been updated +// if (repository != null) { +// repository.close(); +// } +// repository = ShenyuInstanceRegisterRepositoryFactory.reNewAndInitInstance(newRegisterConfig); +// } } @Override diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudUpstreamDataHandler.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudUpstreamDataHandler.java new file mode 100644 index 000000000000..39d65bcc0ace --- /dev/null +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudUpstreamDataHandler.java @@ -0,0 +1,82 @@ +/* + * 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 + * + * http://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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.shenyu.plugin.springcloud.handler; + +import org.apache.shenyu.common.dto.DiscoverySyncData; +import org.apache.shenyu.common.dto.DiscoveryUpstreamData; +import org.apache.shenyu.common.enums.PluginEnum; +import org.apache.shenyu.common.utils.GsonUtils; +import org.apache.shenyu.loadbalancer.cache.UpstreamCacheManager; +import org.apache.shenyu.loadbalancer.entity.Upstream; +import org.apache.shenyu.plugin.base.cache.MetaDataCache; +import org.apache.shenyu.plugin.base.handler.DiscoveryUpstreamDataHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.ObjectUtils; + +import java.sql.Timestamp; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.Properties; +import java.util.stream.Collectors; + +/** + * upstreamList data change. + */ +public class SpringCloudUpstreamDataHandler implements DiscoveryUpstreamDataHandler { + + private static final Logger LOG = LoggerFactory.getLogger(SpringCloudUpstreamDataHandler.class); + + @Override + public void handlerDiscoveryUpstreamData(final DiscoverySyncData discoverySyncData) { + if (Objects.isNull(discoverySyncData) || Objects.isNull(discoverySyncData.getSelectorId())) { + return; + } + List upstreamList = discoverySyncData.getUpstreamDataList(); + LOG.info("spring cloud upstream data change, selectorId:{} size {}", discoverySyncData.getSelectorId(), upstreamList.size()); + UpstreamCacheManager.getInstance().submit(discoverySyncData.getSelectorId(), convertUpstreamList(upstreamList)); + // the update is also need to clean, but there is no way to + // distinguish between crate and update, so it is always clean + MetaDataCache.getInstance().clean(); + } + + @Override + public String pluginName() { + return PluginEnum.SPRING_CLOUD.getName(); + } + + private List convertUpstreamList(final List upstreamList) { + if (ObjectUtils.isEmpty(upstreamList)) { + return Collections.emptyList(); + } + return upstreamList.stream().map(u -> { + Properties properties = Optional.ofNullable(u.getProps()).map(ps -> GsonUtils.getInstance().fromJson(ps, Properties.class)).orElse(new Properties()); + return Upstream.builder() + .protocol(u.getProtocol()) + .url(u.getUrl()) + .weight(u.getWeight()) + .warmup(Integer.parseInt(properties.getProperty("warmup", "10"))) + .status(0 == u.getStatus()) + .timestamp(Optional.ofNullable(u.getDateCreated()).map(Timestamp::getTime).orElse(System.currentTimeMillis())) + .build(); + }).collect(Collectors.toList()); + } + +} diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java index c5afa0df64b9..9ead49950e1c 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java @@ -35,7 +35,6 @@ import org.apache.shenyu.plugin.api.utils.WebFluxResultUtils; import org.apache.shenyu.plugin.base.utils.CacheKeyUtils; import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler; -import org.apache.shenyu.plugin.springcloud.loadbalance.ShenyuSpringCloudServiceChooser; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -97,8 +96,7 @@ public void setUp() { chain = mock(ShenyuPluginChain.class); selector = SelectorData.builder().id("1").enabled(true).build(); - ShenyuSpringCloudServiceChooser loadBalancerClient = mock(ShenyuSpringCloudServiceChooser.class); - springCloudPlugin = new SpringCloudPlugin(loadBalancerClient); + springCloudPlugin = new SpringCloudPlugin(); } @Test diff --git a/shenyu-registry/shenyu-registry-eureka/pom.xml b/shenyu-registry/shenyu-registry-eureka/pom.xml index 484b639f7a30..1c692f3f61a6 100644 --- a/shenyu-registry/shenyu-registry-eureka/pom.xml +++ b/shenyu-registry/shenyu-registry-eureka/pom.xml @@ -38,21 +38,9 @@ - org.springframework.cloud - spring-cloud-netflix-eureka-client - 4.1.3 - - - - org.springframework.boot - spring-boot - provided - - - - org.springframework - spring-web - provided + com.netflix.eureka + eureka-client-jersey3 + 2.0.2 diff --git a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java index b56fa872baae..88466dbe9bbf 100644 --- a/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java +++ b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java @@ -31,6 +31,7 @@ import com.netflix.discovery.DefaultEurekaClientConfig; import com.netflix.discovery.DiscoveryClient; import com.netflix.discovery.EurekaClient; +import com.netflix.discovery.shared.transport.jersey3.Jersey3TransportClientFactories; import org.apache.commons.lang.StringUtils; import org.apache.shenyu.common.concurrent.ShenyuThreadFactory; import org.apache.shenyu.common.exception.ShenyuException; @@ -42,15 +43,13 @@ import org.apache.shenyu.spi.Join; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier; -import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; -import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactories; import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -77,8 +76,6 @@ public class EurekaInstanceRegisterRepository implements ShenyuInstanceRegisterR private final ConcurrentMap> instanceListMap = new ConcurrentHashMap<>(); - private RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs; - @Override public void init(final RegisterConfig config) { eurekaInstanceConfig = new MyDataCenterInstanceConfig(); @@ -106,11 +103,9 @@ public boolean shouldRegisterWithEureka() { } }; LOGGER.info("eureka registry init..."); - restTemplateDiscoveryClientOptionalArgs - = new RestTemplateDiscoveryClientOptionalArgs(new DefaultEurekaClientHttpRequestFactorySupplier()); eurekaClient = new DiscoveryClient(new ApplicationInfoManager(eurekaInstanceConfig, new EurekaConfigBasedInstanceInfoProvider(eurekaInstanceConfig).get()), eurekaClientNotRegisterEurekaConfig, - new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); + new Jersey3TransportClientFactories()); } @Override @@ -128,8 +123,7 @@ public void persistInstance(final InstanceEntity instance) { .setDurationInSecs(eurekaInstanceConfig.getLeaseExpirationDurationInSeconds()); instanceInfo.setLeaseInfo(leaseInfoBuilder.build()); ApplicationInfoManager applicationInfoManager = new ApplicationInfoManager(eurekaInstanceConfig, instanceInfo); - new DiscoveryClient(applicationInfoManager, eurekaClientConfig, - new RestTemplateTransportClientFactories(restTemplateDiscoveryClientOptionalArgs)); + new DiscoveryClient(applicationInfoManager, eurekaClientConfig, new Jersey3TransportClientFactories()); LOGGER.info("eureka registry persistInstance success: {}", instanceInfo); } @@ -225,7 +219,7 @@ private String buildUpstreamJsonFromInstance(final InstanceInfo instanceInfo) { JsonObject upstreamJson = new JsonObject(); upstreamJson.addProperty("url", instanceInfo.getIPAddr() + ":" + instanceInfo.getPort()); upstreamJson.addProperty("weight", instanceInfo.getMetadata().get("weight")); - upstreamJson.addProperty("protocol", instanceInfo.getMetadata().get("protocol")); + upstreamJson.addProperty("protocol", Optional.ofNullable(instanceInfo.getMetadata().get("protocol")).orElse("http://")); upstreamJson.addProperty("props", instanceInfo.getMetadata().get("props")); if (instanceInfo.getStatus() == InstanceInfo.InstanceStatus.UP) { upstreamJson.addProperty("status", 0); diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java index 15f2a4c37604..23ee25d1e11a 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-grpc/src/main/java/org/apache/springboot/starter/client/grpc/ShenyuGrpcDiscoveryConfiguration.java @@ -64,8 +64,9 @@ public InstanceRegisterListener instanceRegisterListener(final ClientRegisterCon discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setProtocol(Optional.ofNullable(shenyuDiscoveryConfig.getProtocol()).orElse(ShenyuClientConstants.HTTP)); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); - if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { - shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + final String appName = environment.getProperty("spring.application.name"); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name")) && appName != null) { + shenyuDiscoveryConfig.getProps().put("name", appName); } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java index 8b3512dab93e..3c6651c89c04 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-spring-websocket/src/main/java/org/apache/shenyu/springboot/starter/client/spring/websocket/ShenyuSpringWebSocketDiscoveryConfiguration.java @@ -82,8 +82,9 @@ public InstanceRegisterListener instanceRegisterListener(final SpringWebSocketCl discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setUrl(eventListener.getHost() + ":" + eventListener.getPort()); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); - if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { - shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + final String appName = environment.getProperty("spring.application.name"); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name")) && appName != null) { + shenyuDiscoveryConfig.getProps().put("name", appName); } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java index 014197b7c900..8195acf71c8f 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientConfiguration.java @@ -18,13 +18,17 @@ package org.apache.shenyu.springboot.starter.client.springcloud; import org.apache.shenyu.client.auto.config.ClientRegisterConfiguration; +import org.apache.shenyu.client.core.register.ClientRegisterConfig; +import org.apache.shenyu.client.core.register.ClientRegisterConfigImpl; import org.apache.shenyu.client.springcloud.init.SpringCloudClientEventListener; +import org.apache.shenyu.common.enums.RpcTypeEnum; import org.apache.shenyu.common.utils.VersionUtils; import org.apache.shenyu.register.client.api.ShenyuClientRegisterRepository; import org.apache.shenyu.register.common.config.ShenyuClientConfig; import org.apache.shenyu.springboot.starter.client.common.config.ShenyuClientCommonBeanConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; @@ -57,4 +61,19 @@ public SpringCloudClientEventListener springCloudClientEventListener(final Sheny final Environment env) { return new SpringCloudClientEventListener(clientConfig, shenyuClientRegisterRepository, env); } + + /** + * ClientRegisterConfig Bean. + * + * @param shenyuClientConfig shenyuClientConfig + * @param applicationContext applicationContext + * @param env env + * @return clientRegisterConfig + */ + @Bean + public ClientRegisterConfig clientRegisterConfig(final ShenyuClientConfig shenyuClientConfig, + final ApplicationContext applicationContext, + final Environment env) { + return new ClientRegisterConfigImpl(shenyuClientConfig, RpcTypeEnum.SPRING_CLOUD, applicationContext, env); + } } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientInfoRegisterConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientInfoRegisterConfiguration.java index cd2138cc9e55..1fde51336e22 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientInfoRegisterConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudClientInfoRegisterConfiguration.java @@ -20,7 +20,6 @@ import org.apache.shenyu.client.auto.config.ClientRegisterConfiguration; import org.apache.shenyu.client.core.disruptor.ShenyuClientRegisterEventPublisher; import org.apache.shenyu.client.core.register.ClientRegisterConfig; -import org.apache.shenyu.client.core.register.ClientRegisterConfigImpl; import org.apache.shenyu.client.core.register.matcher.ExtractorProcessor; import org.apache.shenyu.client.core.register.registrar.AbstractApiDocRegistrar; import org.apache.shenyu.client.core.register.registrar.AbstractApiMetaRegistrar; @@ -28,15 +27,11 @@ import org.apache.shenyu.client.springcloud.proceeor.register.ShenyuSpringCloudClientProcessorImpl; import org.apache.shenyu.client.springcloud.register.SpringCloudApiBeansExtractor; import org.apache.shenyu.client.springcloud.register.SpringCloudApiMetaRegister; -import org.apache.shenyu.common.enums.RpcTypeEnum; -import org.apache.shenyu.register.common.config.ShenyuClientConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; import java.util.List; @@ -101,19 +96,4 @@ public AbstractApiDocRegistrar buildApiDocRegistrar(final ShenyuClientRegisterEv final ClientRegisterConfig clientRegisterConfig) { return new HttpApiDocRegistrar(publisher, clientRegisterConfig); } - - /** - * ClientRegisterConfig Bean. - * - * @param shenyuClientConfig shenyuClientConfig - * @param applicationContext applicationContext - * @param env env - * @return clientRegisterConfig - */ - @Bean - public ClientRegisterConfig clientRegisterConfig(final ShenyuClientConfig shenyuClientConfig, - final ApplicationContext applicationContext, - final Environment env) { - return new ClientRegisterConfigImpl(shenyuClientConfig, RpcTypeEnum.SPRING_CLOUD, applicationContext, env); - } } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java new file mode 100644 index 000000000000..16d50803c88c --- /dev/null +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/java/org/apache/shenyu/springboot/starter/client/springcloud/ShenyuSpringCloudDiscoveryConfiguration.java @@ -0,0 +1,57 @@ +/* + * 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 + * + * http://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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.shenyu.springboot.starter.client.springcloud; + +import org.apache.shenyu.client.core.register.ClientDiscoveryConfigRefreshedEventListener; +import org.apache.shenyu.client.core.register.ClientRegisterConfig; +import org.apache.shenyu.common.enums.PluginEnum; +import org.apache.shenyu.register.client.http.HttpClientRegisterRepository; +import org.apache.shenyu.register.common.config.ShenyuClientConfig; +import org.apache.shenyu.register.common.config.ShenyuDiscoveryConfig; +import org.apache.shenyu.springboot.starter.client.common.config.ShenyuClientCommonBeanConfiguration; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnBean(ClientRegisterConfig.class) +@ImportAutoConfiguration(ShenyuClientCommonBeanConfiguration.class) +public class ShenyuSpringCloudDiscoveryConfiguration { + + /** + * clientDiscoveryConfigRefreshedEventListener Bean. + * + * @param shenyuDiscoveryConfig shenyuDiscoveryConfig + * @param httpClientRegisterRepository httpClientRegisterRepository + * @param clientRegisterConfig clientRegisterConfig + * @param shenyuClientConfig shenyuClientConfig + * @return ClientDiscoveryConfigRefreshedEventListener + */ + @Bean("SpringMvcClientDiscoveryConfigRefreshedEventListener") + @ConditionalOnProperty(prefix = "shenyu.discovery", name = "serverList", matchIfMissing = false) + @ConditionalOnBean(ShenyuDiscoveryConfig.class) + public ClientDiscoveryConfigRefreshedEventListener clientDiscoveryConfigRefreshedEventListener(final ShenyuDiscoveryConfig shenyuDiscoveryConfig, + final HttpClientRegisterRepository httpClientRegisterRepository, + final ClientRegisterConfig clientRegisterConfig, + final ShenyuClientConfig shenyuClientConfig) { + return new ClientDiscoveryConfigRefreshedEventListener(shenyuDiscoveryConfig, httpClientRegisterRepository, clientRegisterConfig, PluginEnum.SPRING_CLOUD, shenyuClientConfig); + } + +} diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring.factories b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring.factories index 6ad9beecb67e..a04f5b8ed060 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring.factories +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring.factories @@ -17,4 +17,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientConfiguration,\ -org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientInfoRegisterConfiguration +org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientInfoRegisterConfiguration,\ +org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudDiscoveryConfiguration diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5f2964dbc9b4..d19bde3cfe73 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springcloud/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -17,4 +17,5 @@ org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientConfiguration -org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientInfoRegisterConfiguration \ No newline at end of file +org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudClientInfoRegisterConfiguration +org.apache.shenyu.springboot.starter.client.springcloud.ShenyuSpringCloudDiscoveryConfiguration \ No newline at end of file diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java index 2679ffe2ab4b..f43e0d1086de 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-springmvc/src/main/java/org/apache/shenyu/springboot/starter/client/springmvc/ShenyuSpringMvcDiscoveryConfiguration.java @@ -86,8 +86,9 @@ public InstanceRegisterListener instanceRegisterListener(final ClientRegisterCon discoveryUpstreamData.setWeight(50); discoveryUpstreamData.setProtocol(Optional.ofNullable(shenyuDiscoveryConfig.getProtocol()).orElse(ShenyuClientConstants.HTTP)); discoveryUpstreamData.setNamespaceId(shenyuClientConfig.getNamespace()); - if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name"))) { - shenyuDiscoveryConfig.getProps().put("name", environment.getProperty("spring.application.name")); + final String appName = environment.getProperty("spring.application.name"); + if (StringUtils.isEmpty(shenyuDiscoveryConfig.getProps().getProperty("name")) && appName != null) { + shenyuDiscoveryConfig.getProps().put("name", appName); } return new InstanceRegisterListener(discoveryUpstreamData, shenyuDiscoveryConfig); } diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/main/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/main/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfiguration.java index ef7b5e26e394..e5ce204f4c23 100644 --- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/main/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfiguration.java +++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-springcloud/src/main/java/org/apache/shenyu/springboot/starter/plugin/springcloud/SpringCloudPluginConfiguration.java @@ -24,9 +24,9 @@ import org.apache.shenyu.plugin.springcloud.SpringCloudPlugin; import org.apache.shenyu.plugin.springcloud.context.SpringCloudShenyuContextDecorator; import org.apache.shenyu.plugin.springcloud.handler.SpringCloudPluginDataHandler; +import org.apache.shenyu.plugin.springcloud.handler.SpringCloudUpstreamDataHandler; import org.apache.shenyu.plugin.springcloud.listener.SpringCloudHeartBeatListener; import org.apache.shenyu.plugin.springcloud.loadbalance.ShenyuSpringCloudServiceChooser; -import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,12 +52,11 @@ public ShenyuSpringCloudServiceChooser shenyuSpringCloudLoadBalancerClient() { /** * init springCloud plugin. * - * @param serviceChooser service chooser * @return {@linkplain SpringCloudPlugin} */ @Bean - public ShenyuPlugin springCloudPlugin(final ObjectProvider serviceChooser) { - return new SpringCloudPlugin(serviceChooser.getIfAvailable()); + public ShenyuPlugin springCloudPlugin() { + return new SpringCloudPlugin(); } /** @@ -81,6 +80,16 @@ public ShenyuContextDecorator springCloudShenyuContextDecorator() { public PluginDataHandler springCloudPluginDataHandler(final ShenyuConfig shenyuConfig, final Environment env) { return new SpringCloudPluginDataHandler(shenyuConfig.getSpringCloudCache(), env); } + + /** + * Spring cloud upstream data handler. + * + * @return the discovery upstream data handler + */ + @Bean + public SpringCloudUpstreamDataHandler divideUpstreamDataHandler() { + return new SpringCloudUpstreamDataHandler(); + } /** * Spring cloud heart beat listener. From d17c16afbbb97331cdef52bf4680b99d142dfae3 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 11:23:38 +0800 Subject: [PATCH 16/65] [type:refactor] refactor discovery plugin. --- .../shenyu/admin/discovery/AbstractDiscoveryProcessor.java | 2 +- .../discovery/DiscoveryDataChangedEventSyncListener.java | 2 +- .../org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java | 7 ------- .../src/main/resources/mappers/discovery-rel-sqlmap.xml | 7 ------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java index 25b3bc56dd72..41d7f4b23492 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java @@ -239,7 +239,7 @@ public DataChangedEventListener getDiscoveryDataChangedEventListener(final Disco * @param discoveryHandlerDTO discoveryHandlerDTO * @param proxySelectorDTO proxySelectorDTO */ - public void addDiscoverySyncDataListener(DiscoveryHandlerDTO discoveryHandlerDTO, ProxySelectorDTO proxySelectorDTO) { + public void addDiscoverySyncDataListener(final DiscoveryHandlerDTO discoveryHandlerDTO, final ProxySelectorDTO proxySelectorDTO) { final DataChangedEventListener changedEventListener = this.getChangedEventListener(discoveryHandlerDTO.getDiscoveryId()); if (changedEventListener != null) { DiscoverySyncData discoverySyncData = new DiscoverySyncData(); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java index 2fb4484be64d..a1c8b2f5c5ca 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java @@ -164,7 +164,7 @@ private DiscoverySyncData buildProxySelectorData(final DiscoverySyncData discove } @Override - public void addListener(DiscoverySyncData discoverySyncData) { + public void addListener(final DiscoverySyncData discoverySyncData) { if (discoverySyncDataList.stream().noneMatch(data -> data.getSelectorId().equals(discoverySyncData.getSelectorId()) && data.getDiscoveryHandlerId().equals(discoverySyncData.getDiscoveryHandlerId()))) { discoverySyncDataList.add(discoverySyncData); diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java index 33cfc3a8981c..51d82795188f 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryRelMapper.java @@ -108,11 +108,4 @@ public interface DiscoveryRelMapper { */ int deleteByDiscoveryHandlerId(@Param("discoveryHandlerId") String discoveryHandlerId); - /** - * selectByDiscoveryHandlerIdList. - * - * @return List DiscoveryRelDO - */ - List selectByDiscoveryHandlerIdList(@Param("discoveryHandlerId") String discoveryHandlerId); - } diff --git a/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml index f76657d515da..e536e8d1cc54 100644 --- a/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml +++ b/shenyu-admin/src/main/resources/mappers/discovery-rel-sqlmap.xml @@ -64,13 +64,6 @@ from discovery_rel where discovery_handler_id = #{discoveryHandlerId} - - INSERT INTO discovery_rel (id, From d235832101a0956a04199c8696b7079a8c3b59fe Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 11:37:59 +0800 Subject: [PATCH 17/65] [type:refactor] refactor discovery plugin. --- .../discovery/DiscoveryDataChangedEventSyncListenerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java index cf10fe45c00b..671aa73c8b08 100644 --- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java +++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListenerTest.java @@ -66,7 +66,7 @@ public class DiscoveryDataChangedEventSyncListenerTest { @BeforeEach public void setUp() { String discoveryHandlerId = "discoveryHandlerId"; - discoveryDataChangedEventSyncListener = new DiscoveryDataChangedEventSyncListener(eventPublisher, discoveryUpstreamMapper, keyValueParser, discoveryHandlerId, contextInfo); + discoveryDataChangedEventSyncListener = new DiscoveryDataChangedEventSyncListener(eventPublisher, discoveryUpstreamMapper, keyValueParser, contextInfo, discoveryHandlerId); } @Test @@ -76,10 +76,12 @@ public void testOnChange() { discoveryUpstreamData.setProtocol("http"); discoveryUpstreamData.setUrl("1111"); discoveryUpstreamData.setNamespaceId(SYS_DEFAULT_NAMESPACE_ID); + discoveryUpstreamData.setDiscoveryHandlerId("discoveryHandlerId"); discoveryUpstreamDTOS.add(discoveryUpstreamData); doNothing().when(eventPublisher).publishEvent(any(DataChangedEvent.class)); when(keyValueParser.parseValue(anyString())).thenReturn(discoveryUpstreamDTOS); when(contextInfo.getNamespaceId()).thenReturn(SYS_DEFAULT_NAMESPACE_ID); + when(contextInfo.getDiscoveryHandlerId()).thenReturn("discoveryHandlerId"); DiscoveryDataChangedEvent event = new DiscoveryDataChangedEvent("key", "value", DiscoveryDataChangedEvent.Event.ADDED); discoveryDataChangedEventSyncListener.onChange(event); verify(discoveryUpstreamMapper).insert(any(DiscoveryUpstreamDO.class)); From a010052c9ed5509478c5b064eda4683f52f2ff3e Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 14:02:46 +0800 Subject: [PATCH 18/65] [type:refactor] refactor discovery plugin. --- .../apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java index 9ead49950e1c..729fa210e40b 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java @@ -125,7 +125,7 @@ public void doExecute() { exchange.getAttributes().put(Constants.CONTEXT, shenyuContext); springCloudPlugin.doExecute(exchange, chain, selectorData, rule); - StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, rule)).expectSubscription().verifyComplete(); +// StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, rule)).expectSubscription().verifyComplete(); MultiValueMap valueMap = new LinkedMultiValueMap<>(1); ServerWebExchange exchangeSelector = MockServerWebExchange.from( From 120ca849c48ef3a910713b4849de8a69eb264ddb Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 14:31:53 +0800 Subject: [PATCH 19/65] [type:refactor] refactor discovery plugin. --- .../shenyu/plugin/springcloud/SpringCloudPluginTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java index 729fa210e40b..bd9cf870d147 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java @@ -125,15 +125,14 @@ public void doExecute() { exchange.getAttributes().put(Constants.CONTEXT, shenyuContext); springCloudPlugin.doExecute(exchange, chain, selectorData, rule); -// StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, rule)).expectSubscription().verifyComplete(); + StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, rule)).expectSubscription().verifyComplete(); MultiValueMap valueMap = new LinkedMultiValueMap<>(1); ServerWebExchange exchangeSelector = MockServerWebExchange.from( MockServerHttpRequest.get("http://localhost/springcloud").queryParams(valueMap).remoteAddress(new InetSocketAddress(8090)).build()); shenyuContext = mock(ShenyuContext.class); exchangeSelector.getAttributes().put(Constants.CONTEXT, shenyuContext); - Mono complete = springCloudPlugin.doExecute(exchangeSelector, chain, selector, rule); - StepVerifier.create(complete).expectSubscription().verifyComplete(); + springCloudPlugin.doExecute(exchangeSelector, chain, selector, rule); } @Test From bffe4952bfebbb2c0a7352ae7d6b61e8b6906861 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 14:46:00 +0800 Subject: [PATCH 20/65] [type:refactor] refactor discovery plugin. --- .../apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java index bd9cf870d147..3bcc5651b594 100644 --- a/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java +++ b/shenyu-plugin/shenyu-plugin-proxy/shenyu-plugin-springcloud/src/test/java/org/apache/shenyu/plugin/springcloud/SpringCloudPluginTest.java @@ -125,7 +125,6 @@ public void doExecute() { exchange.getAttributes().put(Constants.CONTEXT, shenyuContext); springCloudPlugin.doExecute(exchange, chain, selectorData, rule); - StepVerifier.create(springCloudPlugin.doExecute(exchange, chain, selectorData, rule)).expectSubscription().verifyComplete(); MultiValueMap valueMap = new LinkedMultiValueMap<>(1); ServerWebExchange exchangeSelector = MockServerWebExchange.from( From 54f7365c9c7883956329b65bc59a0f2fbc0251de Mon Sep 17 00:00:00 2001 From: yunlongn Date: Mon, 28 Oct 2024 14:55:19 +0800 Subject: [PATCH 21/65] [type:refactor] refactor discovery plugin. --- .../src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml b/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml index 222059da7191..467d21addc8a 100644 --- a/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml +++ b/shenyu-examples/shenyu-examples-springcloud/src/main/resources/application.yml @@ -60,7 +60,7 @@ shenyu: client: springCloud: props: - contextPath: /springcloud6 + contextPath: /springcloud addPrefixed: false # port: 8884 From 64e45c84e351782826a487ab052f3e0f03141467 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Tue, 29 Oct 2024 14:03:54 +0800 Subject: [PATCH 22/65] [type:refactor] refactor discovery plugin. --- .../shenyu/admin/mapper/DiscoveryMapper.java | 18 ++++++++++++--- .../service/impl/DiscoveryServiceImpl.java | 4 ++-- .../resources/mappers/discovery-sqlmap.xml | 8 +++++++ shenyu-bootstrap/pom.xml | 22 +++++++++---------- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryMapper.java index a4100af1b360..218bda0a1fb3 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryMapper.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryMapper.java @@ -66,13 +66,25 @@ public interface DiscoveryMapper extends ExistProvider { /** * select discovery by plugin name and level. * - * @param pluginName plugin name - * @param level level - * @param namespaceId namespaceId + * @param pluginName plugin name + * @param level level + * @param namespaceId namespaceId * @return {@linkplain DiscoveryDO} */ DiscoveryDO selectByPluginNameAndLevelAndNamespaceId(@Param("pluginName") String pluginName, @Param("level") String level, @Param("namespaceId") String namespaceId); + /** + * select discovery by plugin name and level. + * + * @param pluginName plugin name + * @param level level + * @param namespaceId namespaceId + * @param discoveryType discoveryType + * @return {@linkplain DiscoveryDO} + */ + DiscoveryDO selectByPluginNameAndLevelAndNamespaceIdAndType(@Param("pluginName") String pluginName, @Param("level") String level, @Param("namespaceId") String namespaceId, + @Param("discoveryType") String discoveryType); + /** * insert discovery. * diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java index 7983c94ceecf..6360292cb907 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java @@ -145,8 +145,8 @@ private void bindingDiscovery(final DiscoveryConfigRegisterDTO discoveryConfigRe proxySelectorDTO.setId(selectorDO.getId()); proxySelectorDTO.setPluginName(discoveryConfigRegisterDTO.getPluginName()); proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId()); - DiscoveryDO discoveryDO = discoveryMapper.selectByPluginNameAndLevelAndNamespaceId(discoveryConfigRegisterDTO.getPluginName(), - DiscoveryLevel.PLUGIN.getCode(), discoveryConfigRegisterDTO.getNamespaceId()); + DiscoveryDO discoveryDO = discoveryMapper.selectByPluginNameAndLevelAndNamespaceIdAndType(discoveryConfigRegisterDTO.getPluginName(), + DiscoveryLevel.PLUGIN.getCode(), discoveryConfigRegisterDTO.getNamespaceId(), discoveryConfigRegisterDTO.getDiscoveryType()); if (discoveryDO == null) { Timestamp currentTime = new Timestamp(System.currentTimeMillis()); discoveryDO = DiscoveryDO.builder() diff --git a/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml index e48107fa177c..734a72724c80 100644 --- a/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml +++ b/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml @@ -64,6 +64,14 @@ WHERE plugin_name = #{pluginName, jdbcType=VARCHAR} AND level = #{level, jdbcType=VARCHAR} AND namespace_id = #{namespaceId, jdbcType=VARCHAR} + +