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 2020/05/30 07:12:25 UTC
[servicecomb-java-chassis] branch master updated (42816bc ->
3b82295)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from 42816bc [SCB-1955] create unify producer invocation flow
new 1281b70 [SCB-1956]Need to provide interface in the DiscoveryManager class to getAllMicroservices
new 3b82295 [SCB-1956]rename project package to avoid random travis CI coverage error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../demo-local-registry-client/pom.xml | 2 +-
.../demo/localRegistryClient}/Application.java | 13 +-----
.../LocalRegistryServerTest.java} | 50 ++++++++++++++++------
.../LocalRegistryIT.java | 3 +-
.../demo-local-registry-server/pom.xml | 2 +-
.../SelfServiceInvoker.java | 2 +-
.../ServerApplication.java | 2 +-
.../ServerEndpoint.java | 2 +-
.../registry/MultiRegistriesServerTestCase.java | 25 +++++++++++
.../servicecomb/registry/DiscoveryManager.java | 12 ++++++
.../apache/servicecomb/registry/api/Discovery.java | 8 ++++
.../servicecomb/localregistry/LocalDiscovery.java | 6 +++
.../localregistry/LocalRegistryStore.java | 4 ++
.../schemadiscovery/SchemaDiscovery.java | 5 +++
.../servicecomb/serviceregistry/RegistryUtils.java | 12 ++++--
.../serviceregistry/ServiceCenterDiscovery.java | 6 +++
.../serviceregistry/ServiceRegistry.java | 5 +++
.../registry/AbstractServiceRegistry.java | 4 ++
.../registry/EmptyMockServiceRegistry.java | 9 +++-
19 files changed, 137 insertions(+), 35 deletions(-)
copy demo/{demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry => demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient}/Application.java (80%)
rename demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/{registry/Application.java => localRegistryClient/LocalRegistryServerTest.java} (53%)
rename demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/{registry => localRegistryClient}/LocalRegistryIT.java (90%)
rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/SelfServiceInvoker.java (96%)
rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/ServerApplication.java (96%)
rename demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/{registry => localRegistryServer}/ServerEndpoint.java (96%)
[servicecomb-java-chassis] 01/02: [SCB-1956]Need to provide
interface in the DiscoveryManager class to getAllMicroservices
Posted by li...@apache.org.
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 1281b70064fd98b9729ae36ce734e86271d2ff2f
Author: liubao <bi...@qq.com>
AuthorDate: Sat May 30 11:13:03 2020 +0800
[SCB-1956]Need to provide interface in the DiscoveryManager class to getAllMicroservices
---
.../servicecomb/demo/registry/Application.java | 15 +++--------
.../demo/registry/LocalRegistryServerTest.java} | 31 +++++++++++++++++++---
.../registry/MultiRegistriesServerTestCase.java | 25 +++++++++++++++++
.../servicecomb/registry/DiscoveryManager.java | 12 +++++++++
.../apache/servicecomb/registry/api/Discovery.java | 8 ++++++
.../servicecomb/localregistry/LocalDiscovery.java | 6 +++++
.../localregistry/LocalRegistryStore.java | 4 +++
.../schemadiscovery/SchemaDiscovery.java | 5 ++++
.../servicecomb/serviceregistry/RegistryUtils.java | 12 ++++++---
.../serviceregistry/ServiceCenterDiscovery.java | 6 +++++
.../serviceregistry/ServiceRegistry.java | 5 ++++
.../registry/AbstractServiceRegistry.java | 4 +++
.../registry/EmptyMockServiceRegistry.java | 9 +++++--
13 files changed, 121 insertions(+), 21 deletions(-)
diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java
index 7f0c798..358880e 100644
--- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java
@@ -17,13 +17,11 @@
package org.apache.servicecomb.demo.registry;
-import org.apache.servicecomb.demo.TestMgr;
-import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
+import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.web.client.RestTemplate;
@SpringBootApplication
@EnableServiceComb
@@ -34,14 +32,7 @@ public class Application {
runTest();
}
- public static void runTest() {
- RestTemplate template = RestTemplateBuilder.create();
- TestMgr.check("2", template
- .getForObject("cse://demo-local-registry-server/register/url/prefix/getName?name=2",
- String.class));
- TestMgr.summary();
- if (!TestMgr.errors().isEmpty()) {
- throw new IllegalStateException("tests failed");
- }
+ public static void runTest() throws Exception {
+ CategorizedTestCaseRunner.runCategorizedTestCase("demo-local-registry-server");
}
}
diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java
similarity index 59%
copy from demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java
copy to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java
index d09babf..7e76681 100644
--- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java
@@ -17,23 +17,48 @@
package org.apache.servicecomb.demo.registry;
+import java.util.List;
+
import org.apache.servicecomb.demo.CategorizedTestCase;
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
+import org.apache.servicecomb.registry.DiscoveryManager;
+import org.apache.servicecomb.registry.api.registry.Microservice;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@Component
-public class MultiRegistriesServerTestCase implements CategorizedTestCase {
+public class LocalRegistryServerTest implements CategorizedTestCase {
RestTemplate template = RestTemplateBuilder.create();
@Override
public void testRestTransport() throws Exception {
+ testServerGetName();
+ testGetAllMicroservice();
+ }
+
+ private void testGetAllMicroservice() {
+ List<Microservice> microserviceList = DiscoveryManager.INSTANCE.getAllMicroservices();
+ int expectedCount = 0;
+
+ for (Microservice m : microserviceList) {
+ if (m.getServiceName().equals("demo-local-registry-client")
+ || m.getServiceName().equals("demo-local-registry-server")) {
+ expectedCount++;
+ }
+ }
+ TestMgr.check(2, expectedCount);
+ }
- // invoke demo-multi-registries-server
+ private void testServerGetName() {
+ RestTemplate template = RestTemplateBuilder.create();
TestMgr.check("2", template
- .getForObject("cse://demo-multi-registries-server/register/url/prefix/getName?name=2",
+ .getForObject("cse://demo-local-registry-server/register/url/prefix/getName?name=2",
String.class));
+ TestMgr.summary();
+ if (!TestMgr.errors().isEmpty()) {
+ throw new IllegalStateException("tests failed");
+ }
}
@Override
diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java b/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java
index d09babf..3ca2ef1 100644
--- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java
+++ b/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java
@@ -17,9 +17,15 @@
package org.apache.servicecomb.demo.registry;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.servicecomb.demo.CategorizedTestCase;
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
+import org.apache.servicecomb.registry.DiscoveryManager;
+import org.apache.servicecomb.registry.api.registry.Microservice;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -29,7 +35,26 @@ public class MultiRegistriesServerTestCase implements CategorizedTestCase {
@Override
public void testRestTransport() throws Exception {
+ testServerGetName();
+ testGetAllMicroservice();
+ }
+
+ private void testGetAllMicroservice() {
+ List<Microservice> microserviceList = DiscoveryManager.INSTANCE.getAllMicroservices();
+ Set<String> names = new HashSet<>();
+
+ for (Microservice m : microserviceList) {
+ if (m.getServiceName().equals("demo-multi-registries-client")
+ || m.getServiceName().equals("demo-multi-registries-server")
+ || m.getServiceName().equals("thirdParty-service-center")
+ || m.getServiceName().equals("thirdParty-no-schema-server")) {
+ names.add(m.getServiceName());
+ }
+ }
+ TestMgr.check(4, names.size());
+ }
+ private void testServerGetName() {
// invoke demo-multi-registries-server
TestMgr.check("2", template
.getForObject("cse://demo-multi-registries-server/register/url/prefix/getName?name=2",
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
index 959e7e3..ab0c6f7 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/DiscoveryManager.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.registry;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
@@ -118,6 +119,17 @@ public class DiscoveryManager {
return null;
}
+ public List<Microservice> getAllMicroservices() {
+ List<Microservice> result = new LinkedList<>();
+ for (Discovery discovery : discoveryList) {
+ List<Microservice> microservices = discovery.getAllMicroservices();
+ if (microservices != null) {
+ result.addAll(microservices);
+ }
+ }
+ return result;
+ }
+
public MicroserviceVersions getOrCreateMicroserviceVersions(String appId, String microserviceName) {
return appManager.getOrCreateMicroserviceVersions(appId, microserviceName);
}
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
index 52c68a4..4f25ca6 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/Discovery.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.registry.api;
import java.util.Collection;
+import java.util.List;
import org.apache.servicecomb.foundation.common.utils.SPIEnabled;
import org.apache.servicecomb.foundation.common.utils.SPIOrder;
@@ -37,6 +38,13 @@ public interface Discovery extends SPIEnabled, SPIOrder, LifeCycle {
Microservice getMicroservice(String microserviceId);
/**
+ * get all Microservices </br>
+ *
+ * Life Cycle：This method is called anytime after <code>run</code>.
+ */
+ List<Microservice> getAllMicroservices();
+
+ /**
* get schema content </br>
*
* Life Cycle：This method is called anytime after <code>run</code>.
diff --git a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
index 61e8e02..5338ab3 100644
--- a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
+++ b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscovery.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.localregistry;
import java.util.Collection;
+import java.util.List;
import org.apache.servicecomb.registry.api.Discovery;
import org.apache.servicecomb.registry.api.registry.Microservice;
@@ -61,6 +62,11 @@ public class LocalDiscovery implements Discovery {
}
@Override
+ public List<Microservice> getAllMicroservices() {
+ return localDiscoveryStore.getAllMicroservices();
+ }
+
+ @Override
public String getSchema(String microserviceId, Collection<MicroserviceInstance> instances, String schemaId) {
return localDiscoveryStore.getSchema(microserviceId, schemaId);
}
diff --git a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalRegistryStore.java b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalRegistryStore.java
index 9d60e31..1d0856f 100644
--- a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalRegistryStore.java
+++ b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalRegistryStore.java
@@ -207,6 +207,10 @@ public class LocalRegistryStore {
return microserviceMap.get(microserviceId);
}
+ public List<Microservice> getAllMicroservices() {
+ return microserviceMap.values().stream().collect(Collectors.toList());
+ }
+
public String getSchema(String microserviceId, String schemaId) {
return microserviceMap.get(microserviceId).getSchemaMap().get(schemaId);
}
diff --git a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
index e6f9bad..d8fd12b 100644
--- a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
+++ b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscovery.java
@@ -49,6 +49,11 @@ public class SchemaDiscovery implements Discovery {
}
@Override
+ public List<Microservice> getAllMicroservices() {
+ return null;
+ }
+
+ @Override
public String getSchema(String microserviceId, Collection<MicroserviceInstance> instances, String schemaId) {
if (instances == null || instances.isEmpty()) {
return null;
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/RegistryUtils.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/RegistryUtils.java
index 8ac2cbf..5112e17 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/RegistryUtils.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/RegistryUtils.java
@@ -32,14 +32,14 @@ import org.apache.servicecomb.config.archaius.sources.MicroserviceConfigLoader;
import org.apache.servicecomb.foundation.common.Holder;
import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.registry.DiscoveryManager;
+import org.apache.servicecomb.registry.api.event.MicroserviceInstanceRegisteredEvent;
+import org.apache.servicecomb.registry.api.registry.FindInstancesResponse;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
-import org.apache.servicecomb.registry.api.registry.FindInstancesResponse;
-import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
-import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.apache.servicecomb.registry.definition.MicroserviceDefinition;
-import org.apache.servicecomb.registry.api.event.MicroserviceInstanceRegisteredEvent;
+import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
+import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.apache.servicecomb.serviceregistry.registry.ServiceRegistryFactory;
import org.apache.servicecomb.serviceregistry.registry.cache.AggregateServiceRegistryCache;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache;
@@ -141,6 +141,10 @@ public final class RegistryUtils {
return serviceRegistry.getMicroservice();
}
+ public static List<Microservice> getAllMicroservices() {
+ return serviceRegistry.getAllMicroservices();
+ }
+
public static MicroserviceInstance getMicroserviceInstance() {
return serviceRegistry.getMicroserviceInstance();
}
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
index 818e559..80f091c 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceCenterDiscovery.java
@@ -18,6 +18,7 @@
package org.apache.servicecomb.serviceregistry;
import java.util.Collection;
+import java.util.List;
import org.apache.servicecomb.registry.api.Discovery;
import org.apache.servicecomb.registry.api.registry.Microservice;
@@ -59,6 +60,11 @@ public class ServiceCenterDiscovery implements Discovery {
}
@Override
+ public List<Microservice> getAllMicroservices() {
+ return RegistryUtils.getAllMicroservices();
+ }
+
+ @Override
public String getSchema(String microserviceId, Collection<MicroserviceInstance> instances, String schemaId) {
return RegistryUtils
.getAggregatedSchema(microserviceId, schemaId);
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
index 934f4eb..320670d 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/ServiceRegistry.java
@@ -63,6 +63,11 @@ public interface ServiceRegistry {
Microservice getMicroservice();
/**
+ * Get all Microservices under this application
+ */
+ List<Microservice> getAllMicroservices();
+
+ /**
* Get the {@link MicroserviceInstance} of this microservice instance itself.
*/
MicroserviceInstance getMicroserviceInstance();
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
index c6ff17e..37a1174 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/registry/AbstractServiceRegistry.java
@@ -252,6 +252,10 @@ public abstract class AbstractServiceRegistry implements ServiceRegistry {
return microservice;
}
+ public List<Microservice> getAllMicroservices() {
+ return srClient.getAllMicroservices();
+ }
+
public MicroserviceInstance getMicroserviceInstance() {
return microservice.getInstance();
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/EmptyMockServiceRegistry.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/EmptyMockServiceRegistry.java
index c957907..14229a8 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/EmptyMockServiceRegistry.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/EmptyMockServiceRegistry.java
@@ -21,11 +21,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.servicecomb.serviceregistry.ServiceRegistry;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
-import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
+import org.apache.servicecomb.serviceregistry.ServiceRegistry;
+import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCacheKey;
@@ -73,6 +73,11 @@ public class EmptyMockServiceRegistry implements ServiceRegistry {
}
@Override
+ public List<Microservice> getAllMicroservices() {
+ return null;
+ }
+
+ @Override
public MicroserviceInstance getMicroserviceInstance() {
return null;
}
[servicecomb-java-chassis] 02/02: [SCB-1956]rename project package
to avoid random travis CI coverage error
Posted by li...@apache.org.
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 3b82295ca957892d8958052b6536c154e2f79e8f
Author: liubao <bi...@qq.com>
AuthorDate: Sat May 30 14:24:45 2020 +0800
[SCB-1956]rename project package to avoid random travis CI coverage error
---
demo/demo-local-registry/demo-local-registry-client/pom.xml | 2 +-
.../demo/{registry => localRegistryClient}/Application.java | 2 +-
.../{registry => localRegistryClient}/LocalRegistryServerTest.java | 2 +-
.../demo/{registry => localRegistryClient}/LocalRegistryIT.java | 3 ++-
demo/demo-local-registry/demo-local-registry-server/pom.xml | 2 +-
.../demo/{registry => localRegistryServer}/SelfServiceInvoker.java | 2 +-
.../demo/{registry => localRegistryServer}/ServerApplication.java | 2 +-
.../demo/{registry => localRegistryServer}/ServerEndpoint.java | 2 +-
8 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/demo/demo-local-registry/demo-local-registry-client/pom.xml b/demo/demo-local-registry/demo-local-registry-client/pom.xml
index 59ba7bd..92aced9 100644
--- a/demo/demo-local-registry/demo-local-registry-client/pom.xml
+++ b/demo/demo-local-registry/demo-local-registry-client/pom.xml
@@ -29,7 +29,7 @@
</parent>
<properties>
- <demo.main>org.apache.servicecomb.demo.registry.Application</demo.main>
+ <demo.main>org.apache.servicecomb.demo.localRegistryClient.Application</demo.main>
</properties>
<dependencies>
<dependency>
diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java
similarity index 96%
rename from demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java
rename to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java
index 358880e..9ee37a8 100644
--- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/Application.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/Application.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryClient;
import org.apache.servicecomb.demo.CategorizedTestCaseRunner;
import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java
similarity index 97%
rename from demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java
rename to demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java
index 7e76681..f0920bd 100644
--- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/registry/LocalRegistryServerTest.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryServerTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryClient;
import java.util.List;
diff --git a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
similarity index 90%
rename from demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java
rename to demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
index c2c5ec7..d8faa9d 100644
--- a/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java
+++ b/demo/demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/localRegistryClient/LocalRegistryIT.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryClient;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import org.apache.servicecomb.demo.TestMgr;
+import org.apache.servicecomb.demo.localRegistryClient.Application;
import org.junit.Before;
import org.junit.Test;
diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml b/demo/demo-local-registry/demo-local-registry-server/pom.xml
index 5906a11..f4f092e 100644
--- a/demo/demo-local-registry/demo-local-registry-server/pom.xml
+++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml
@@ -29,7 +29,7 @@
</parent>
<properties>
- <demo.main>org.apache.servicecomb.demo.registry.ServerApplication</demo.main>
+ <demo.main>org.apache.servicecomb.demo.localRegistryServer.ServerApplication</demo.main>
</properties>
<dependencies>
<dependency>
diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java
similarity index 96%
rename from demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java
rename to demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java
index 078b10c..0790cfe 100644
--- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java
+++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryServer;
import java.util.concurrent.CountDownLatch;
diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java
similarity index 96%
rename from demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java
rename to demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java
index 7d53303..525e562 100644
--- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java
+++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryServer;
import java.util.concurrent.TimeUnit;
diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java
similarity index 96%
rename from demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java
rename to demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java
index 595997f..41a9cd5 100644
--- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java
+++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.demo.registry;
+package org.apache.servicecomb.demo.localRegistryServer;
import javax.ws.rs.core.MediaType;