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 2019/03/21 10:09:52 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1211] avoid
create multiple caches for different expression of one versionRule
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 72cd0e1 [SCB-1211] avoid create multiple caches for different expression of one versionRule
72cd0e1 is described below
commit 72cd0e137c4a0c3b899adfa6e19e2fd590743014
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Mar 21 17:11:34 2019 +0800
[SCB-1211] avoid create multiple caches for different expression of one versionRule
---
.../core/provider/consumer/ReferenceConfig.java | 3 ++
.../provider/consumer/TestReferenceConfig.java | 42 ++++++++++++++++------
.../config/ConfigurationSpringInitializer.java | 1 +
3 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/ReferenceConfig.java b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/ReferenceConfig.java
index 69b576f..fede53c 100644
--- a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/ReferenceConfig.java
+++ b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/ReferenceConfig.java
@@ -23,6 +23,7 @@ import org.apache.servicecomb.core.definition.MicroserviceVersionMeta;
import org.apache.servicecomb.serviceregistry.consumer.AppManager;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersion;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersionRule;
+import org.apache.servicecomb.serviceregistry.version.VersionRuleUtils;
public class ReferenceConfig {
private MicroserviceVersionRule microserviceVersionRule;
@@ -33,6 +34,8 @@ public class ReferenceConfig {
}
public ReferenceConfig(AppManager appManager, String microserviceName, String versionRule, String transport) {
+ versionRule = VersionRuleUtils.getOrCreate(versionRule).getVersionRule();
+
String appId = new MicroserviceMeta(microserviceName).getAppId();
this.microserviceVersionRule = appManager.getOrCreateMicroserviceVersionRule(appId,
microserviceName,
diff --git a/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestReferenceConfig.java b/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestReferenceConfig.java
index fa65f67..485dc51 100644
--- a/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestReferenceConfig.java
+++ b/core/src/test/java/org/apache/servicecomb/core/provider/consumer/TestReferenceConfig.java
@@ -17,30 +17,28 @@
package org.apache.servicecomb.core.provider.consumer;
+import java.util.Collections;
+
import org.apache.servicecomb.core.Const;
import org.apache.servicecomb.core.definition.MicroserviceMeta;
import org.apache.servicecomb.core.definition.MicroserviceVersionMeta;
+import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.serviceregistry.consumer.AppManager;
import org.apache.servicecomb.serviceregistry.consumer.MicroserviceVersionRule;
import org.apache.servicecomb.serviceregistry.definition.DefinitionConst;
import org.junit.Assert;
import org.junit.Test;
+import com.google.common.eventbus.EventBus;
+
import mockit.Expectations;
import mockit.Mocked;
public class TestReferenceConfig {
- @Mocked
- MicroserviceMeta microserviceMeta;
-
- @Mocked
- MicroserviceVersionRule microserviceVersionRule;
-
- @Mocked
- MicroserviceVersionMeta microserviceVersionMeta;
-
@Test
- public void constructNoParam() {
+ public void constructNoParam(@Mocked MicroserviceMeta microserviceMeta,
+ @Mocked MicroserviceVersionMeta microserviceVersionMeta,
+ @Mocked MicroserviceVersionRule microserviceVersionRule) {
new Expectations() {
{
microserviceVersionMeta.getMicroserviceMeta();
@@ -85,4 +83,28 @@ public class TestReferenceConfig {
Assert.assertSame(microserviceVersionRule, referenceConfig.getMicroserviceVersionRule());
Assert.assertSame(transport, referenceConfig.getTransport());
}
+
+ @Test
+ public void unifyVersionRule(@Mocked MicroserviceVersionMeta microserviceVersionMeta) {
+ String microserviceName = "app:ms";
+ String transport = Const.ANY_TRANSPORT;
+
+ new Expectations(RegistryUtils.class) {
+ {
+ RegistryUtils.findServiceInstances(anyString, anyString, anyString, anyString);
+ result = Collections.emptyList();
+ }
+ };
+ AppManager appManager = new AppManager(new EventBus());
+
+ ReferenceConfig referenceConfig = new ReferenceConfig(appManager, microserviceName,
+ "0+",
+ transport);
+ Assert.assertEquals("0.0.0.0+", referenceConfig.getVersionRule());
+
+ referenceConfig = new ReferenceConfig(appManager, microserviceName,
+ "1.0.0+",
+ transport);
+ Assert.assertEquals("1.0.0.0+", referenceConfig.getVersionRule());
+ }
}
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationSpringInitializer.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationSpringInitializer.java
index 8d9ab07..00a62c5 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationSpringInitializer.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigurationSpringInitializer.java
@@ -123,6 +123,7 @@ public class ConfigurationSpringInitializer extends PropertyPlaceholderConfigure
});
}
}
+
@Override
protected Properties mergeProperties() throws IOException {
Properties properties = super.mergeProperties();