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/incubator-servicecomb-java-chassis.git
commit 258e6f64cdf86e0f85f665dda57e21dd0813be53 Author: yaohaishi <[email protected]> AuthorDate: Wed Sep 19 16:39:46 2018 +0800 [SCB-926] define and load StaticMicroserviceVersionFactory --- .../StaticMicroserviceVersionMetaFactory.java | 33 ++++++++++++++++++++++ .../config/ServiceRegistryConfig.java | 9 ++++-- .../serviceregistry/consumer/AppManager.java | 29 ++++++++++++++++++- .../serviceregistry/consumer/TestAppManager.java | 27 ++++++++++++++++++ 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/StaticMicroserviceVersionMetaFactory.java b/core/src/main/java/org/apache/servicecomb/core/definition/StaticMicroserviceVersionMetaFactory.java new file mode 100644 index 0000000..9fd8e5e --- /dev/null +++ b/core/src/main/java/org/apache/servicecomb/core/definition/StaticMicroserviceVersionMetaFactory.java @@ -0,0 +1,33 @@ +/* + * 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.core.definition; + +import org.apache.servicecomb.core.definition.classloader.MicroserviceClassLoaderFactory; +import org.apache.servicecomb.core.definition.classloader.PrivateMicroserviceClassLoaderFactory; +import org.apache.servicecomb.serviceregistry.api.registry.StaticMicroservice; +import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersion; +import org.apache.servicecomb.serviceregistry.consumer.StaticMicroserviceVersionFactory; + +public class StaticMicroserviceVersionMetaFactory implements StaticMicroserviceVersionFactory { + private final MicroserviceClassLoaderFactory classLoaderFactory = PrivateMicroserviceClassLoaderFactory.INSTANCE; + + @Override + public MicroserviceVersion create(StaticMicroservice microservice) { + return null; + } +} diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java index 23824a8..9832735 100644 --- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java +++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java @@ -86,16 +86,21 @@ public final class ServiceRegistryConfig { public static final String PROXY_PASSWD = PROXY_PRE_NAME + "passwd"; - private ServiceRegistryConfig() { } - public String getMicroserviceVersionFactory() { return DynamicPropertyFactory.getInstance().getStringProperty(MICROSERVICE_VERSION_FACTORY, null).get(); } + /** + * Currently we don't provide configuration about {@link org.apache.servicecomb.serviceregistry.consumer.StaticMicroserviceVersionFactory} + */ + public String getStaticMicroserviceVersionFactory() { + return "org.apache.servicecomb.core.definition.StaticMicroserviceVersionMetaFactory"; + } + public HttpVersion getHttpVersion() { DynamicStringProperty property = DynamicPropertyFactory.getInstance() diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/consumer/AppManager.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/consumer/AppManager.java index 0e0fb6a..4eef10f 100644 --- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/consumer/AppManager.java +++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/consumer/AppManager.java @@ -20,10 +20,16 @@ package org.apache.servicecomb.serviceregistry.consumer; import java.util.Map; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; +import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.eventbus.EventBus; public class AppManager { + + private static final Logger LOGGER = LoggerFactory.getLogger(AppManager.class); + private EventBus eventBus; private MicroserviceVersionFactory microserviceVersionFactory = new DefaultMicroserviceVersionFactory(); @@ -31,7 +37,7 @@ public class AppManager { // key: appId private Map<String, MicroserviceManager> apps = new ConcurrentHashMapEx<>(); - private StaticMicroserviceVersionFactory staticMicroserviceVersionFactory; + private volatile StaticMicroserviceVersionFactory staticMicroserviceVersionFactory; public AppManager(EventBus eventBus) { this.eventBus = eventBus; @@ -71,10 +77,31 @@ public class AppManager { } public StaticMicroserviceVersionFactory getStaticMicroserviceVersionFactory() { + if (null == staticMicroserviceVersionFactory) { + synchronized (this) { + if (null == staticMicroserviceVersionFactory) { + loadStaticMicroserviceVersionFactory(); + } + } + } return staticMicroserviceVersionFactory; } public void setStaticMicroserviceVersionFactory(StaticMicroserviceVersionFactory staticMicroserviceVersionFactory) { this.staticMicroserviceVersionFactory = staticMicroserviceVersionFactory; } + + private void loadStaticMicroserviceVersionFactory() { + String staticMicroserviceVersionFactoryClass = ServiceRegistryConfig.INSTANCE + .getStaticMicroserviceVersionFactory(); + try { + staticMicroserviceVersionFactory = (StaticMicroserviceVersionFactory) Class + .forName(staticMicroserviceVersionFactoryClass).newInstance(); + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + LOGGER.info("unable to load StaticMicroserviceVersionFactory", e); + // interrupt this loading process because this error cannot be covered by us. + throw new IllegalStateException("unable to load StaticMicroserviceVersionFactory", e); + } + LOGGER.info("staticMicroserviceVersionFactory is {}.", staticMicroserviceVersionFactoryClass); + } } diff --git a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestAppManager.java b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestAppManager.java index 3361689..e76d23b 100644 --- a/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestAppManager.java +++ b/service-registry/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestAppManager.java @@ -20,8 +20,10 @@ package org.apache.servicecomb.serviceregistry.consumer; import java.util.Collections; import org.apache.servicecomb.serviceregistry.RegistryUtils; +import org.apache.servicecomb.serviceregistry.api.registry.StaticMicroservice; import org.apache.servicecomb.serviceregistry.api.response.FindInstancesResponse; import org.apache.servicecomb.serviceregistry.client.http.MicroserviceInstances; +import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig; import org.apache.servicecomb.serviceregistry.definition.DefinitionConst; import org.junit.After; import org.junit.Assert; @@ -30,7 +32,10 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; +import mockit.Deencapsulation; import mockit.Expectations; +import mockit.Mock; +import mockit.MockUp; import mockit.Mocked; public class TestAppManager { @@ -97,4 +102,26 @@ public class TestAppManager { Assert.assertSame(microserviceVersionFactory, appManager.getMicroserviceVersionFactory()); } + + @Test + public void getStaticMicroserviceVersionFactory() { + new MockUp<ServiceRegistryConfig>() { + @Mock + String getStaticMicroserviceVersionFactory() { + return TestStaticMicroserviceVersionFactory.class.getName(); + } + }; + + Assert.assertNull(Deencapsulation.getField(appManager, "staticMicroserviceVersionFactory")); + + Assert.assertEquals(TestStaticMicroserviceVersionFactory.class, + appManager.getStaticMicroserviceVersionFactory().getClass()); + } + + static class TestStaticMicroserviceVersionFactory implements StaticMicroserviceVersionFactory { + @Override + public MicroserviceVersion create(StaticMicroservice microservice) { + return null; + } + } }
