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 2021/03/23 10:40:11 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2235] should
init microservice.framework for all registry type (#2311)
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
The following commit(s) were added to refs/heads/master by this push:
new c5a929e [SCB-2235] should init microservice.framework for all registry type (#2311)
c5a929e is described below
commit c5a929e16dea239024da00715b9510cec5112282
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue Mar 23 18:40:01 2021 +0800
[SCB-2235] should init microservice.framework for all registry type (#2311)
---
.../registry/api/registry/MicroserviceFactory.java | 12 ++++++++++++
.../registry}/api/registry/ServiceCombVersion.java | 2 +-
.../org.apache.servicecomb.registry.api.Versions | 2 +-
.../registry}/api/registry/TestServiceCombVersion.java | 3 +--
.../registry/AbstractServiceRegistry.java | 18 +++++-------------
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceFactory.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceFactory.java
index 1e2ba3a..a66328a 100644
--- a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceFactory.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/MicroserviceFactory.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.registry.api.registry;
import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.APP_MAPPING;
+import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_DEFAULT_REGISTER_BY;
+import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_FRAMEWORK_DEFAULT_NAME;
import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.SERVICE_MAPPING;
import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.VERSION_MAPPING;
@@ -82,6 +84,16 @@ public class MicroserviceFactory {
microservice.getServiceName()));
}
+ microservice.setFramework(createFramework());
+ microservice.setRegisterBy(CONFIG_DEFAULT_REGISTER_BY);
+
return microservice;
}
+
+ private Framework createFramework() {
+ Framework framework = new Framework();
+ framework.setName(CONFIG_FRAMEWORK_DEFAULT_NAME);
+ framework.setVersion(FrameworkVersions.allVersions());
+ return framework;
+ }
}
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/ServiceCombVersion.java b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/ServiceCombVersion.java
similarity index 95%
rename from service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/ServiceCombVersion.java
rename to foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/ServiceCombVersion.java
index ca2b8e7..61b8ba0 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/ServiceCombVersion.java
+++ b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/api/registry/ServiceCombVersion.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicecomb.serviceregistry.api.registry;
+package org.apache.servicecomb.registry.api.registry;
import java.util.HashMap;
import java.util.Map;
diff --git a/service-registry/registry-service-center/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions b/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions
similarity index 91%
rename from service-registry/registry-service-center/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions
rename to foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions
index 006f229..faf43b0 100644
--- a/service-registry/registry-service-center/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions
+++ b/foundations/foundation-registry/src/main/resources/META-INF/services/org.apache.servicecomb.registry.api.Versions
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.serviceregistry.api.registry.ServiceCombVersion
+org.apache.servicecomb.registry.api.registry.ServiceCombVersion
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCombVersion.java b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/api/registry/TestServiceCombVersion.java
similarity index 95%
rename from service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCombVersion.java
rename to foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/api/registry/TestServiceCombVersion.java
index 6ceac65..2ae6ee0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCombVersion.java
+++ b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/api/registry/TestServiceCombVersion.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.servicecomb.serviceregistry.api.registry;
+package org.apache.servicecomb.registry.api.registry;
import org.junit.Assert;
import org.junit.Test;
public class TestServiceCombVersion {
-
@Test
public void testServiceCombVersion() {
ServiceCombVersion version = new ServiceCombVersion();
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 1d34004..78a945f 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
@@ -16,9 +16,6 @@
*/
package org.apache.servicecomb.serviceregistry.registry;
-import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_DEFAULT_REGISTER_BY;
-import static org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_FRAMEWORK_DEFAULT_NAME;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,8 +29,6 @@ import org.apache.servicecomb.registry.api.event.task.RecoveryEvent;
import org.apache.servicecomb.registry.api.event.task.SafeModeChangeEvent;
import org.apache.servicecomb.registry.api.event.task.ShutdownEvent;
import org.apache.servicecomb.registry.api.registry.BasePath;
-import org.apache.servicecomb.registry.api.registry.Framework;
-import org.apache.servicecomb.registry.api.registry.FrameworkVersions;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceFactory;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
@@ -131,19 +126,11 @@ public abstract class AbstractServiceRegistry implements ServiceRegistry {
public void run() {
loadStaticConfiguration();
- loadFrameworkVersions();
// try register
// if failed, then retry in thread
serviceCenterTask.init();
}
- private void loadFrameworkVersions() {
- Framework framework = new Framework();
- framework.setName(CONFIG_FRAMEWORK_DEFAULT_NAME);
- framework.setVersion(FrameworkVersions.allVersions());
- microservice.setFramework(framework);
- microservice.setRegisterBy(CONFIG_DEFAULT_REGISTER_BY);
- }
private void loadStaticConfiguration() {
// TODO 如果yaml定义了paths规则属性，替换默认值，现需要DynamicPropertyFactory支持数组获取
@@ -231,6 +218,7 @@ public abstract class AbstractServiceRegistry implements ServiceRegistry {
return success;
}
+ @Override
public Microservice getRemoteMicroservice(String microserviceId) {
return srClient.getMicroservice(microserviceId);
}
@@ -240,18 +228,22 @@ public abstract class AbstractServiceRegistry implements ServiceRegistry {
return srClient.getAggregatedMicroservice(microserviceId);
}
+ @Override
public Microservice getMicroservice() {
return microservice;
}
+ @Override
public List<Microservice> getAllMicroservices() {
return srClient.getAllMicroservices();
}
+ @Override
public MicroserviceInstance getMicroserviceInstance() {
return microservice.getInstance();
}
+ @Override
public void destroy() {
eventBus.post(new ShutdownEvent());
unregisterInstance();