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/04/27 06:11:03 UTC
[incubator-servicecomb-java-chassis] branch master updated:
[SCB-521] Config of Spring Boot should takes higher priority than
microservice.yaml
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
The following commit(s) were added to refs/heads/master by this push:
new 122a486 [SCB-521] Config of Spring Boot should takes higher priority than microservice.yaml
122a486 is described below
commit 122a4865de381986700705eb8d7dcf286b294007
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Thu Apr 26 19:48:56 2018 +0800
[SCB-521] Config of Spring Boot should takes higher priority than microservice.yaml
---
.../main/java/org/apache/servicecomb/config/ConfigUtil.java | 10 +++++-----
.../java/org/apache/servicecomb/config/TestConfigUtil.java | 5 +++--
.../foundation-config/src/test/resources/microservice.yaml | 2 +-
.../src/test/resources/application.properties | 1 -
.../spring-jaxrs-tests/src/test/resources/microservice.yaml | 1 +
.../src/test/resources/application.properties | 3 +--
.../src/test/resources/microservice.yaml | 1 +
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
index a5ff2e6..bb3b413 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
@@ -130,17 +130,17 @@ public final class ConfigUtil {
duplicateServiceCombConfigToCse(config,
convertEnvVariable(new ConcurrentMapConfiguration(new EnvironmentConfiguration())),
"configFromEnvironment");
- duplicateServiceCombConfigToCse(config,
- new DynamicConfiguration(
- new MicroserviceConfigurationSource(configModelList), new NeverStartPollingScheduler()),
- "configFromYamlFile");
- // If there is extra configurations, add it into config. Extra config has lowest priority.
+ // If there is extra configurations, add it into config.
EXTRA_CONFIG_MAP.entrySet().stream()
.filter(mapEntry -> !mapEntry.getValue().isEmpty())
.forEachOrdered(configMapEntry ->
duplicateServiceCombConfigToCse(config,
new ConcurrentMapConfiguration(configMapEntry.getValue()),
configMapEntry.getKey()));
+ duplicateServiceCombConfigToCse(config,
+ new DynamicConfiguration(
+ new MicroserviceConfigurationSource(configModelList), new NeverStartPollingScheduler()),
+ "configFromYamlFile");
return config;
}
diff --git a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
index b10142d..cd04d4e 100644
--- a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
+++ b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/TestConfigUtil.java
@@ -326,14 +326,15 @@ public class TestConfigUtil {
String extraConfigValue = "value";
String overriddenConfigKey = "servicecomb.cse.servicecomb.file";
extraConfig.put(extraConfigKey, extraConfigValue);
- extraConfig.put(overriddenConfigKey, "should_be_overridden");
+ final String propertyHigherPriority = "higher_priority";
+ extraConfig.put(overriddenConfigKey, propertyHigherPriority);
ConfigUtil.addExtraConfig("testExtraConfig", extraConfig);
ConcurrentCompositeConfiguration localConfiguration = ConfigUtil.createLocalConfig();
Assert.assertEquals(extraConfigValue, localConfiguration.getProperty(extraConfigKey));
- Assert.assertEquals("value", localConfiguration.getString(overriddenConfigKey));
+ Assert.assertEquals(propertyHigherPriority, localConfiguration.getString(overriddenConfigKey));
}
@SuppressWarnings("unchecked")
diff --git a/foundations/foundation-config/src/test/resources/microservice.yaml b/foundations/foundation-config/src/test/resources/microservice.yaml
index f439829..a7b1237 100644
--- a/foundations/foundation-config/src/test/resources/microservice.yaml
+++ b/foundations/foundation-config/src/test/resources/microservice.yaml
@@ -64,4 +64,4 @@ service_description:
servicecomb:
cse:
servicecomb:
- file: value
+ file: value # this is a config for TestConfigUtil.testCreateLocalConfigWithExtraConfig()
diff --git a/integration-tests/spring-jaxrs-tests/src/test/resources/application.properties b/integration-tests/spring-jaxrs-tests/src/test/resources/application.properties
index 39d0201..79e10ad 100644
--- a/integration-tests/spring-jaxrs-tests/src/test/resources/application.properties
+++ b/integration-tests/spring-jaxrs-tests/src/test/resources/application.properties
@@ -16,5 +16,4 @@
#
property.test0=from_properties
-property.test4=from_properties
property.test5=from_properties
diff --git a/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml b/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml
index 49937a2..16660f6 100644
--- a/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/spring-jaxrs-tests/src/test/resources/microservice.yaml
@@ -16,5 +16,6 @@
# ---------------------------------------------------------------------------
property:
+ test2: from_microservice_yaml
test4: from_microservice_yaml
test5: from_microservice_yaml
diff --git a/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties b/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties
index 9c2440b..1714965 100644
--- a/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties
+++ b/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties
@@ -18,5 +18,4 @@
spring.main.web-environment=true
property.test0=from_properties
-property.test4=from_properties
-property.test5=from_properties
\ No newline at end of file
+property.test5=from_properties
diff --git a/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml b/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
index ca417ce..0859d00 100644
--- a/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
+++ b/integration-tests/spring-zuul-tracing-tests/src/test/resources/microservice.yaml
@@ -38,5 +38,6 @@ servicecomb:
address: http://localhost:9411/
property:
+ test2: from_microservice_yaml
test4: from_microservice_yaml
test5: from_microservice_yaml
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.