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 a9c0eec [SCB-671]Duplicate cse.xxx to servicecomb.xxx forget dynamic
config
a9c0eec is described below
commit a9c0eec466ba8398f2c8be64c45fc090ee31c3b3
Author: liubao <[email protected]>
AuthorDate: Fri Jul 6 10:58:30 2018 +0800
[SCB-671]Duplicate cse.xxx to servicecomb.xxx forget dynamic config
---
demo/demo-springmvc/springmvc-client/pom.xml | 4 ++++
.../src/main/resources/microservice.yaml | 8 +++++++-
.../springmvc/server/ProducerTestsAfterBootup.java | 2 +-
.../src/main/resources/microservice.yaml | 5 +++--
.../org/apache/servicecomb/config/ConfigUtil.java | 12 +++++------
.../apache/servicecomb/config/TestConfigUtil.java | 24 +++++++++++-----------
6 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/demo/demo-springmvc/springmvc-client/pom.xml
b/demo/demo-springmvc/springmvc-client/pom.xml
index 92aad42..6e66805 100644
--- a/demo/demo-springmvc/springmvc-client/pom.xml
+++ b/demo/demo-springmvc/springmvc-client/pom.xml
@@ -41,6 +41,10 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>provider-pojo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>config-cc</artifactId>
+ </dependency>
</dependencies>
<properties>
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
b/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
index 09a4d0e..a4106e4 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
+++ b/demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
@@ -18,7 +18,6 @@
APPLICATION_ID: springmvctest
service_description:
name: springmvcClient
- environment: development
version: 0.0.1
servicecomb:
service:
@@ -36,6 +35,13 @@ servicecomb:
interval: 90
watch: false
autodiscovery: true
+# can download config center from
https://cse-bucket.obs.myhwclouds.com/LocalCSE/Local-CSE-1.0.0.zip to test
dynamic config
+ config:
+ client:
+ serverUri: http://127.0.0.1:30113
+ refreshMode: 1
+ refresh_interval: 5000
+ refreshPort: 30114
rest:
client:
connection:
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
index d2d201a..1c12b40 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
@@ -59,7 +59,7 @@ public class ProducerTestsAfterBootup implements BootListener
{
}
public void testRegisterPath() {
- TestMgr.check(RegistryUtils.getMicroservice().getPaths().size(), 9);
+ TestMgr.check(RegistryUtils.getMicroservice().getPaths().size(), 10);
}
private String getSwaggerContent(Swagger swagger) {
try {
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
index 68fd39c..9c047c8 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
+++ b/demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
@@ -21,7 +21,6 @@ APPLICATION_ID: springmvctest
service_description:
name: springmvc
version: 0.0.3
- environment: development
paths:
- path: /test1/testpath
property:
@@ -45,11 +44,13 @@ servicecomb:
interval: 10
watch: false
autodiscovery: true
+# can download config center from
https://cse-bucket.obs.myhwclouds.com/LocalCSE/Local-CSE-1.0.0.zip to test
dynamic config
config:
client:
- serverUri: http://127.0.0.1:30103,http://127.0.0.2:30103
+ serverUri: http://127.0.0.1:30113
refreshMode: 0
refresh_interval: 5000
+ refreshPort: 30114
uploads:
directory: target
rest:
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 21f2242..0ec8332 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
@@ -289,8 +289,8 @@ public final class ConfigUtil {
Map<String, Object> adds = watchedUpdateResult.getAdded();
if (adds != null) {
for (String add : adds.keySet()) {
- if (add.startsWith(CONFIG_SERVICECOMB_PREFIX)) {
- String key = CONFIG_CSE_PREFIX + add.substring(add.indexOf(".") +
1);
+ if (add.startsWith(CONFIG_CSE_PREFIX)) {
+ String key = CONFIG_SERVICECOMB_PREFIX +
add.substring(add.indexOf(".") + 1);
injectConfig.addProperty(key, adds.get(add));
}
}
@@ -299,8 +299,8 @@ public final class ConfigUtil {
Map<String, Object> deletes = watchedUpdateResult.getDeleted();
if (deletes != null) {
for (String delete : deletes.keySet()) {
- if (delete.startsWith(CONFIG_SERVICECOMB_PREFIX)) {
- injectConfig.clearProperty(CONFIG_CSE_PREFIX +
delete.substring(delete.indexOf(".") + 1));
+ if (delete.startsWith(CONFIG_CSE_PREFIX)) {
+ injectConfig.clearProperty(CONFIG_SERVICECOMB_PREFIX +
delete.substring(delete.indexOf(".") + 1));
}
}
}
@@ -308,8 +308,8 @@ public final class ConfigUtil {
Map<String, Object> changes = watchedUpdateResult.getChanged();
if (changes != null) {
for (String change : changes.keySet()) {
- if (change.startsWith(CONFIG_SERVICECOMB_PREFIX)) {
- String key = CONFIG_CSE_PREFIX +
change.substring(change.indexOf(".") + 1);
+ if (change.startsWith(CONFIG_CSE_PREFIX)) {
+ String key = CONFIG_SERVICECOMB_PREFIX +
change.substring(change.indexOf(".") + 1);
injectConfig.setProperty(key, changes.get(change));
}
}
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 9429330..f6e1448 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
@@ -192,8 +192,8 @@ public class TestConfigUtil {
@Test
public void propertiesAddFromDynamicConfigSourceIsDuplicated() {
String expected = uniquify("ran");
- String someProperty = "servicecomb.cse.servicecomb.add";
- String injectProperty = "cse.cse.servicecomb.add";
+ String someProperty = "cse.cse.servicecomb.add";
+ String injectProperty = "servicecomb.cse.servicecomb.add";
configurationSource.addProperty(someProperty, expected);
@@ -211,8 +211,8 @@ public class TestConfigUtil {
equalTo(changed));
expected = uniquify("ran");
- someProperty = "servicecomb.servicecomb.cse.add";
- injectProperty = "cse.servicecomb.cse.add";
+ someProperty = "cse.servicecomb.cse.add";
+ injectProperty = "servicecomb.servicecomb.cse.add";
configurationSource.addProperty(someProperty, expected);
@@ -233,8 +233,8 @@ public class TestConfigUtil {
@Test
public void propertiesChangeFromDynamicConfigSourceIsDuplicated() {
String expected = uniquify("ran");
- String someProperty = "servicecomb.cse.servicecomb.change";
- String injectProperty = "cse.cse.servicecomb.change";
+ String someProperty = "cse.cse.servicecomb.change";
+ String injectProperty = "servicecomb.cse.servicecomb.change";
configurationSource.addProperty(someProperty, expected);
assertThat(DynamicPropertyFactory.getInstance().getStringProperty(someProperty,
null).get(),
@@ -251,8 +251,8 @@ public class TestConfigUtil {
equalTo(changed));
expected = uniquify("ran");
- someProperty = "servicecomb.servicecomb.cse.change";
- injectProperty = "cse.servicecomb.cse.change";
+ someProperty = "cse.servicecomb.cse.change";
+ injectProperty = "servicecomb.servicecomb.cse.change";
configurationSource.addProperty(someProperty, expected);
assertThat(DynamicPropertyFactory.getInstance().getStringProperty(someProperty,
null).get(),
equalTo(expected));
@@ -271,8 +271,8 @@ public class TestConfigUtil {
@Test
public void propertiesDeleteFromDynamicConfigSourceIsDuplicated() {
String expected = uniquify("ran");
- String someProperty = "servicecomb.cse.servicecomb.delete";
- String injectProperty = "cse.cse.servicecomb.delete";
+ String someProperty = "cse.cse.servicecomb.delete";
+ String injectProperty = "servicecomb.cse.servicecomb.delete";
configurationSource.addProperty(someProperty, expected);
assertThat(DynamicPropertyFactory.getInstance().getStringProperty(someProperty,
null).get(),
@@ -288,8 +288,8 @@ public class TestConfigUtil {
equalTo(null));
expected = uniquify("ran");
- someProperty = "servicecomb.servicecomb.cse.delete";
- injectProperty = "cse.servicecomb.cse.delete";
+ someProperty = "cse.servicecomb.cse.delete";
+ injectProperty = "servicecomb.servicecomb.cse.delete";
configurationSource.addProperty(someProperty, expected);
assertThat(DynamicPropertyFactory.getInstance().getStringProperty(someProperty,
null).get(),
