From 44dd4251452aab04bc0a22006677be256b3fdb75 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 31 Oct 2018 09:38:40 +0800 Subject: [PATCH 1/5] [SCB-986] Cache instances result in CseDiscoveryClient --- .../spring-boot-starter-discovery/pom.xml | 4 ++ .../starter/discovery/CseDiscoveryClient.java | 58 +++++++++++++++---- .../discovery/TestCseDiscoveryClient.java | 22 +++---- .../spring-boot2-starter-discovery/pom.xml | 4 ++ .../starter/discovery/CseDiscoveryClient.java | 58 +++++++++++++++---- 5 files changed, 113 insertions(+), 33 deletions(-) diff --git a/spring-boot-starter/spring-boot-starter-discovery/pom.xml b/spring-boot-starter/spring-boot-starter-discovery/pom.xml index b8d6b2c300..1ea2842da9 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/pom.xml +++ b/spring-boot-starter/spring-boot-starter-discovery/pom.xml @@ -75,5 +75,9 @@ org.apache.servicecomb service-registry + + org.apache.servicecomb + java-chassis-core + diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java index ef4857511c..4291a2daa2 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; +import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.cache.VersionedCache; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; @@ -29,12 +30,18 @@ import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { + private static final Logger LOGGER = LoggerFactory.getLogger(CseDiscoveryClient.class); + private Map discoveryTrees = new ConcurrentHashMapEx<>(); @Override @@ -44,24 +51,55 @@ public String description() { @Override public List getInstances(final String serviceId) { + class InstanceDiscoveryFilter implements DiscoveryFilter { + @Override + public int getOrder() { + return Short.MAX_VALUE; + } + + @Override + public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { + return parent.children() + .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); + } + + @SuppressWarnings("unchecked") + protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, + DiscoveryTreeNode parent) { + String serviceName = context.getInputParameters(); + List instances = new ArrayList<>(); + for (MicroserviceInstance instance : ((Map) parent.data()).values()) { + for (String endpoint : instance.getEndpoints()) { + String scheme = endpoint.split(":", 2)[0]; + if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); + continue; + } + URIEndpointObject uri = new URIEndpointObject(endpoint); + instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); + } + } + return new DiscoveryTreeNode() + .subName(parent, serviceName) + .data(instances); + } + }; + DiscoveryContext context = new DiscoveryContext(); context.setInputParameters(serviceId); + DiscoveryTree discoveryTree = discoveryTrees.computeIfAbsent(serviceId, key -> { - return new DiscoveryTree(); + DiscoveryTree tree = new DiscoveryTree(); + tree.addFilter(new InstanceDiscoveryFilter()); + return tree; }); + VersionedCache serversVersionedCache = discoveryTree.discovery(context, RegistryUtils.getAppId(), serviceId, DefinitionConst.VERSION_RULE_ALL); - Map servers = serversVersionedCache.data(); - List instances = new ArrayList<>(servers.size()); - for (MicroserviceInstance s : servers.values()) { - for (String endpoint : s.getEndpoints()) { - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } - return instances; + + return serversVersionedCache.data(); } @Override diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java b/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java index 727b306f70..9ed79462cd 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java +++ b/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java @@ -24,9 +24,8 @@ import org.apache.servicecomb.serviceregistry.RegistryUtils; import org.apache.servicecomb.serviceregistry.api.registry.Microservice; import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; +import org.apache.servicecomb.serviceregistry.cache.InstanceCacheManager; import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; import org.junit.Assert; import org.junit.Test; @@ -39,9 +38,8 @@ public class TestCseDiscoveryClient { @Test public void testCseDiscoveryClient(@Mocked RegistryUtils registryUtils, - @Injectable ServiceRegistryClient serviceRegistryClient, - @Mocked DiscoveryTree discoveryTree, - @Injectable DiscoveryTreeNode versionedCache) { + @Injectable InstanceCacheManager instanceCacheManager, + @Injectable ServiceRegistryClient serviceRegistryClient) { List microserviceList = new ArrayList<>(); Microservice service1 = new Microservice(); service1.setServiceName("service1"); @@ -50,7 +48,7 @@ public void testCseDiscoveryClient(@Mocked RegistryUtils registryUtils, microserviceList.add(server2); server2.setServiceName("server2"); - Map servers = new HashMap<>(); + List endpoints = new ArrayList<>(); endpoints.add("rest://localhost:3333"); endpoints.add("rest://localhost:4444"); @@ -58,18 +56,16 @@ public void testCseDiscoveryClient(@Mocked RegistryUtils registryUtils, instance1.setServiceId("service1"); instance1.setInstanceId("service1-instance1"); instance1.setEndpoints(endpoints); - servers.put("service1-instance1", instance1); + Map data = new HashMap<>(); + data.put("service1-instance1", instance1); + DiscoveryTreeNode parent = new DiscoveryTreeNode().name("parent").data(data); new Expectations() { { - RegistryUtils.getServiceRegistryClient(); - result = serviceRegistryClient; + instanceCacheManager.getOrCreateVersionedCache(anyString, anyString, anyString); + result = parent; serviceRegistryClient.getAllMicroservices(); result = microserviceList; - discoveryTree.discovery((DiscoveryContext) any, anyString, anyString, anyString); - result = versionedCache; - versionedCache.data(); - result = servers; } }; diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml b/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml index 3106b1670b..bf8c58f920 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml @@ -90,6 +90,10 @@ org.apache.servicecomb service-registry + + org.apache.servicecomb + java-chassis-core + org.apache.servicecomb spring-boot2-starter diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java index ad605af266..306cfc0a2d 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; +import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.cache.VersionedCache; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; @@ -29,12 +30,18 @@ import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { + private static final Logger LOGGER = LoggerFactory.getLogger(CseDiscoveryClient.class); + private Map discoveryTrees = new ConcurrentHashMapEx<>(); @Override @@ -44,24 +51,55 @@ public String description() { @Override public List getInstances(final String serviceId) { + class InstanceDiscoveryFilter implements DiscoveryFilter { + @Override + public int getOrder() { + return Short.MAX_VALUE; + } + + @Override + public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { + return parent.children() + .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); + } + + @SuppressWarnings("unchecked") + protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, + DiscoveryTreeNode parent) { + String serviceName = context.getInputParameters(); + List instances = new ArrayList<>(); + for (MicroserviceInstance instance : ((Map) parent.data()).values()) { + for (String endpoint : instance.getEndpoints()) { + String scheme = endpoint.split(":", 2)[0]; + if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); + continue; + } + URIEndpointObject uri = new URIEndpointObject(endpoint); + instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); + } + } + return new DiscoveryTreeNode() + .subName(parent, serviceName) + .data(instances); + } + }; + DiscoveryContext context = new DiscoveryContext(); context.setInputParameters(serviceId); + DiscoveryTree discoveryTree = discoveryTrees.computeIfAbsent(serviceId, key -> { - return new DiscoveryTree(); + DiscoveryTree tree = new DiscoveryTree(); + tree.addFilter(new InstanceDiscoveryFilter()); + return tree; }); + VersionedCache serversVersionedCache = discoveryTree.discovery(context, RegistryUtils.getAppId(), serviceId, DefinitionConst.VERSION_RULE_ALL); - Map servers = serversVersionedCache.data(); - List instances = new ArrayList<>(servers.size()); - for (MicroserviceInstance s : servers.values()) { - for (String endpoint : s.getEndpoints()) { - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } - return instances; + + return serversVersionedCache.data(); } @Override From 0d4159c4ad0e77329683eeac16c7991ea3c27982 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Wed, 14 Nov 2018 10:19:58 +0800 Subject: [PATCH 2/5] [SCB-986] Make InstanceDiscoveryFilter standalone --- .../starter/discovery/CseDiscoveryClient.java | 43 --------------- .../discovery/InstanceDiscoveryFilter.java | 54 +++++++++++++++++++ .../starter/discovery/CseDiscoveryClient.java | 47 ++-------------- .../discovery/InstanceDiscoveryFilter.java | 54 +++++++++++++++++++ 4 files changed, 113 insertions(+), 85 deletions(-) create mode 100644 spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java create mode 100644 spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java index 4291a2daa2..e774e30f08 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java @@ -20,27 +20,18 @@ import java.util.List; import java.util.Map; -import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.cache.VersionedCache; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; -import org.apache.servicecomb.foundation.common.net.URIEndpointObject; import org.apache.servicecomb.serviceregistry.RegistryUtils; import org.apache.servicecomb.serviceregistry.api.registry.Microservice; -import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { - private static final Logger LOGGER = LoggerFactory.getLogger(CseDiscoveryClient.class); private Map discoveryTrees = new ConcurrentHashMapEx<>(); @@ -51,39 +42,6 @@ public String description() { @Override public List getInstances(final String serviceId) { - class InstanceDiscoveryFilter implements DiscoveryFilter { - @Override - public int getOrder() { - return Short.MAX_VALUE; - } - - @Override - public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { - return parent.children() - .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); - } - - @SuppressWarnings("unchecked") - protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, - DiscoveryTreeNode parent) { - String serviceName = context.getInputParameters(); - List instances = new ArrayList<>(); - for (MicroserviceInstance instance : ((Map) parent.data()).values()) { - for (String endpoint : instance.getEndpoints()) { - String scheme = endpoint.split(":", 2)[0]; - if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { - LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); - continue; - } - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } - return new DiscoveryTreeNode() - .subName(parent, serviceName) - .data(instances); - } - }; DiscoveryContext context = new DiscoveryContext(); context.setInputParameters(serviceId); @@ -102,7 +60,6 @@ protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, return serversVersionedCache.data(); } - @Override @Deprecated public ServiceInstance getLocalServiceInstance() { return null; diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java new file mode 100644 index 0000000000..4ed82d63b1 --- /dev/null +++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java @@ -0,0 +1,54 @@ +package org.apache.servicecomb.springboot.starter.discovery; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.servicecomb.core.Const; +import org.apache.servicecomb.foundation.common.net.URIEndpointObject; +import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.ServiceInstance; + +class InstanceDiscoveryFilter implements DiscoveryFilter { + + private static final Logger LOGGER = LoggerFactory.getLogger(InstanceDiscoveryFilter.class); + + @Override + public int getOrder() { + return Short.MAX_VALUE; + } + + @Override + public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { + return parent.children() + .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); + } + + @SuppressWarnings("unchecked") + protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, + DiscoveryTreeNode parent) { + String serviceName = context.getInputParameters(); + List instances = new ArrayList<>(); + for (MicroserviceInstance instance : ((Map) parent.data()).values()) { + for (String endpoint : instance.getEndpoints()) { + String scheme = endpoint.split(":", 2)[0]; + if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); + continue; + } + URIEndpointObject uri = new URIEndpointObject(endpoint); + instances.add(new DefaultServiceInstance(serviceName, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); + } + } + + return new DiscoveryTreeNode() + .subName(parent, serviceName) + .data(instances); + } +}; \ No newline at end of file diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java index 306cfc0a2d..1cb2d3b8a0 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java @@ -20,27 +20,18 @@ import java.util.List; import java.util.Map; -import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.cache.VersionedCache; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; -import org.apache.servicecomb.foundation.common.net.URIEndpointObject; import org.apache.servicecomb.serviceregistry.RegistryUtils; import org.apache.servicecomb.serviceregistry.api.registry.Microservice; -import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { - private static final Logger LOGGER = LoggerFactory.getLogger(CseDiscoveryClient.class); private Map discoveryTrees = new ConcurrentHashMapEx<>(); @@ -51,39 +42,6 @@ public String description() { @Override public List getInstances(final String serviceId) { - class InstanceDiscoveryFilter implements DiscoveryFilter { - @Override - public int getOrder() { - return Short.MAX_VALUE; - } - - @Override - public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { - return parent.children() - .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); - } - - @SuppressWarnings("unchecked") - protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, - DiscoveryTreeNode parent) { - String serviceName = context.getInputParameters(); - List instances = new ArrayList<>(); - for (MicroserviceInstance instance : ((Map) parent.data()).values()) { - for (String endpoint : instance.getEndpoints()) { - String scheme = endpoint.split(":", 2)[0]; - if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { - LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); - continue; - } - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceId, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } - return new DiscoveryTreeNode() - .subName(parent, serviceName) - .data(instances); - } - }; DiscoveryContext context = new DiscoveryContext(); context.setInputParameters(serviceId); @@ -102,6 +60,11 @@ protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, return serversVersionedCache.data(); } + @Deprecated + public ServiceInstance getLocalServiceInstance() { + return null; + } + @Override public List getServices() { ServiceRegistryClient client = RegistryUtils.getServiceRegistryClient(); diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java new file mode 100644 index 0000000000..a2c7828c9d --- /dev/null +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java @@ -0,0 +1,54 @@ +package org.apache.servicecomb.springboot2.starter.discovery; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.servicecomb.core.Const; +import org.apache.servicecomb.foundation.common.net.URIEndpointObject; +import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.ServiceInstance; + +class InstanceDiscoveryFilter implements DiscoveryFilter { + + private static final Logger LOGGER = LoggerFactory.getLogger(InstanceDiscoveryFilter.class); + + @Override + public int getOrder() { + return Short.MAX_VALUE; + } + + @Override + public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { + return parent.children() + .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); + } + + @SuppressWarnings("unchecked") + protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, + DiscoveryTreeNode parent) { + String serviceName = context.getInputParameters(); + List instances = new ArrayList<>(); + for (MicroserviceInstance instance : ((Map) parent.data()).values()) { + for (String endpoint : instance.getEndpoints()) { + String scheme = endpoint.split(":", 2)[0]; + if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); + continue; + } + URIEndpointObject uri = new URIEndpointObject(endpoint); + instances.add(new DefaultServiceInstance(serviceName, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); + } + } + + return new DiscoveryTreeNode() + .subName(parent, serviceName) + .data(instances); + } +}; \ No newline at end of file From c749e11216c219079bb2cbc866d6e717cc32a102 Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Thu, 15 Nov 2018 11:41:30 +0800 Subject: [PATCH 3/5] [SCB-986] Move shared code of service discovery to spring-boot-common --- java-chassis-dependencies/pom.xml | 5 ++ pom.xml | 1 + spring-boot-common/pom.xml | 37 ++++++++++ .../AbstractInstanceDiscoveryFilter.java | 71 +++++++++++++++++++ .../common/DiscoveryClientUtil.java | 71 +++++++++++++++++++ .../spring-boot-starter-discovery/pom.xml | 4 ++ .../starter/discovery/CseDiscoveryClient.java | 42 ++--------- .../discovery/InstanceDiscoveryFilter.java | 52 ++------------ .../spring-boot2-starter-discovery/pom.xml | 4 ++ .../starter/discovery/CseDiscoveryClient.java | 44 ++---------- .../discovery/InstanceDiscoveryFilter.java | 51 ++----------- 11 files changed, 214 insertions(+), 168 deletions(-) create mode 100644 spring-boot-common/pom.xml create mode 100644 spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java create mode 100644 spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml index 6ab39942ce..50a0778dbb 100644 --- a/java-chassis-dependencies/pom.xml +++ b/java-chassis-dependencies/pom.xml @@ -1040,6 +1040,11 @@ metrics-prometheus 1.1.0-SNAPSHOT + + org.apache.servicecomb + spring-boot-common + 1.1.0-SNAPSHOT + com.google.protobuf protobuf-java diff --git a/pom.xml b/pom.xml index dbfd9c30dd..55336f8e18 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,7 @@ archetypes java-chassis-dependencies-springboot2 spring-boot2-starter-parent + spring-boot-common diff --git a/spring-boot-common/pom.xml b/spring-boot-common/pom.xml new file mode 100644 index 0000000000..2d870105f4 --- /dev/null +++ b/spring-boot-common/pom.xml @@ -0,0 +1,37 @@ + + + + java-chassis-dependencies + org.apache.servicecomb + 1.1.0-SNAPSHOT + + 4.0.0 + + spring-boot-common + + + org.apache.servicecomb + service-registry + + + org.apache.servicecomb + java-chassis-core + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java b/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java new file mode 100644 index 0000000000..be8503e50b --- /dev/null +++ b/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java @@ -0,0 +1,71 @@ +/* + * 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.servicecomb.springboot.common; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.servicecomb.core.Const; +import org.apache.servicecomb.foundation.common.net.URIEndpointObject; +import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class AbstractInstanceDiscoveryFilter implements DiscoveryFilter { + + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractInstanceDiscoveryFilter.class); + + @Override + public int getOrder() { + return Short.MAX_VALUE; + } + + @Override + public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { + return parent.children() + .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); + } + + @SuppressWarnings("unchecked") + protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, + DiscoveryTreeNode parent) { + String serviceName = context.getInputParameters(); + + List instances = new ArrayList<>(); + for (MicroserviceInstance instance : ((Map) parent.data()).values()) { + for (String endpoint : instance.getEndpoints()) { + String scheme = endpoint.split(":", 2)[0]; + if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); + continue; + } + URIEndpointObject uri = new URIEndpointObject(endpoint); + instances.add(createInstance(serviceName, uri)); + } + } + + return new DiscoveryTreeNode() + .subName(parent, serviceName) + .data(instances); + } + + abstract protected Object createInstance(String name, URIEndpointObject uri); +}; \ No newline at end of file diff --git a/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java b/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java new file mode 100644 index 0000000000..4aa326610a --- /dev/null +++ b/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java @@ -0,0 +1,71 @@ +/* + * 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.servicecomb.springboot.common; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.servicecomb.foundation.common.cache.VersionedCache; +import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; +import org.apache.servicecomb.serviceregistry.RegistryUtils; +import org.apache.servicecomb.serviceregistry.api.registry.Microservice; +import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; +import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; +import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; + +public class DiscoveryClientUtil { + + private Map discoveryTrees = new ConcurrentHashMapEx<>(); + private DiscoveryFilter filter = null; + + public DiscoveryClientUtil(DiscoveryFilter filter){ + this.filter = filter; + } + + public List getInstances(final String serviceId) { + DiscoveryContext context = new DiscoveryContext(); + context.setInputParameters(serviceId); + + DiscoveryTree discoveryTree = discoveryTrees.computeIfAbsent(serviceId, key -> { + DiscoveryTree tree = new DiscoveryTree(); + tree.addFilter(filter); + return tree; + }); + + VersionedCache serversVersionedCache = discoveryTree.discovery(context, + RegistryUtils.getAppId(), + serviceId, + DefinitionConst.VERSION_RULE_ALL); + + return serversVersionedCache.data(); + } + + public List getServices() { + ServiceRegistryClient client = RegistryUtils.getServiceRegistryClient(); + List services = client.getAllMicroservices(); + List serviceIDList = new ArrayList<>(); + if (null != services && !services.isEmpty()) { + for (Microservice service : services) { + serviceIDList.add(service.getServiceName()); + } + } + return serviceIDList; + } +} diff --git a/spring-boot-starter/spring-boot-starter-discovery/pom.xml b/spring-boot-starter/spring-boot-starter-discovery/pom.xml index 1ea2842da9..7ccfe9cad4 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/pom.xml +++ b/spring-boot-starter/spring-boot-starter-discovery/pom.xml @@ -79,5 +79,9 @@ org.apache.servicecomb java-chassis-core + + org.apache.servicecomb + spring-boot-common + diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java index e774e30f08..b44cfd15c1 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java @@ -16,24 +16,15 @@ */ package org.apache.servicecomb.springboot.starter.discovery; -import java.util.ArrayList; import java.util.List; -import java.util.Map; -import org.apache.servicecomb.foundation.common.cache.VersionedCache; -import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; -import org.apache.servicecomb.serviceregistry.RegistryUtils; -import org.apache.servicecomb.serviceregistry.api.registry.Microservice; -import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; -import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; +import org.apache.servicecomb.springboot.common.DiscoveryClientUtil; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { - - private Map discoveryTrees = new ConcurrentHashMapEx<>(); + private DiscoveryClientUtil + discoveryClientUtil = new DiscoveryClientUtil<>(new InstanceDiscoveryFilter()); @Override public String description() { @@ -42,22 +33,7 @@ public String description() { @Override public List getInstances(final String serviceId) { - - DiscoveryContext context = new DiscoveryContext(); - context.setInputParameters(serviceId); - - DiscoveryTree discoveryTree = discoveryTrees.computeIfAbsent(serviceId, key -> { - DiscoveryTree tree = new DiscoveryTree(); - tree.addFilter(new InstanceDiscoveryFilter()); - return tree; - }); - - VersionedCache serversVersionedCache = discoveryTree.discovery(context, - RegistryUtils.getAppId(), - serviceId, - DefinitionConst.VERSION_RULE_ALL); - - return serversVersionedCache.data(); + return discoveryClientUtil.getInstances(serviceId); } @Deprecated @@ -67,14 +43,6 @@ public ServiceInstance getLocalServiceInstance() { @Override public List getServices() { - ServiceRegistryClient client = RegistryUtils.getServiceRegistryClient(); - List services = client.getAllMicroservices(); - List serviceIDList = new ArrayList<>(); - if (null != services && !services.isEmpty()) { - for (Microservice service : services) { - serviceIDList.add(service.getServiceName()); - } - } - return serviceIDList; + return discoveryClientUtil.getServices(); } } diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java index 4ed82d63b1..ed516df9a8 100644 --- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java +++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java @@ -1,54 +1,12 @@ package org.apache.servicecomb.springboot.starter.discovery; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; -import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.servicecomb.springboot.common.AbstractInstanceDiscoveryFilter; import org.springframework.cloud.client.DefaultServiceInstance; -import org.springframework.cloud.client.ServiceInstance; - -class InstanceDiscoveryFilter implements DiscoveryFilter { - - private static final Logger LOGGER = LoggerFactory.getLogger(InstanceDiscoveryFilter.class); +class InstanceDiscoveryFilter extends AbstractInstanceDiscoveryFilter { @Override - public int getOrder() { - return Short.MAX_VALUE; - } - - @Override - public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { - return parent.children() - .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); - } - - @SuppressWarnings("unchecked") - protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, - DiscoveryTreeNode parent) { - String serviceName = context.getInputParameters(); - List instances = new ArrayList<>(); - for (MicroserviceInstance instance : ((Map) parent.data()).values()) { - for (String endpoint : instance.getEndpoints()) { - String scheme = endpoint.split(":", 2)[0]; - if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { - LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); - continue; - } - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceName, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } - - return new DiscoveryTreeNode() - .subName(parent, serviceName) - .data(instances); + protected Object createInstance(String name, URIEndpointObject uri) { + return new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()); } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml b/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml index bf8c58f920..00d720de23 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml @@ -98,5 +98,9 @@ org.apache.servicecomb spring-boot2-starter + + org.apache.servicecomb + spring-boot-common + diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java index 1cb2d3b8a0..b574108583 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java @@ -16,48 +16,24 @@ */ package org.apache.servicecomb.springboot2.starter.discovery; -import java.util.ArrayList; import java.util.List; -import java.util.Map; -import org.apache.servicecomb.foundation.common.cache.VersionedCache; -import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; -import org.apache.servicecomb.serviceregistry.RegistryUtils; -import org.apache.servicecomb.serviceregistry.api.registry.Microservice; -import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient; -import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; +import org.apache.servicecomb.springboot.common.DiscoveryClientUtil; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; public class CseDiscoveryClient implements DiscoveryClient { - - private Map discoveryTrees = new ConcurrentHashMapEx<>(); + private DiscoveryClientUtil + discoveryClientUtil = new DiscoveryClientUtil<>(new InstanceDiscoveryFilter()); @Override public String description() { - return "Spring Cloud CSE Discovery Client"; + return "Spring Cloud 2 CSE Discovery Client"; } @Override public List getInstances(final String serviceId) { - - DiscoveryContext context = new DiscoveryContext(); - context.setInputParameters(serviceId); - - DiscoveryTree discoveryTree = discoveryTrees.computeIfAbsent(serviceId, key -> { - DiscoveryTree tree = new DiscoveryTree(); - tree.addFilter(new InstanceDiscoveryFilter()); - return tree; - }); - - VersionedCache serversVersionedCache = discoveryTree.discovery(context, - RegistryUtils.getAppId(), - serviceId, - DefinitionConst.VERSION_RULE_ALL); - - return serversVersionedCache.data(); + return discoveryClientUtil.getInstances(serviceId); } @Deprecated @@ -67,14 +43,6 @@ public ServiceInstance getLocalServiceInstance() { @Override public List getServices() { - ServiceRegistryClient client = RegistryUtils.getServiceRegistryClient(); - List services = client.getAllMicroservices(); - List serviceIDList = new ArrayList<>(); - if (null != services && !services.isEmpty()) { - for (Microservice service : services) { - serviceIDList.add(service.getServiceName()); - } - } - return serviceIDList; + return discoveryClientUtil.getServices(); } } diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java index a2c7828c9d..b9727682b7 100644 --- a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java +++ b/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java @@ -1,54 +1,13 @@ package org.apache.servicecomb.springboot2.starter.discovery; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; -import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; -import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.servicecomb.springboot.common.AbstractInstanceDiscoveryFilter; import org.springframework.cloud.client.DefaultServiceInstance; -import org.springframework.cloud.client.ServiceInstance; - -class InstanceDiscoveryFilter implements DiscoveryFilter { - - private static final Logger LOGGER = LoggerFactory.getLogger(InstanceDiscoveryFilter.class); - - @Override - public int getOrder() { - return Short.MAX_VALUE; - } +class InstanceDiscoveryFilter extends AbstractInstanceDiscoveryFilter { @Override - public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode parent) { - return parent.children() - .computeIfAbsent(context.getInputParameters(), etn -> createDiscoveryTreeNode(context, parent)); - } - - @SuppressWarnings("unchecked") - protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, - DiscoveryTreeNode parent) { - String serviceName = context.getInputParameters(); - List instances = new ArrayList<>(); - for (MicroserviceInstance instance : ((Map) parent.data()).values()) { - for (String endpoint : instance.getEndpoints()) { - String scheme = endpoint.split(":", 2)[0]; - if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { - LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); - continue; - } - URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(new DefaultServiceInstance(serviceName, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled())); - } - } + protected Object createInstance(String name, URIEndpointObject uri) { - return new DiscoveryTreeNode() - .subName(parent, serviceName) - .data(instances); + return new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()); } -}; \ No newline at end of file +} \ No newline at end of file From 0f7e052605eb1e83a3c2233de85126e4ff431d2b Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Fri, 16 Nov 2018 16:56:59 +0800 Subject: [PATCH 4/5] [SCB-986] Re-structure spring related projects --- java-chassis-spring-boot/pom.xml | 37 +++++++++++++++++++ .../spring-boot-common}/pom.xml | 20 +++++++++- .../AbstractInstanceDiscoveryFilter.java | 0 .../common/DiscoveryClientUtil.java | 0 .../spring-boot-starter}/pom.xml | 2 +- .../spring-boot-starter-configuration/pom.xml | 0 .../spring-boot-starter-discovery/pom.xml | 0 .../starter/discovery/CseDiscoveryClient.java | 0 .../CseDiscoveryClientConfiguration.java | 0 .../CseRibbonClientConfiguration.java | 0 .../discovery/CseRibbonConfiguration.java | 0 .../CseRibbonEndpointDiscoveryFilter.java | 0 .../discovery/InstanceDiscoveryFilter.java | 0 .../discovery/ServiceCombServerList.java | 0 .../starter/discovery/package-info.java | 0 .../main/resources/META-INF/spring.factories | 0 .../discovery/TestCseDiscoveryClient.java | 0 .../TestCseDiscoveryClientConfiguration.java | 0 .../TestCseRibbonClientConfiguration.java | 0 .../discovery/TestServiceCombServerList.java | 0 .../spring-boot-starter-provider/pom.xml | 0 .../src/main/resources/application.properties | 0 .../spring-boot-starter-registry/pom.xml | 0 .../starter/registry/RegistryIntializer.java | 0 .../ServiceCenterRegistryConfiguration.java | 0 .../main/resources/META-INF/spring.factories | 0 ...estServiceCenterRegistryConfiguration.java | 0 .../spring-boot-starter-servicecomb/pom.xml | 0 .../starter/provider/EnableServiceComb.java | 0 .../ServiceCombSpringConfiguration.java | 0 .../starter/provider/package-info.java | 0 .../spring-boot-starter-transport/pom.xml | 0 .../transport/RestServletInitializer.java | 0 .../starter/transport/package-info.java | 0 .../transport/TestRestServletInitializer.java | 0 .../spring-cloud-zuul-zipkin/pom.xml | 0 .../tracing/SpringTracingConfiguration.java | 0 .../zuul/tracing/TracePostZuulFilter.java | 0 .../zuul/tracing/TracePreZuulFilter.java | 0 .../SpringTracingConfigurationTest.java | 0 .../spring-cloud-zuul/pom.xml | 0 .../cloud/zuul/ContextHeaderZuulFilter.java | 0 .../spring-boot2-starter-parent}/pom.xml | 2 +- .../spring-boot2-starter-discovery/pom.xml | 0 .../starter/discovery/CseDiscoveryClient.java | 0 .../CseDiscoveryClientConfiguration.java | 0 .../CseRibbonClientConfiguration.java | 0 .../discovery/CseRibbonConfiguration.java | 0 .../CseRibbonEndpointDiscoveryFilter.java | 0 .../discovery/InstanceDiscoveryFilter.java | 0 .../discovery/ServiceCombServerList.java | 0 .../starter/discovery/package-info.java | 0 .../main/resources/META-INF/spring.factories | 0 .../spring-boot2-starter-servlet/pom.xml | 0 .../servlet/RestServletInitializer.java | 0 .../starter/servlet/package-info.java | 0 .../spring-boot2-starter-standalone/pom.xml | 0 .../spring-boot2-starter/pom.xml | 0 .../starter/EnableServiceComb.java | 0 .../ServiceCombSpringConfiguration.java | 0 pom.xml | 4 +- 61 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 java-chassis-spring-boot/pom.xml rename {spring-boot-common => java-chassis-spring-boot/spring-boot-common}/pom.xml (52%) rename {spring-boot-common => java-chassis-spring-boot/spring-boot-common}/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java (100%) rename {spring-boot-common => java-chassis-spring-boot/spring-boot-common}/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/pom.xml (97%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-configuration/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/package-info.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestServiceCombServerList.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-provider/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-provider/src/main/resources/application.properties (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-registry/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/RegistryIntializer.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/ServiceCenterRegistryConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-registry/src/main/resources/META-INF/spring.factories (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-registry/src/test/java/org/apache/servicecomb/springboot/starter/registry/TestServiceCenterRegistryConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-servicecomb/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/EnableServiceComb.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/ServiceCombSpringConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/package-info.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-transport/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/package-info.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-boot-starter-transport/src/test/java/org/apache/servicecomb/springboot/starter/transport/TestRestServletInitializer.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul-zipkin/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfiguration.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePostZuulFilter.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePreZuulFilter.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul-zipkin/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfigurationTest.java (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul/pom.xml (100%) rename {spring-boot-starter => java-chassis-spring-boot/spring-boot-starter}/spring-cloud-zuul/src/main/java/org/apache/servicecomb/spring/cloud/zuul/ContextHeaderZuulFilter.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/pom.xml (95%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/pom.xml (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-servlet/pom.xml (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter-standalone/pom.xml (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter/pom.xml (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/EnableServiceComb.java (100%) rename {spring-boot2-starter-parent => java-chassis-spring-boot/spring-boot2-starter-parent}/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java (100%) diff --git a/java-chassis-spring-boot/pom.xml b/java-chassis-spring-boot/pom.xml new file mode 100644 index 0000000000..a20df52d42 --- /dev/null +++ b/java-chassis-spring-boot/pom.xml @@ -0,0 +1,37 @@ + + + + + + java-chassis + org.apache.servicecomb + 1.1.0-SNAPSHOT + + 4.0.0 + pom + java-chassis-spring-boot + + + spring-boot-common + spring-boot-starter + spring-boot2-starter-parent + + + \ No newline at end of file diff --git a/spring-boot-common/pom.xml b/java-chassis-spring-boot/spring-boot-common/pom.xml similarity index 52% rename from spring-boot-common/pom.xml rename to java-chassis-spring-boot/spring-boot-common/pom.xml index 2d870105f4..bf17ea7945 100644 --- a/spring-boot-common/pom.xml +++ b/java-chassis-spring-boot/spring-boot-common/pom.xml @@ -1,11 +1,29 @@ + + - java-chassis-dependencies + java-chassis-parent org.apache.servicecomb 1.1.0-SNAPSHOT + ../../parent 4.0.0 diff --git a/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java similarity index 100% rename from spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java diff --git a/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java similarity index 100% rename from spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java rename to java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java diff --git a/spring-boot-starter/pom.xml b/java-chassis-spring-boot/spring-boot-starter/pom.xml similarity index 97% rename from spring-boot-starter/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/pom.xml index c29c4dea14..fb83727c65 100644 --- a/spring-boot-starter/pom.xml +++ b/java-chassis-spring-boot/spring-boot-starter/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent 1.1.0-SNAPSHOT - ../parent + ../../parent spring-boot-starter-parent Java Chassis::Spring Boot Starter::Parent diff --git a/spring-boot-starter/spring-boot-starter-configuration/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-configuration/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-configuration/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-configuration/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-discovery/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/package-info.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/package-info.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/package-info.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/package-info.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestServiceCombServerList.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestServiceCombServerList.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestServiceCombServerList.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestServiceCombServerList.java diff --git a/spring-boot-starter/spring-boot-starter-provider/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-provider/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-provider/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-provider/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties similarity index 100% rename from spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties diff --git a/spring-boot-starter/spring-boot-starter-registry/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-registry/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/RegistryIntializer.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/RegistryIntializer.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/RegistryIntializer.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/RegistryIntializer.java diff --git a/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/ServiceCenterRegistryConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/ServiceCenterRegistryConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/ServiceCenterRegistryConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/java/org/apache/servicecomb/springboot/starter/registry/ServiceCenterRegistryConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-registry/src/main/resources/META-INF/spring.factories b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-boot-starter/spring-boot-starter-registry/src/main/resources/META-INF/spring.factories rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/main/resources/META-INF/spring.factories diff --git a/spring-boot-starter/spring-boot-starter-registry/src/test/java/org/apache/servicecomb/springboot/starter/registry/TestServiceCenterRegistryConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/test/java/org/apache/servicecomb/springboot/starter/registry/TestServiceCenterRegistryConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-registry/src/test/java/org/apache/servicecomb/springboot/starter/registry/TestServiceCenterRegistryConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-registry/src/test/java/org/apache/servicecomb/springboot/starter/registry/TestServiceCenterRegistryConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-servicecomb/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-servicecomb/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/EnableServiceComb.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/EnableServiceComb.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/EnableServiceComb.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/EnableServiceComb.java diff --git a/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/ServiceCombSpringConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/ServiceCombSpringConfiguration.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/ServiceCombSpringConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/ServiceCombSpringConfiguration.java diff --git a/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/package-info.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/package-info.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/package-info.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-servicecomb/src/main/java/org/apache/servicecomb/springboot/starter/provider/package-info.java diff --git a/spring-boot-starter/spring-boot-starter-transport/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/pom.xml similarity index 100% rename from spring-boot-starter/spring-boot-starter-transport/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/pom.xml diff --git a/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/RestServletInitializer.java diff --git a/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/package-info.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/package-info.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/package-info.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/main/java/org/apache/servicecomb/springboot/starter/transport/package-info.java diff --git a/spring-boot-starter/spring-boot-starter-transport/src/test/java/org/apache/servicecomb/springboot/starter/transport/TestRestServletInitializer.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/test/java/org/apache/servicecomb/springboot/starter/transport/TestRestServletInitializer.java similarity index 100% rename from spring-boot-starter/spring-boot-starter-transport/src/test/java/org/apache/servicecomb/springboot/starter/transport/TestRestServletInitializer.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-transport/src/test/java/org/apache/servicecomb/springboot/starter/transport/TestRestServletInitializer.java diff --git a/spring-boot-starter/spring-cloud-zuul-zipkin/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/pom.xml similarity index 100% rename from spring-boot-starter/spring-cloud-zuul-zipkin/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/pom.xml diff --git a/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfiguration.java similarity index 100% rename from spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfiguration.java diff --git a/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePostZuulFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePostZuulFilter.java similarity index 100% rename from spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePostZuulFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePostZuulFilter.java diff --git a/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePreZuulFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePreZuulFilter.java similarity index 100% rename from spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePreZuulFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/main/java/org/apache/servicecomb/spring/cloud/zuul/tracing/TracePreZuulFilter.java diff --git a/spring-boot-starter/spring-cloud-zuul-zipkin/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfigurationTest.java b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfigurationTest.java similarity index 100% rename from spring-boot-starter/spring-cloud-zuul-zipkin/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfigurationTest.java rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul-zipkin/src/test/java/org/apache/servicecomb/spring/cloud/zuul/tracing/SpringTracingConfigurationTest.java diff --git a/spring-boot-starter/spring-cloud-zuul/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul/pom.xml similarity index 100% rename from spring-boot-starter/spring-cloud-zuul/pom.xml rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul/pom.xml diff --git a/spring-boot-starter/spring-cloud-zuul/src/main/java/org/apache/servicecomb/spring/cloud/zuul/ContextHeaderZuulFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul/src/main/java/org/apache/servicecomb/spring/cloud/zuul/ContextHeaderZuulFilter.java similarity index 100% rename from spring-boot-starter/spring-cloud-zuul/src/main/java/org/apache/servicecomb/spring/cloud/zuul/ContextHeaderZuulFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-cloud-zuul/src/main/java/org/apache/servicecomb/spring/cloud/zuul/ContextHeaderZuulFilter.java diff --git a/spring-boot2-starter-parent/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/pom.xml similarity index 95% rename from spring-boot2-starter-parent/pom.xml rename to java-chassis-spring-boot/spring-boot2-starter-parent/pom.xml index 08f91172d0..eabeac75b0 100644 --- a/spring-boot2-starter-parent/pom.xml +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis-dependencies-springboot2 1.1.0-SNAPSHOT - ../java-chassis-dependencies-springboot2 + ../../java-chassis-dependencies-springboot2 4.0.0 diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/package-info.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories diff --git a/spring-boot2-starter-parent/spring-boot2-starter-servlet/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/pom.xml similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-servlet/pom.xml rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/pom.xml diff --git a/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/package-info.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter-standalone/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-standalone/pom.xml similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter-standalone/pom.xml rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-standalone/pom.xml diff --git a/spring-boot2-starter-parent/spring-boot2-starter/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/pom.xml similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter/pom.xml rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/pom.xml diff --git a/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/EnableServiceComb.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/EnableServiceComb.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/EnableServiceComb.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/EnableServiceComb.java diff --git a/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java similarity index 100% rename from spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter/src/main/java/org/apache/servicecomb/springboot2/starter/ServiceCombSpringConfiguration.java diff --git a/pom.xml b/pom.xml index 55336f8e18..c63541dbbc 100644 --- a/pom.xml +++ b/pom.xml @@ -101,15 +101,13 @@ swagger core service-registry - spring-boot-starter tracing edge metrics dynamic-config archetypes java-chassis-dependencies-springboot2 - spring-boot2-starter-parent - spring-boot-common + java-chassis-spring-boot From 0f388020ba7aa00bd3459e0fee83c6a8e7315f1f Mon Sep 17 00:00:00 2001 From: Yang Bo Date: Mon, 19 Nov 2018 16:08:13 +0800 Subject: [PATCH 5/5] [SCB-986] Rename CseXXX to ScbXXX in discovery starter --- .../spring-boot-common/pom.xml | 4 --- ...Util.java => AbstractDiscoveryClient.java} | 6 ++-- ...lter.java => InstanceDiscoveryFilter.java} | 21 +++++++++----- .../spring-boot-starter-discovery/pom.xml | 4 --- .../discovery/InstanceDiscoveryFilter.java | 12 -------- ...eryClient.java => ScbDiscoveryClient.java} | 23 ++++++++------- ...a => ScbDiscoveryClientConfiguration.java} | 4 +-- ...java => ScbRibbonClientConfiguration.java} | 2 +- ...ation.java => ScbRibbonConfiguration.java} | 4 +-- ... => ScbRibbonEndpointDiscoveryFilter.java} | 2 +- .../discovery/ServiceCombServerList.java | 2 +- .../main/resources/META-INF/spring.factories | 8 ++--- ...lient.java => TestScbDiscoveryClient.java} | 4 +-- ... TestScbDiscoveryClientConfiguration.java} | 6 ++-- ... => TestScbRibbonClientConfiguration.java} | 4 +-- .../spring-boot2-starter-discovery/pom.xml | 4 --- .../discovery/InstanceDiscoveryFilter.java | 13 --------- ...eryClient.java => ScbDiscoveryClient.java} | 29 ++++++++----------- ...a => ScbDiscoveryClientConfiguration.java} | 4 +-- ...java => ScbRibbonClientConfiguration.java} | 2 +- ...ation.java => ScbRibbonConfiguration.java} | 4 +-- ... => ScbRibbonEndpointDiscoveryFilter.java} | 2 +- .../discovery/ServiceCombServerList.java | 2 +- .../main/resources/META-INF/spring.factories | 8 ++--- 24 files changed, 70 insertions(+), 104 deletions(-) rename java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/{DiscoveryClientUtil.java => AbstractDiscoveryClient.java} (94%) rename java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/{AbstractInstanceDiscoveryFilter.java => InstanceDiscoveryFilter.java} (82%) delete mode 100644 java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/{CseDiscoveryClient.java => ScbDiscoveryClient.java} (63%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/{CseDiscoveryClientConfiguration.java => ScbDiscoveryClientConfiguration.java} (95%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/{CseRibbonClientConfiguration.java => ScbRibbonClientConfiguration.java} (94%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/{CseRibbonConfiguration.java => ScbRibbonConfiguration.java} (91%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/{CseRibbonEndpointDiscoveryFilter.java => ScbRibbonEndpointDiscoveryFilter.java} (96%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/{TestCseDiscoveryClient.java => TestScbDiscoveryClient.java} (97%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/{TestCseDiscoveryClientConfiguration.java => TestScbDiscoveryClientConfiguration.java} (84%) rename java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/{TestCseRibbonClientConfiguration.java => TestScbRibbonClientConfiguration.java} (91%) delete mode 100644 java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java rename java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/{CseDiscoveryClient.java => ScbDiscoveryClient.java} (61%) rename java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/{CseDiscoveryClientConfiguration.java => ScbDiscoveryClientConfiguration.java} (95%) rename java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/{CseRibbonClientConfiguration.java => ScbRibbonClientConfiguration.java} (94%) rename java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/{CseRibbonConfiguration.java => ScbRibbonConfiguration.java} (91%) rename java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/{CseRibbonEndpointDiscoveryFilter.java => ScbRibbonEndpointDiscoveryFilter.java} (96%) diff --git a/java-chassis-spring-boot/spring-boot-common/pom.xml b/java-chassis-spring-boot/spring-boot-common/pom.xml index bf17ea7945..ad6f2882ff 100644 --- a/java-chassis-spring-boot/spring-boot-common/pom.xml +++ b/java-chassis-spring-boot/spring-boot-common/pom.xml @@ -33,10 +33,6 @@ org.apache.servicecomb service-registry - - org.apache.servicecomb - java-chassis-core - diff --git a/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractDiscoveryClient.java similarity index 94% rename from java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java rename to java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractDiscoveryClient.java index 4aa326610a..f114439c75 100644 --- a/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/DiscoveryClientUtil.java +++ b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractDiscoveryClient.java @@ -30,16 +30,16 @@ import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree; -public class DiscoveryClientUtil { +public abstract class AbstractDiscoveryClient { private Map discoveryTrees = new ConcurrentHashMapEx<>(); private DiscoveryFilter filter = null; - public DiscoveryClientUtil(DiscoveryFilter filter){ + public AbstractDiscoveryClient(DiscoveryFilter filter){ this.filter = filter; } - public List getInstances(final String serviceId) { + public List doGetInstances(final String serviceId) { DiscoveryContext context = new DiscoveryContext(); context.setInputParameters(serviceId); diff --git a/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/InstanceDiscoveryFilter.java similarity index 82% rename from java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/InstanceDiscoveryFilter.java index be8503e50b..86f84a968c 100644 --- a/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/AbstractInstanceDiscoveryFilter.java +++ b/java-chassis-spring-boot/spring-boot-common/src/main/java/org/apache/servicecomb/springboot/common/InstanceDiscoveryFilter.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance; import org.apache.servicecomb.serviceregistry.discovery.DiscoveryContext; @@ -29,9 +28,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractInstanceDiscoveryFilter implements DiscoveryFilter { +public class InstanceDiscoveryFilter implements DiscoveryFilter { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractInstanceDiscoveryFilter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(InstanceDiscoveryFilter.class); + + public interface InstanceFactory { + Object createInstance(String name, URIEndpointObject uri); + } + + InstanceFactory instanceFactory; + + public InstanceDiscoveryFilter(InstanceFactory factory){ + instanceFactory = factory; + } @Override public int getOrder() { @@ -53,12 +62,12 @@ protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, for (MicroserviceInstance instance : ((Map) parent.data()).values()) { for (String endpoint : instance.getEndpoints()) { String scheme = endpoint.split(":", 2)[0]; - if (!scheme.equalsIgnoreCase(Const.RESTFUL)) { + if (!scheme.equalsIgnoreCase("rest")) { LOGGER.info("Endpoint {} is not supported in Spring Cloud, ignoring.", endpoint); continue; } URIEndpointObject uri = new URIEndpointObject(endpoint); - instances.add(createInstance(serviceName, uri)); + instances.add(instanceFactory.createInstance(serviceName, uri)); } } @@ -66,6 +75,4 @@ protected DiscoveryTreeNode createDiscoveryTreeNode(DiscoveryContext context, .subName(parent, serviceName) .data(instances); } - - abstract protected Object createInstance(String name, URIEndpointObject uri); }; \ No newline at end of file diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml index 7ccfe9cad4..7ff4b87dc4 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/pom.xml @@ -75,10 +75,6 @@ org.apache.servicecomb service-registry - - org.apache.servicecomb - java-chassis-core - org.apache.servicecomb spring-boot-common diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java deleted file mode 100644 index ed516df9a8..0000000000 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/InstanceDiscoveryFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apache.servicecomb.springboot.starter.discovery; - -import org.apache.servicecomb.foundation.common.net.URIEndpointObject; -import org.apache.servicecomb.springboot.common.AbstractInstanceDiscoveryFilter; -import org.springframework.cloud.client.DefaultServiceInstance; - -class InstanceDiscoveryFilter extends AbstractInstanceDiscoveryFilter { - @Override - protected Object createInstance(String name, URIEndpointObject uri) { - return new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()); - } -} \ No newline at end of file diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClient.java similarity index 63% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClient.java index b44cfd15c1..22565b60b6 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClient.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClient.java @@ -18,13 +18,19 @@ import java.util.List; -import org.apache.servicecomb.springboot.common.DiscoveryClientUtil; +import org.apache.servicecomb.foundation.common.net.URIEndpointObject; +import org.apache.servicecomb.springboot.common.AbstractDiscoveryClient; +import org.apache.servicecomb.springboot.common.InstanceDiscoveryFilter; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; -public class CseDiscoveryClient implements DiscoveryClient { - private DiscoveryClientUtil - discoveryClientUtil = new DiscoveryClientUtil<>(new InstanceDiscoveryFilter()); +public class ScbDiscoveryClient extends AbstractDiscoveryClient implements DiscoveryClient { + + public ScbDiscoveryClient() { + super(new InstanceDiscoveryFilter((String name, URIEndpointObject uri) -> + new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()))); + } @Override public String description() { @@ -32,17 +38,12 @@ public String description() { } @Override - public List getInstances(final String serviceId) { - return discoveryClientUtil.getInstances(serviceId); - } - @Deprecated public ServiceInstance getLocalServiceInstance() { return null; } - @Override - public List getServices() { - return discoveryClientUtil.getServices(); + public List getInstances(String serviceId) { + return super.doGetInstances(serviceId); } } diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClientConfiguration.java similarity index 95% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClientConfiguration.java index a6c377e215..b26f459743 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseDiscoveryClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbDiscoveryClientConfiguration.java @@ -26,11 +26,11 @@ @AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class) @Configuration -public class CseDiscoveryClientConfiguration { +public class ScbDiscoveryClientConfiguration { @Bean @Order(5000) @ConditionalOnProperty(value = "servicecomb.discoveryClient.enabled", havingValue = "true", matchIfMissing = true) public DiscoveryClient cseDiscoveryClient() { - return new CseDiscoveryClient(); + return new ScbDiscoveryClient(); } } diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonClientConfiguration.java similarity index 94% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonClientConfiguration.java index 6358cbd145..d93dd08ccf 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonClientConfiguration.java @@ -29,7 +29,7 @@ * @see * Customizing the Ribbon Client */ -public class CseRibbonClientConfiguration { +public class ScbRibbonClientConfiguration { @Bean public ServerList ribbonServerList( IClientConfig config) { diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonConfiguration.java similarity index 91% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonConfiguration.java index b5ebd8b0a0..4cabac6143 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonConfiguration.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonConfiguration.java @@ -28,7 +28,7 @@ @EnableConfigurationProperties @ConditionalOnBean(SpringClientFactory.class) @AutoConfigureAfter(RibbonAutoConfiguration.class) -@RibbonClients(defaultConfiguration = CseRibbonClientConfiguration.class) -public class CseRibbonConfiguration { +@RibbonClients(defaultConfiguration = ScbRibbonClientConfiguration.class) +public class ScbRibbonConfiguration { } diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java similarity index 96% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java index 65f72d7a33..a9a4de57c3 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/CseRibbonEndpointDiscoveryFilter.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java @@ -25,7 +25,7 @@ import com.netflix.loadbalancer.Server; -public class CseRibbonEndpointDiscoveryFilter extends AbstractEndpointDiscoveryFilter { +public class ScbRibbonEndpointDiscoveryFilter extends AbstractEndpointDiscoveryFilter { @Override protected String findTransportName(DiscoveryContext context, DiscoveryTreeNode parent) { //only need rest endpoints diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java index 13f092bd0e..aa20b39aaa 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/java/org/apache/servicecomb/springboot/starter/discovery/ServiceCombServerList.java @@ -35,7 +35,7 @@ public class ServiceCombServerList extends AbstractServerList { private String serviceId; public ServiceCombServerList() { - discoveryTree.addFilter(new CseRibbonEndpointDiscoveryFilter()); + discoveryTree.addFilter(new ScbRibbonEndpointDiscoveryFilter()); } @Override diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories index 25c4a47306..92267e7acf 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/main/resources/META-INF/spring.factories @@ -16,9 +16,9 @@ ## --------------------------------------------------------------------------- org.apache.servicecomb.springboot.starter.provider.EnableServiceComb=\ - org.apache.servicecomb.springboot.starter.discovery.CseDiscoveryClientConfiguration,\ - org.apache.servicecomb.springboot.starter.discovery.CseRibbonConfiguration + org.apache.servicecomb.springboot.starter.discovery.ScbDiscoveryClientConfiguration,\ + org.apache.servicecomb.springboot.starter.discovery.ScbRibbonConfiguration org.springframework.cloud.client.discovery.EnableDiscoveryClient=\ - org.apache.servicecomb.springboot.starter.discovery.CseDiscoveryClientConfiguration + org.apache.servicecomb.springboot.starter.discovery.ScbDiscoveryClientConfiguration org.springframework.cloud.netflix.ribbon.RibbonClient=\ - org.apache.servicecomb.springboot.starter.discovery.CseRibbonConfiguration \ No newline at end of file + org.apache.servicecomb.springboot.starter.discovery.ScbRibbonConfiguration \ No newline at end of file diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClient.java similarity index 97% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClient.java index 9ed79462cd..786fd0eba0 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClient.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClient.java @@ -35,7 +35,7 @@ import mockit.Injectable; import mockit.Mocked; -public class TestCseDiscoveryClient { +public class TestScbDiscoveryClient { @Test public void testCseDiscoveryClient(@Mocked RegistryUtils registryUtils, @Injectable InstanceCacheManager instanceCacheManager, @@ -69,7 +69,7 @@ public void testCseDiscoveryClient(@Mocked RegistryUtils registryUtils, } }; - DiscoveryClient client = new CseDiscoveryClient(); + DiscoveryClient client = new ScbDiscoveryClient(); Assert.assertEquals("Spring Cloud CSE Discovery Client", client.description()); Assert.assertEquals(2, client.getServices().size()); Assert.assertEquals("server2", client.getServices().get(1)); diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClientConfiguration.java similarity index 84% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClientConfiguration.java index ad8f4dc3cb..455c95e58d 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseDiscoveryClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbDiscoveryClientConfiguration.java @@ -19,10 +19,10 @@ import org.junit.Assert; import org.junit.Test; -public class TestCseDiscoveryClientConfiguration { +public class TestScbDiscoveryClientConfiguration { @Test public void testCseDiscoveryClientConfiguration() { - CseDiscoveryClientConfiguration discoveryClientConfiguration = new CseDiscoveryClientConfiguration(); - Assert.assertTrue(discoveryClientConfiguration.cseDiscoveryClient() instanceof CseDiscoveryClient); + ScbDiscoveryClientConfiguration discoveryClientConfiguration = new ScbDiscoveryClientConfiguration(); + Assert.assertTrue(discoveryClientConfiguration.cseDiscoveryClient() instanceof ScbDiscoveryClient); } } diff --git a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbRibbonClientConfiguration.java similarity index 91% rename from java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbRibbonClientConfiguration.java index 078905f771..d833dd7696 100644 --- a/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestCseRibbonClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot-starter/spring-boot-starter-discovery/src/test/java/org/apache/servicecomb/springboot/starter/discovery/TestScbRibbonClientConfiguration.java @@ -24,10 +24,10 @@ import mockit.Injectable; -public class TestCseRibbonClientConfiguration { +public class TestScbRibbonClientConfiguration { @Test public void testCseRibbonClientConfiguration(@Injectable IClientConfig clientConfig) { - CseRibbonClientConfiguration config = new CseRibbonClientConfiguration(); + ScbRibbonClientConfiguration config = new ScbRibbonClientConfiguration(); Assert.assertTrue(config.ribbonServerList(clientConfig) instanceof ServiceCombServerList); } } diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml index 00d720de23..e52c5bb59a 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/pom.xml @@ -90,10 +90,6 @@ org.apache.servicecomb service-registry - - org.apache.servicecomb - java-chassis-core - org.apache.servicecomb spring-boot2-starter diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java deleted file mode 100644 index b9727682b7..0000000000 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/InstanceDiscoveryFilter.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.apache.servicecomb.springboot2.starter.discovery; - -import org.apache.servicecomb.foundation.common.net.URIEndpointObject; -import org.apache.servicecomb.springboot.common.AbstractInstanceDiscoveryFilter; -import org.springframework.cloud.client.DefaultServiceInstance; - -class InstanceDiscoveryFilter extends AbstractInstanceDiscoveryFilter { - @Override - protected Object createInstance(String name, URIEndpointObject uri) { - - return new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()); - } -} \ No newline at end of file diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClient.java similarity index 61% rename from java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClient.java index b574108583..eddafc3f17 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClient.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClient.java @@ -18,31 +18,26 @@ import java.util.List; -import org.apache.servicecomb.springboot.common.DiscoveryClientUtil; +import org.apache.servicecomb.foundation.common.net.URIEndpointObject; +import org.apache.servicecomb.springboot.common.AbstractDiscoveryClient; +import org.apache.servicecomb.springboot.common.InstanceDiscoveryFilter; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; -public class CseDiscoveryClient implements DiscoveryClient { - private DiscoveryClientUtil - discoveryClientUtil = new DiscoveryClientUtil<>(new InstanceDiscoveryFilter()); +public class ScbDiscoveryClient extends AbstractDiscoveryClient implements DiscoveryClient { - @Override - public String description() { - return "Spring Cloud 2 CSE Discovery Client"; + public ScbDiscoveryClient() { + super(new InstanceDiscoveryFilter((String name, URIEndpointObject uri) -> + new DefaultServiceInstance(name, uri.getHostOrIp(), uri.getPort(), uri.isSslEnabled()))); } @Override - public List getInstances(final String serviceId) { - return discoveryClientUtil.getInstances(serviceId); - } - - @Deprecated - public ServiceInstance getLocalServiceInstance() { - return null; + public String description() { + return "Spring Cloud 2 CSE Discovery Client"; } - @Override - public List getServices() { - return discoveryClientUtil.getServices(); + public List getInstances(String serviceId) { + return super.doGetInstances(serviceId); } } diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClientConfiguration.java similarity index 95% rename from java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClientConfiguration.java index c99befdda4..75730b77b3 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseDiscoveryClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbDiscoveryClientConfiguration.java @@ -26,11 +26,11 @@ @AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class) @Configuration -public class CseDiscoveryClientConfiguration { +public class ScbDiscoveryClientConfiguration { @Bean @Order(5000) @ConditionalOnProperty(value = "servicecomb.discoveryClient.enabled", havingValue = "true", matchIfMissing = true) public DiscoveryClient cseDiscoveryClient() { - return new CseDiscoveryClient(); + return new ScbDiscoveryClient(); } } diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonClientConfiguration.java similarity index 94% rename from java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonClientConfiguration.java index 3ff1fd3693..fa896dc889 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonClientConfiguration.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonClientConfiguration.java @@ -29,7 +29,7 @@ * @see * Customizing the Ribbon Client */ -public class CseRibbonClientConfiguration { +public class ScbRibbonClientConfiguration { @Bean public ServerList ribbonServerList( IClientConfig config) { diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonConfiguration.java similarity index 91% rename from java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonConfiguration.java index 72f905eda8..0ffeab3a22 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonConfiguration.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonConfiguration.java @@ -28,7 +28,7 @@ @EnableConfigurationProperties @ConditionalOnBean(SpringClientFactory.class) @AutoConfigureAfter(RibbonAutoConfiguration.class) -@RibbonClients(defaultConfiguration = CseRibbonClientConfiguration.class) -public class CseRibbonConfiguration { +@RibbonClients(defaultConfiguration = ScbRibbonClientConfiguration.class) +public class ScbRibbonConfiguration { } diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java similarity index 96% rename from java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java rename to java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java index 8ab7d36fd7..1f17df56d0 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/CseRibbonEndpointDiscoveryFilter.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ScbRibbonEndpointDiscoveryFilter.java @@ -25,7 +25,7 @@ import com.netflix.loadbalancer.Server; -public class CseRibbonEndpointDiscoveryFilter extends AbstractEndpointDiscoveryFilter { +public class ScbRibbonEndpointDiscoveryFilter extends AbstractEndpointDiscoveryFilter { @Override protected String findTransportName(DiscoveryContext context, DiscoveryTreeNode parent) { //only need rest endpoints diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java index 4592ea9d41..61ac3eadc3 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/java/org/apache/servicecomb/springboot2/starter/discovery/ServiceCombServerList.java @@ -35,7 +35,7 @@ public class ServiceCombServerList extends AbstractServerList { private String serviceId; public ServiceCombServerList() { - discoveryTree.addFilter(new CseRibbonEndpointDiscoveryFilter()); + discoveryTree.addFilter(new ScbRibbonEndpointDiscoveryFilter()); } @Override diff --git a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories index 268f1129fa..de5a9fc177 100644 --- a/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories +++ b/java-chassis-spring-boot/spring-boot2-starter-parent/spring-boot2-starter-discovery/src/main/resources/META-INF/spring.factories @@ -16,9 +16,9 @@ ## --------------------------------------------------------------------------- org.apache.servicecomb.springboot.starter.provider.EnableServiceComb=\ - org.apache.servicecomb.springboot2.starter.discovery.CseDiscoveryClientConfiguration,\ - org.apache.servicecomb.springboot2.starter.discovery.CseRibbonConfiguration + org.apache.servicecomb.springboot2.starter.discovery.ScbDiscoveryClientConfiguration,\ + org.apache.servicecomb.springboot2.starter.discovery.ScbRibbonConfiguration org.springframework.cloud.client.discovery.EnableDiscoveryClient=\ - org.apache.servicecomb.springboot2.starter.discovery.CseDiscoveryClientConfiguration + org.apache.servicecomb.springboot2.starter.discovery.ScbDiscoveryClientConfiguration org.springframework.cloud.netflix.ribbon.RibbonClient=\ - org.apache.servicecomb.springboot2.starter.discovery.CseRibbonConfiguration \ No newline at end of file + org.apache.servicecomb.springboot2.starter.discovery.ScbRibbonConfiguration \ No newline at end of file