You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/11/19 09:33:41 UTC
[servicecomb-java-chassis] 05/05: [SCB-986] Rename CseXXX to ScbXXX
in discovery starter
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit defbfa4e67504356f309a0c447840dae06f22726
Author: Yang Bo <ya...@huawei.com>
AuthorDate: Mon Nov 19 16:08:13 2018 +0800
[SCB-986] Rename CseXXX to ScbXXX in discovery starter
---
.../spring-boot-common/pom.xml | 4 ---
...lientUtil.java => AbstractDiscoveryClient.java} | 6 ++---
...eryFilter.java => InstanceDiscoveryFilter.java} | 21 ++++++++++------
.../spring-boot-starter-discovery/pom.xml | 4 ---
.../starter/discovery/InstanceDiscoveryFilter.java | 12 ---------
...iscoveryClient.java => ScbDiscoveryClient.java} | 23 +++++++++--------
...n.java => ScbDiscoveryClientConfiguration.java} | 4 +--
...tion.java => ScbRibbonClientConfiguration.java} | 2 +-
...figuration.java => ScbRibbonConfiguration.java} | 4 +--
....java => ScbRibbonEndpointDiscoveryFilter.java} | 2 +-
.../starter/discovery/ServiceCombServerList.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 8 +++---
...veryClient.java => TestScbDiscoveryClient.java} | 4 +--
...va => TestScbDiscoveryClientConfiguration.java} | 6 ++---
....java => TestScbRibbonClientConfiguration.java} | 4 +--
.../spring-boot2-starter-discovery/pom.xml | 4 ---
.../starter/discovery/InstanceDiscoveryFilter.java | 13 ----------
...iscoveryClient.java => ScbDiscoveryClient.java} | 29 +++++++++-------------
...n.java => ScbDiscoveryClientConfiguration.java} | 4 +--
...tion.java => ScbRibbonClientConfiguration.java} | 2 +-
...figuration.java => ScbRibbonConfiguration.java} | 4 +--
....java => ScbRibbonEndpointDiscoveryFilter.java} | 2 +-
.../starter/discovery/ServiceCombServerList.java | 2 +-
.../src/main/resources/META-INF/spring.factories | 8 +++---
24 files changed, 70 insertions(+), 104 deletions(-)
diff --git a/java-chassis-spring-boot/spring-boot-common/pom.xml b/java-chassis-spring-boot/spring-boot-common/pom.xml
index bf17ea7..ad6f288 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 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>service-registry</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-core</artifactId>
- </dependency>
</dependencies>
<build>
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 4aa3266..f114439 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.DiscoveryContext;
import org.apache.servicecomb.serviceregistry.discovery.DiscoveryFilter;
import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTree;
-public class DiscoveryClientUtil<T> {
+public abstract class AbstractDiscoveryClient {
private Map<String, DiscoveryTree> discoveryTrees = new ConcurrentHashMapEx<>();
private DiscoveryFilter filter = null;
- public DiscoveryClientUtil(DiscoveryFilter filter){
+ public AbstractDiscoveryClient(DiscoveryFilter filter){
this.filter = filter;
}
- public List<T> getInstances(final String serviceId) {
+ public <T> List<T> 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 be8503e..86f84a9 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.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;
@@ -29,9 +28,19 @@ import org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode;
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 @@ public abstract class AbstractInstanceDiscoveryFilter implements DiscoveryFilter
for (MicroserviceInstance instance : ((Map<String, MicroserviceInstance>) 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 @@ public abstract class AbstractInstanceDiscoveryFilter implements DiscoveryFilter
.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 7ccfe9c..7ff4b87 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
@@ -77,10 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>spring-boot-common</artifactId>
</dependency>
</dependencies>
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 ed516df..0000000
--- 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 b44cfd1..22565b6 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 @@ package org.apache.servicecomb.springboot.starter.discovery;
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<ServiceInstance>
- 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 class CseDiscoveryClient implements DiscoveryClient {
}
@Override
- public List<ServiceInstance> getInstances(final String serviceId) {
- return discoveryClientUtil.getInstances(serviceId);
- }
-
@Deprecated
public ServiceInstance getLocalServiceInstance() {
return null;
}
- @Override
- public List<String> getServices() {
- return discoveryClientUtil.getServices();
+ public List<ServiceInstance> 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 a6c377e..b26f459 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 @@ import org.springframework.core.annotation.Order;
@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 6358cbd..d93dd08 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 @@ import com.netflix.loadbalancer.ServerList;
* @see <a href="http://cloud.spring.io/spring-cloud-static/Camden.SR4/#_customizing_the_ribbon_client">
* Customizing the Ribbon Client </a>
*/
-public class CseRibbonClientConfiguration {
+public class ScbRibbonClientConfiguration {
@Bean
public ServerList<Server> 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 b5ebd8b..4cabac6 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 @@ import org.springframework.context.annotation.Configuration;
@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 65f72d7..a9a4de5 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 org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode;
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 13f092b..aa20b39 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<Server> {
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 25c4a47..92267e7 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 9ed7946..786fd0e 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.Expectations;
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 class TestCseDiscoveryClient {
}
};
- 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 ad8f4dc..455c95e 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 @@ package org.apache.servicecomb.springboot.starter.discovery;
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 078905f..d833dd7 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 com.netflix.client.config.IClientConfig;
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 00d720d..e52c5bb 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
@@ -92,10 +92,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>spring-boot2-starter</artifactId>
</dependency>
<dependency>
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 b972768..0000000
--- 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 b574108..eddafc3 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 @@ package org.apache.servicecomb.springboot2.starter.discovery;
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<ServiceInstance>
- 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<ServiceInstance> 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<String> getServices() {
- return discoveryClientUtil.getServices();
+ public List<ServiceInstance> 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 c99befd..75730b7 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 @@ import org.springframework.core.annotation.Order;
@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 3ff1fd3..fa896dc 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 @@ import com.netflix.loadbalancer.ServerList;
* @see <a href="http://cloud.spring.io/spring-cloud-static/Camden.SR4/#_customizing_the_ribbon_client">
* Customizing the Ribbon Client </a>
*/
-public class CseRibbonClientConfiguration {
+public class ScbRibbonClientConfiguration {
@Bean
public ServerList<Server> 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 72f905e..0ffeab3 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 @@ import org.springframework.context.annotation.Configuration;
@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 8ab7d36..1f17df5 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 org.apache.servicecomb.serviceregistry.discovery.DiscoveryTreeNode;
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 4592ea9..61ac3ea 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<Server> {
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 268f112..de5a9fc 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