This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from 3138a19 [#2272]fix problem of grey release not use latest version
when version changed(#2384)
new b74bcd7 [SCB-2273]support kie latest layered configuration. Part1:
kie implementation
new 23e0feb [SCB-2273]support kie latest layered configuration. Part2:
config center implementation
new d666309 [SCB-2273]support kie latest layered configuration. Part3:
add integration tests and fix all problems found
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../config/center/client/AddressManager.java | 4 +
.../config/center/client/ConfigCenterManager.java | 20 +-
.../servicecomb/config/common/ConfigConverter.java | 92 +++++
.../servicecomb/config/kie/client/KieClient.java | 148 ++-----
.../config/kie/client/KieConfigManager.java | 87 ++++-
.../kie/client/model/ConfigurationsRequest.java | 61 +--
.../client/model/ConfigurationsRequestFactory.java | 94 +++++
.../config/kie/client/model/KieAddressManager.java | 19 +-
.../config/kie/client/model/KieConfiguration.java | 152 ++++++++
.../servicecomb/http/client/task/AbstractTask.java | 27 +-
.../center/client/ServiceCenterDiscovery.java | 35 +-
.../center/client/ServiceCenterRegistration.java | 38 +-
.../client/model/ServiceCenterConfiguration.java | 24 +-
.../core/ConfigurationSpringInitializer.java | 34 +-
demo/README.md | 6 +-
demo/demo-cse-v1/README.md | 18 +
demo/demo-cse-v1/consumer/pom.xml | 47 +++
.../servicecomb/samples/ConsumerApplication.java | 24 +-
.../samples/ConsumerConfigController.java | 50 +++
.../samples/ConsumerConfigurationProperties.java | 28 +-
.../servicecomb/samples/ConsumerController.java | 28 +-
.../servicecomb/samples/ProviderService.java | 6 +-
.../consumer/src/main/resources/application.yml | 45 +++
.../consumer/src/main/resources/log4j2.xml | 45 +++
.../demo-cse-v1/gateway}/pom.xml | 51 +--
.../servicecomb/samples/GatewayApplication.java | 23 +-
.../gateway/src/main/resources/application.yml | 59 +++
.../gateway/src/main/resources/log4j2.xml | 45 +++
.../config-kie => demo/demo-cse-v1}/pom.xml | 50 +--
demo/demo-cse-v1/provider/pom.xml | 51 +++
.../servicecomb/samples/ProviderApplication.java | 24 +-
.../servicecomb/samples/ProviderController.java | 23 +-
.../provider/src/main/resources/application.yml | 47 +++
.../provider/src/main/resources/log4j2.xml | 45 +++
.../demo-cse-v1/test-client}/pom.xml | 56 ++-
.../org/apache/servicecomb/samples/Config.java | 11 +-
.../servicecomb/samples/ConsumerConfigIT.java | 48 +++
.../apache/servicecomb/samples/HelloWorldIT.java | 37 +-
.../servicecomb/samples/TestClientApplication.java | 47 +++
.../test-client/src/main/resources/application.yml | 47 +++
.../test-client/src/main/resources/log4j2.xml | 45 +++
demo/demo-cse-v2/README.md | 81 ++++
demo/demo-cse-v2/consumer/pom.xml | 47 +++
.../servicecomb/samples/ConsumerApplication.java | 24 +-
.../samples/ConsumerConfigController.java | 60 +++
.../samples/ConsumerConfigurationProperties.java | 48 ++-
.../servicecomb/samples/ConsumerController.java | 28 +-
.../servicecomb/samples/ProviderService.java | 6 +-
.../consumer/src/main/resources/application.yml | 38 ++
.../consumer/src/main/resources/log4j2.xml | 45 +++
.../demo-cse-v2/gateway}/pom.xml | 51 +--
.../servicecomb/samples/GatewayApplication.java | 23 +-
.../gateway/src/main/resources/application.yml | 59 +++
.../gateway/src/main/resources/log4j2.xml | 45 +++
.../config-kie => demo/demo-cse-v2}/pom.xml | 50 +--
demo/demo-cse-v2/provider/pom.xml | 51 +++
.../servicecomb/samples/ProviderApplication.java | 24 +-
.../servicecomb/samples/ProviderController.java | 48 +--
.../provider/src/main/resources/application.yml | 40 ++
.../provider/src/main/resources/log4j2.xml | 45 +++
.../demo-cse-v2/test-client}/pom.xml | 56 ++-
.../org/apache/servicecomb/samples/Config.java | 19 +-
.../servicecomb/samples/ConsumerConfigIT.java | 56 +++
.../apache/servicecomb/samples/HelloWorldIT.java | 26 +-
.../servicecomb/samples/TestClientApplication.java | 47 +++
.../test-client/src/main/resources/application.yml | 47 +++
.../test-client/src/main/resources/log4j2.xml | 45 +++
.../RegistryClientTest.java | 5 +-
.../demo/springmvc/client/SpringmvcClient.java | 2 -
demo/pom.xml | 2 +
dynamic-config/config-cc/pom.xml | 4 +
.../config/{client => }/ConfigCenterConfig.java | 53 ++-
.../ConfigCenterConfigurationSourceImpl.java | 201 ++++++++++
.../apache/servicecomb/config/TransportUtils.java | 123 ++++++
.../ConfigCenterConfigurationSourceImpl.java | 171 ---------
.../config/client/ConfigCenterClient.java | 427 ---------------------
.../client/ConfigCenterHttpClientOptionsSPI.java | 177 ---------
.../servicecomb/config/client/MemberDiscovery.java | 90 -----
.../config/client/ParseConfigUtils.java | 183 ---------
.../apache/servicecomb/config/client/URIConst.java | 42 --
...comb.config.spi.ConfigCenterConfigurationSource | 2 +-
.../TestConfigCenterConfigurationSource.java | 124 ------
.../config/client/TestConfigCenterClient.java | 353 -----------------
.../config/client/TestConfigCenterConfig.java | 56 ---
.../config/client/TestMemberDiscovery.java | 84 ----
.../config/client/TestParseConfigUtils.java | 122 ------
.../servicecomb/config/client/TestURIConst.java | 60 ---
...TestConfigCenterDefaultDeploymentProvider.java} | 2 +-
dynamic-config/config-kie/pom.xml | 4 +
.../config/kie/{client => }/KieConfig.java | 72 +++-
.../config/kie/KieConfigurationSourceImpl.java | 182 +++++++++
.../servicecomb/config/kie/TransportUtils.java | 123 ++++++
.../sources/KieConfigurationSourceImpl.java | 138 -------
.../kie/client/ConfigKieHttpClientOptionsSPI.java | 175 ---------
.../servicecomb/config/kie/client/KieClient.java | 176 ---------
.../servicecomb/config/kie/client/KieUtil.java | 154 --------
.../servicecomb/config/kie/client/KieWatcher.java | 86 -----
.../servicecomb/config/kie/model/KVBody.java | 65 ----
.../apache/servicecomb/config/kie/model/KVDoc.java | 127 ------
...comb.config.spi.ConfigCenterConfigurationSource | 2 +-
.../config/kie/client/TestKieClient.java | 200 ----------
.../config/kie/client/TestKieConfig.java | 46 ---
.../servicecomb/config/kie/client/TestKieUtil.java | 62 ---
.../config/kie/client/TestKieWatcher.java | 54 ---
.../kie/sources/TestKieConfigurationSource.java | 96 -----
.../org/apache/servicecomb/config/ConfigUtil.java | 7 +-
{demo => integration-tests}/README.md | 6 +-
.../client/http/ServiceRegistryClientImpl.java | 4 +-
.../task/ServiceCenterTaskMonitor.java | 2 +-
solutions/solution-basic/pom.xml | 5 +-
110 files changed, 3077 insertions(+), 3942 deletions(-)
create mode 100644
clients/config-common/src/main/java/org/apache/servicecomb/config/common/ConfigConverter.java
create mode 100644
clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequestFactory.java
create mode 100644
clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/KieConfiguration.java
copy
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnFailEvent.java
=>
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/ServiceCenterConfiguration.java
(55%)
create mode 100644 demo/demo-cse-v1/README.md
create mode 100644 demo/demo-cse-v1/consumer/pom.xml
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
(55%)
create mode 100644
demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerConfigController.java
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/ConnFailEvent.java
=>
demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerConfigurationProperties.java
(61%)
copy
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnFailEvent.java
=>
demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
(50%)
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/ConnSuccEvent.java
=>
demo/demo-cse-v1/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
(88%)
create mode 100644 demo/demo-cse-v1/consumer/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v1/consumer/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v1/gateway}/pom.xml (51%)
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v1/gateway/src/main/java/org/apache/servicecomb/samples/GatewayApplication.java
(57%)
create mode 100644 demo/demo-cse-v1/gateway/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v1/gateway/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v1}/pom.xml (56%)
create mode 100644 demo/demo-cse-v1/provider/pom.xml
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
(55%)
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v1/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
(58%)
create mode 100644 demo/demo-cse-v1/provider/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v1/provider/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v1/test-client}/pom.xml (51%)
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/ValueType.java
=>
demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/Config.java
(86%)
create mode 100644
demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/LabelDocResponse.java
=>
demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
(56%)
create mode 100644
demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/TestClientApplication.java
create mode 100644
demo/demo-cse-v1/test-client/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v1/test-client/src/main/resources/log4j2.xml
create mode 100644 demo/demo-cse-v2/README.md
create mode 100644 demo/demo-cse-v2/consumer/pom.xml
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerApplication.java
(55%)
create mode 100644
demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerConfigController.java
copy
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
=>
demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerConfigurationProperties.java
(50%)
copy
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnFailEvent.java
=>
demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
(50%)
rename
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnSuccEvent.java
=>
demo/demo-cse-v2/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
(88%)
create mode 100644 demo/demo-cse-v2/consumer/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v2/consumer/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v2/gateway}/pom.xml (51%)
copy
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v2/gateway/src/main/java/org/apache/servicecomb/samples/GatewayApplication.java
(57%)
create mode 100644 demo/demo-cse-v2/gateway/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v2/gateway/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v2}/pom.xml (56%)
create mode 100644 demo/demo-cse-v2/provider/pom.xml
rename
clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterConfiguration.java
=>
demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderApplication.java
(55%)
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVResponse.java
=>
demo/demo-cse-v2/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
(58%)
create mode 100644 demo/demo-cse-v2/provider/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v2/provider/src/main/resources/log4j2.xml
copy {dynamic-config/config-kie => demo/demo-cse-v2/test-client}/pom.xml (51%)
copy
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnFailEvent.java
=>
demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/Config.java
(75%)
create mode 100644
demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
rename
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConnFailEvent.java
=>
demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
(56%)
create mode 100644
demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/TestClientApplication.java
create mode 100644
demo/demo-cse-v2/test-client/src/main/resources/application.yml
create mode 100644 demo/demo-cse-v2/test-client/src/main/resources/log4j2.xml
rename
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/{client =>
}/ConfigCenterConfig.java (85%)
create mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java
create mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/TransportUtils.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterHttpClientOptionsSPI.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java
delete mode 100644
dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/URIConst.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/archaius/sources/TestConfigCenterConfigurationSource.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestMemberDiscovery.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestParseConfigUtils.java
delete mode 100644
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestURIConst.java
rename
dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/collect/{TestConfigCenterDefaultDeploymentProvder.java
=> TestConfigCenterDefaultDeploymentProvider.java} (98%)
rename
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/{client
=> }/KieConfig.java (66%)
create mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/KieConfigurationSourceImpl.java
create mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/TransportUtils.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/archaius/sources/KieConfigurationSourceImpl.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/ConfigKieHttpClientOptionsSPI.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieClient.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieUtil.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/client/KieWatcher.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVBody.java
delete mode 100644
dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/model/KVDoc.java
delete mode 100644
dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieClient.java
delete mode 100644
dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieConfig.java
delete mode 100644
dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieUtil.java
delete mode 100644
dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/client/TestKieWatcher.java
delete mode 100644
dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/sources/TestKieConfigurationSource.java
copy {demo => integration-tests}/README.md (60%)
