liubao68 closed pull request #794: [SCB-671]Duplicate cse.xxx to
servicecomb.xxx forget dynamic config
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/794
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/demo/demo-springmvc/springmvc-client/pom.xml
b/demo/demo-springmvc/springmvc-client/pom.xml
index 92aad4267..6e66805ce 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 09a4d0e69..a4106e4b6 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 d2d201aa3..1c12b407f 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 void testSchemaNotChange() {
}
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 68fd39c7b..9c047c817 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 21f22426d..0ec833291 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 void updateConfiguration(WatchedUpdateResult
watchedUpdateResult) {
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 void updateConfiguration(WatchedUpdateResult
watchedUpdateResult) {
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 void updateConfiguration(WatchedUpdateResult
watchedUpdateResult) {
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 9429330a2..f6e14480b 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 void duplicateServiceCombConfigToCseListValue() {
@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 void
propertiesAddFromDynamicConfigSourceIsDuplicated() {
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 void
propertiesAddFromDynamicConfigSourceIsDuplicated() {
@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 void
propertiesChangeFromDynamicConfigSourceIsDuplicated() {
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 void
propertiesChangeFromDynamicConfigSourceIsDuplicated() {
@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 void
propertiesDeleteFromDynamicConfigSourceIsDuplicated() {
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(),
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
