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/01/10 06:29:14 UTC
[incubator-servicecomb-java-chassis] branch master updated (1157f66
-> cd6baf1)
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/incubator-servicecomb-java-chassis.git.
from 1157f66 SCB-85 simple metrics write file examples
new 8ae14e8 SCB-36 Support dynamic configuration for chassis by integrating with Apollo.
new 1234e3a SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
new 69083f3 SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
new 68bc800 SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
new 6b61d47 SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
new 4b3e399 SCB-36 remove control flag: dynamic.config.enable, use original cse.config.client.serverUri to indicate whether to use config center.
new cd6baf1 SCB-36 use enum to store configuration actions
The 7 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:
coverage-reports/pom.xml | 4 +
.../config-apollo}/pom.xml | 21 ++-
.../sources/ApolloConfigurationSourceImpl.java | 83 +++++-----
.../io/servicecomb/config/client/ApolloClient.java | 168 +++++++++++++++++++++
.../io/servicecomb/config/client/ApolloConfig.java | 89 +++++++++++
.../config/client/ConfigurationAction.java | 8 +-
...comb.config.spi.ConfigCenterConfigurationSource | 3 +-
.../sources/ApolloConfigurationSourceImplTest.java | 80 ++++++++++
.../config/client/ApolloClientTest.java | 118 +++++++++++++++
.../config/client/ApolloConfigTest.java | 22 +--
.../src/test}/resources/microservice.yaml | 40 +++--
.../metrics-integration => dynamic-config}/pom.xml | 9 +-
java-chassis-dependencies/pom.xml | 5 +
pom.xml | 1 +
.../config-apollo-sample}/pom.xml | 21 ++-
.../src/main/java/MainServer.java | 9 +-
.../src/main/resources/log4j.properties | 3 +-
.../src/main/resources/microservice.yaml | 37 +++--
samples/pom.xml | 1 +
19 files changed, 604 insertions(+), 118 deletions(-)
copy {spring-boot-starter/spring-cloud-zuul => dynamic-config/config-apollo}/pom.xml (80%)
copy foundations/foundation-config-cc/src/main/java/io/servicecomb/config/archaius/sources/ConfigCenterConfigurationSourceImpl.java => dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java (57%)
create mode 100644 dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
create mode 100644 dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
copy demo/demo-crossapp/crossapp-client/src/main/java/io/servicecomb/demo/crossapp/HelloWorld.java => dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ConfigurationAction.java (89%)
copy {foundations/foundation-config/src/test => dynamic-config/config-apollo/src/main}/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource (91%)
create mode 100644 dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
create mode 100644 dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
copy foundations/foundation-config-cc/src/test/java/io/servicecomb/config/client/TestConfigCenterConfig.java => dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloConfigTest.java (59%)
copy {samples/metrics-write-file-sample/metrics-write-file-log4j-springboot/src/main => dynamic-config/config-apollo/src/test}/resources/microservice.yaml (73%)
copy {metrics/metrics-integration => dynamic-config}/pom.xml (87%)
copy {metrics/metrics-core => samples/config-apollo-sample}/pom.xml (81%)
copy demo/demo-crossapp/crossapp-server/src/main/java/io/servicecomb/demo/crossapp/CrossappServer.java => samples/config-apollo-sample/src/main/java/MainServer.java (81%)
copy foundations/foundation-common/src/test/resources/config/test.1.properties => samples/config-apollo-sample/src/main/resources/log4j.properties (97%)
copy samples/{metrics-write-file-sample/metrics-write-file-log4j-springboot => config-apollo-sample}/src/main/resources/microservice.yaml (74%)
--
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].
[incubator-servicecomb-java-chassis] 05/07: SCB-36 resolve problems
of dependencies, final variables, create rest template each time, etc.
Posted by li...@apache.org.
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
commit 6b61d474c2d1a474c33ab9abecc32aac7ac152fc
Author: lijasonvip <li...@huawei.com>
AuthorDate: Tue Jan 9 14:19:42 2018 +0800
SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
Signed-off-by: lijasonvip <li...@huawei.com>
---
.../src/main/resources/META-INF/LICENSE.txt | 202 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
2 files changed, 213 deletions(-)
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 06/07: SCB-36 remove control
flag: dynamic.config.enable,
use original cse.config.client.serverUri to indicate whether to use config
center.
Posted by li...@apache.org.
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
commit 4b3e39987a1a7fde22a59e8f3df7a8541f466984
Author: lijasonvip <li...@huawei.com>
AuthorDate: Tue Jan 9 14:37:16 2018 +0800
SCB-36 remove control flag: dynamic.config.enable, use original cse.config.client.serverUri to indicate whether to use config center.
Signed-off-by: lijasonvip <li...@huawei.com>
---
dynamic-config/config-apollo/src/test/resources/microservice.yaml | 4 ++++
dynamic-config/pom.xml | 1 -
samples/config-apollo-sample/src/main/resources/microservice.yaml | 3 +++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dynamic-config/config-apollo/src/test/resources/microservice.yaml b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
index 431e4d9..f050218 100644
--- a/dynamic-config/config-apollo/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
@@ -31,7 +31,11 @@ apollo:
token: xxx
refreshInterval: 30
firstRefreshInterval: 0
+
cse:
+ config:
+ client:
+ serverUri: http://127.0.0.1:8070
service:
registry:
address: http://127.0.0.1:30100
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
index d627783..a6ed804 100644
--- a/dynamic-config/pom.xml
+++ b/dynamic-config/pom.xml
@@ -34,5 +34,4 @@
<module>config-apollo</module>
</modules>
-
</project>
\ No newline at end of file
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 5dbf37c..fe4b1f1 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -30,6 +30,9 @@ apollo:
namespace: application
token: #get token from Apollo web pages
cse:
+ config:
+ client:
+ serverUri: http://127.0.0.1:8070
service:
registry:
address: http://127.0.0.1:30100
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 01/07: SCB-36 Support dynamic
configuration for chassis by integrating with Apollo.
Posted by li...@apache.org.
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
commit 8ae14e89472a0b10c0d20f63a839344bb9a522ae
Author: lijasonvip <ei...@163.com>
AuthorDate: Fri Jan 5 16:04:53 2018 +0800
SCB-36 Support dynamic configuration for chassis by integrating with Apollo.
Signed-off-by: lijasonvip <ei...@163.com>
---
dynamic-config/config-apollo/pom.xml | 61 +++++++
.../sources/ApolloConfigurationSourceImpl.java | 126 +++++++++++++
.../io/servicecomb/config/client/ApolloClient.java | 162 +++++++++++++++++
.../io/servicecomb/config/client/ApolloConfig.java | 89 +++++++++
.../src/main/resources/META-INF/LICENSE.txt | 202 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...comb.config.spi.ConfigCenterConfigurationSource | 18 ++
dynamic-config/pom.xml | 37 ++++
.../java/io/servicecomb/config/ConfigUtil.java | 5 +-
java-chassis-dependencies/pom.xml | 5 +
pom.xml | 1 +
samples/config-apollo-sample/pom.xml | 47 +++++
.../src/main/java/MainServer.java | 32 ++++
.../src/main/resources/microservice.yaml | 53 ++++++
samples/pom.xml | 1 +
15 files changed, 849 insertions(+), 1 deletion(-)
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
new file mode 100644
index 0000000..9e13d4b
--- /dev/null
+++ b/dynamic-config/config-apollo/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>dynamic-config</artifactId>
+ <groupId>io.servicecomb</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>config-apollo</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-config</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-vertx</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>4.3.11.RELEASE</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
new file mode 100644
index 0000000..fce9988
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.archaius.sources;
+
+import static com.netflix.config.WatchedUpdateResult.createIncremental;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.apache.commons.configuration.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.WatchedUpdateListener;
+import com.netflix.config.WatchedUpdateResult;
+
+import io.servicecomb.config.ConfigMapping;
+import io.servicecomb.config.client.ApolloClient;
+import io.servicecomb.config.client.ApolloConfig;
+import io.servicecomb.config.spi.ConfigCenterConfigurationSource;
+
+public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationSource {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCenterConfigurationSource.class);
+
+ private final Map<String, Object> valueCache = Maps.newConcurrentMap();
+
+ private List<WatchedUpdateListener> listeners = new CopyOnWriteArrayList<WatchedUpdateListener>();
+
+ public ApolloConfigurationSourceImpl() {
+ }
+
+ private UpdateHandler updateHandler = new UpdateHandler();
+
+ @Override
+ public void init(Configuration localConfiguration) {
+ ApolloConfig.setConcurrentCompositeConfiguration((ConcurrentCompositeConfiguration) localConfiguration);
+ init();
+ }
+
+ public void init() {
+ ApolloClient apolloClient = new ApolloClient(updateHandler);
+ apolloClient.refreshApolloConfig();
+ }
+
+ @Override
+ public void addUpdateListener(WatchedUpdateListener watchedUpdateListener) {
+ if (watchedUpdateListener != null) {
+ listeners.add(watchedUpdateListener);
+ }
+ }
+
+ @Override
+ public void removeUpdateListener(WatchedUpdateListener watchedUpdateListener) {
+ if (watchedUpdateListener != null) {
+ listeners.remove(watchedUpdateListener);
+ }
+ }
+
+ public void updateConfiguration(WatchedUpdateResult result) {
+ for (WatchedUpdateListener l : listeners) {
+ try {
+ l.updateConfiguration(result);
+ } catch (Throwable ex) {
+ LOGGER.error("Error in invoking WatchedUpdateListener", ex);
+ }
+ }
+ }
+
+ @Override
+ public Map<String, Object> getCurrentData() throws Exception {
+ return valueCache;
+ }
+
+ public List<WatchedUpdateListener> getCurrentListeners() {
+ return listeners;
+ }
+
+ public class UpdateHandler {
+ public void handle(String action, Map<String, Object> config) {
+ if (config == null || config.isEmpty()) {
+ return;
+ }
+ Map<String, Object> configuration = ConfigMapping.getConvertedMap(config);
+ if ("create".equals(action)) {
+ valueCache.putAll(configuration);
+ updateConfiguration(createIncremental(ImmutableMap.<String, Object>copyOf(configuration),
+ null,
+ null));
+ } else if ("set".equals(action)) {
+ valueCache.putAll(configuration);
+ updateConfiguration(createIncremental(null, ImmutableMap.<String, Object>copyOf(configuration),
+ null));
+ } else if ("delete".equals(action)) {
+ for (String itemKey : configuration.keySet()) {
+ valueCache.remove(itemKey);
+ }
+ updateConfiguration(createIncremental(null,
+ null,
+ ImmutableMap.<String, Object>copyOf(configuration)));
+ } else {
+ LOGGER.error("action: {} is invalid.", action);
+ return;
+ }
+ LOGGER.warn("Config value cache changed: action:{}; item:{}", action, configuration.keySet());
+ }
+ }
+}
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
new file mode 100644
index 0000000..ad6bbaa
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.client;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
+import io.servicecomb.foundation.common.utils.JsonUtils;
+import io.servicecomb.foundation.vertx.client.ClientPoolManager;
+import io.servicecomb.foundation.vertx.client.http.HttpClientWithContext;
+
+public class ApolloClient {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ApolloClient.class);
+
+ private static final ApolloConfig APOLLO_CONFIG = ApolloConfig.INSTANCE;
+
+ public static final Map<String, Object> originalConfigMap = new HashMap<>();
+
+ private static ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(1);
+
+ private int refreshInterval = APOLLO_CONFIG.getRefreshInterval();
+
+ private int firstRefreshInterval = APOLLO_CONFIG.getFirstRefreshInterval();
+
+ private String serviceUri = APOLLO_CONFIG.getServerUri();
+
+ private String serviceName = APOLLO_CONFIG.getServiceName();
+
+ private String token = APOLLO_CONFIG.getToken();
+
+ private String env = APOLLO_CONFIG.getEnv();
+
+ private String clusters = APOLLO_CONFIG.getServerClusters();
+
+ private String namespace = APOLLO_CONFIG.getNamespace();
+
+ private UpdateHandler updateHandler;
+
+ private static ClientPoolManager<HttpClientWithContext> clientMgr = new ClientPoolManager<>();
+
+ public ApolloClient(UpdateHandler updateHandler) {
+ this.updateHandler = updateHandler;
+ }
+
+ public void refreshApolloConfig() {
+ EXECUTOR
+ .scheduleWithFixedDelay(new ConfigRefresh(serviceUri), firstRefreshInterval, refreshInterval, TimeUnit.SECONDS);
+ }
+
+ class ConfigRefresh implements Runnable {
+ private String serviceUri;
+
+ public ConfigRefresh(String serviceUris) {
+ this.serviceUri = serviceUris;
+ }
+
+ @Override
+ public void run() {
+ try {
+ refreshConfig();
+ } catch (Exception e) {
+ LOGGER.error("client refresh thread exception", e);
+ }
+ }
+
+ public void refreshConfig() {
+ RestTemplate rest = new RestTemplate();
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json;charset=UTF-8");
+ headers.add("Authorization", token);
+ HttpEntity<String> entity = new HttpEntity<String>(headers);
+ ResponseEntity<String> exchange = rest.exchange(composeAPI(), HttpMethod.GET, entity, String.class);
+ if (HttpResponseStatus.OK.code() == exchange.getStatusCode().value()) {
+ try {
+ Map<String, Object> body = JsonUtils.OBJ_MAPPER.readValue(exchange.getBody(),
+ new TypeReference<Map<String, Object>>() {
+ });
+ refreshConfigItems((Map<String, Object>) body.get("configurations"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private String composeAPI() {
+ String api = serviceUri + "/openapi/v1/envs/" + env +
+ "/apps/" + serviceName +
+ "/clusters/" + clusters +
+ "/namespaces/" + namespace +
+ "/releases/latest";
+ return api;
+ }
+
+ private void refreshConfigItems(Map<String, Object> map) {
+ compareChangedConfig(originalConfigMap, map);
+ originalConfigMap.clear();
+ originalConfigMap.putAll(map);
+ }
+
+ private void compareChangedConfig(Map<String, Object> before, Map<String, Object> after) {
+ Map<String, Object> itemsCreated = new HashMap<>();
+ Map<String, Object> itemsDeleted = new HashMap<>();
+ Map<String, Object> itemsModified = new HashMap<>();
+ if (before == null || before.isEmpty()) {
+ updateHandler.handle("create", after);
+ return;
+ }
+ if (after == null || after.isEmpty()) {
+ updateHandler.handle("delete", before);
+ return;
+ }
+ for (String itemKey : after.keySet()) {
+ if (!before.containsKey(itemKey)) {
+ itemsCreated.put(itemKey, after.get(itemKey));
+ } else if (!after.get(itemKey).equals(before.get(itemKey))) {
+ itemsModified.put(itemKey, after.get(itemKey));
+ }
+ }
+ for (String itemKey : before.keySet()) {
+ if (!after.containsKey(itemKey)) {
+ itemsDeleted.put(itemKey, "");
+ }
+ }
+ updateHandler.handle("create", itemsCreated);
+ updateHandler.handle("set", itemsModified);
+ updateHandler.handle("delete", itemsDeleted);
+ }
+ }
+}
+
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
new file mode 100644
index 0000000..d4dbdc6
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.client;
+
+import com.netflix.config.ConcurrentCompositeConfiguration;
+
+public class ApolloConfig {
+ public static final ApolloConfig INSTANCE = new ApolloConfig();
+
+ private static ConcurrentCompositeConfiguration finalConfig;
+
+ private static final String SERVER_URL_KEY = "apollo.config.serverUri";
+
+ private static final String SERVER_NAMESPACE = "apollo.config.namespace";
+
+ private static final String SERVER_ENV = "apollo.config.env";
+
+ private static final String SERVER_CLUSTERS = "apollo.config.clusters";
+
+ private static final String APOLLO_SERVICE_NAME = "apollo.config.serviceName";
+
+ private static final String TOKEN = "apollo.config.token";
+
+ private static final String REFRESH_INTERVAL = "apollo.config.refreshInterval";
+
+ private static final String FIRST_REFRESH_INTERVAL = "apollo.config.firstRefreshInterval";
+
+ private static final int DEFAULT_REFRESH_INTERVAL = 3;
+
+ private static final int DEFAULT_FIRST_REFRESH_INTERVAL = 0;
+
+ private ApolloConfig() {
+ }
+
+ public static void setConcurrentCompositeConfiguration(ConcurrentCompositeConfiguration config) {
+ finalConfig = (ConcurrentCompositeConfiguration) config;
+ }
+
+ public ConcurrentCompositeConfiguration getConcurrentCompositeConfiguration() {
+ return finalConfig;
+ }
+
+ public String getServiceName() {
+ return finalConfig.getString(APOLLO_SERVICE_NAME);
+ }
+
+ public String getServerUri() {
+ return finalConfig.getString(SERVER_URL_KEY);
+ }
+
+ public String getToken() {
+ return finalConfig.getString(TOKEN);
+ }
+
+ public String getEnv() {
+ return finalConfig.getString(SERVER_ENV);
+ }
+
+ public String getNamespace() {
+ return finalConfig.getString(SERVER_NAMESPACE);
+ }
+
+ public String getServerClusters() {
+ return finalConfig.getString(SERVER_CLUSTERS);
+ }
+
+ public int getRefreshInterval() {
+ return finalConfig.getInt(REFRESH_INTERVAL, DEFAULT_REFRESH_INTERVAL);
+ }
+
+ public int getFirstRefreshInterval() {
+ return finalConfig.getInt(FIRST_REFRESH_INTERVAL, DEFAULT_FIRST_REFRESH_INTERVAL);
+ }
+}
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource b/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource
new file mode 100644
index 0000000..d696ccd
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
new file mode 100644
index 0000000..4d25131
--- /dev/null
+++ b/dynamic-config/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>java-chassis</artifactId>
+ <groupId>io.servicecomb</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dynamic-config</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>config-apollo</module>
+ </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
index d0c4038..3a92454 100644
--- a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
@@ -53,6 +53,8 @@ public final class ConfigUtil {
protected static final String configCenterUrlKey = "cse.config.client.serverUri";
+ protected static final String dynamicConfigEnabled = "dynamic.config.enabled";
+
private static final String MICROSERVICE_CONFIG_LOADER_KEY = "cse-microservice-config-loader";
private ConfigUtil() {
@@ -151,7 +153,8 @@ public final class ConfigUtil {
}
public static DynamicWatchedConfiguration createConfigFromConfigCenter(Configuration localConfiguration) {
- if (localConfiguration.getProperty(configCenterUrlKey) == null) {
+ if (localConfiguration.getProperty(configCenterUrlKey) == null &&
+ !localConfiguration.getBoolean(dynamicConfigEnabled, false)) {
LOGGER.info("config center URL is missing, skip to load configuration from config center");
return null;
}
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index a111a3f..86a3b2d 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -735,6 +735,11 @@
<artifactId>foundation-config-cc</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>io.servicecomb</groupId>
<artifactId>foundation-vertx</artifactId>
diff --git a/pom.xml b/pom.xml
index d91a410..b1dfa7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
<module>tracing</module>
<module>edge</module>
<module>metrics</module>
+ <module>dynamic-config</module>
</modules>
<distributionManagement>
diff --git a/samples/config-apollo-sample/pom.xml b/samples/config-apollo-sample/pom.xml
new file mode 100644
index 0000000..c2a3f58
--- /dev/null
+++ b/samples/config-apollo-sample/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>io.servicecomb.samples</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>config-apollo-sample</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.archaius</groupId>
+ <artifactId>archaius-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/samples/config-apollo-sample/src/main/java/MainServer.java b/samples/config-apollo-sample/src/main/java/MainServer.java
new file mode 100644
index 0000000..9a4d2b0
--- /dev/null
+++ b/samples/config-apollo-sample/src/main/java/MainServer.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.netflix.config.DynamicPropertyFactory;
+
+import io.servicecomb.foundation.common.utils.BeanUtils;
+import io.servicecomb.foundation.common.utils.Log4jUtils;
+
+public class MainServer {
+ public static void main(String[] args) throws Exception {
+ Log4jUtils.init();
+ BeanUtils.init();
+ while (true) {
+ System.out.println(DynamicPropertyFactory.getInstance().getStringProperty("timeout", "default"));
+ Thread.sleep(3000);
+ }
+ }
+}
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
new file mode 100644
index 0000000..1bbd3c2
--- /dev/null
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -0,0 +1,53 @@
+#
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+APPLICATION_ID: pojotest
+service_description:
+ name: apollo-test
+ version: 1.0.1
+
+dynamic:
+ config:
+ enabled: true
+
+apollo:
+ config:
+ serverUri: http://127.0.0.1:8070
+ serviceName: apollo-test
+ env: DEV
+ clusters: test-cluster
+ namespace: application
+ token: #get token from Apollo web pages
+
+cse:
+ service:
+ registry:
+ address: http://127.0.0.1:30100
+ rest:
+ address: 0.0.0.0:8080
+ highway:
+ address: 0.0.0.0:7070
+ handler:
+ chain:
+ Provider:
+ default: bizkeeper-provider
+ #executors:
+ #default: test
+ #Provider:
+ #server: test
+ #server.wrapParam: test
\ No newline at end of file
diff --git a/samples/pom.xml b/samples/pom.xml
index d83bf39..1d735dd 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -34,6 +34,7 @@
<module>auth-sample</module>
<module>bmi</module>
<module>metrics-write-file-sample</module>
+ <module>config-apollo-sample</module>
</modules>
<dependencyManagement>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 02/07: SCB-36 resolve problems
of dependencies, final variables, create rest template each time, etc.
Posted by li...@apache.org.
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
commit 1234e3ad4bc7936a4266c2796a30d4fe537eb402
Author: lijasonvip <ei...@163.com>
AuthorDate: Fri Jan 5 16:04:53 2018 +0800
SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
Signed-off-by: lijasonvip <li...@huawei.com>
---
coverage-reports/pom.xml | 4 +
dynamic-config/config-apollo/pom.xml | 15 ---
.../sources/ApolloConfigurationSourceImpl.java | 21 ++--
.../io/servicecomb/config/client/ApolloClient.java | 44 ++++----
.../sources/ApolloConfigurationSourceImplTest.java | 76 +++++++++++++
.../config/client/ApolloClientTest.java | 118 +++++++++++++++++++++
.../config/client/ApolloConfigTest.java | 44 ++++++++
.../src/test}/resources/microservice.yaml | 5 +-
dynamic-config/pom.xml | 3 +-
samples/config-apollo-sample/pom.xml | 4 +
.../src/main/resources/log4j.properties | 17 +++
.../src/main/resources/microservice.yaml | 1 -
12 files changed, 303 insertions(+), 49 deletions(-)
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index e7f950a..117ba26 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -168,6 +168,10 @@
<artifactId>handler-tracing-zipkin</artifactId>
</dependency>
<dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.servicecomb.demo</groupId>
<artifactId>pojo-client</artifactId>
<version>0.6.0-SNAPSHOT</version>
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
index 9e13d4b..856f53e 100644
--- a/dynamic-config/config-apollo/pom.xml
+++ b/dynamic-config/config-apollo/pom.xml
@@ -41,21 +41,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>4.3.11.RELEASE</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
</project>
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
index fce9988..37b79f4 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
@@ -21,6 +21,8 @@ import static com.netflix.config.WatchedUpdateResult.createIncremental;
import java.util.List;
import java.util.Map;
+
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.commons.configuration.Configuration;
@@ -28,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import com.netflix.config.ConcurrentCompositeConfiguration;
import com.netflix.config.WatchedUpdateListener;
import com.netflix.config.WatchedUpdateResult;
@@ -41,14 +42,14 @@ import io.servicecomb.config.spi.ConfigCenterConfigurationSource;
public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationSource {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCenterConfigurationSource.class);
- private final Map<String, Object> valueCache = Maps.newConcurrentMap();
+ private final Map<String, Object> valueCache = new ConcurrentHashMap<>();
- private List<WatchedUpdateListener> listeners = new CopyOnWriteArrayList<WatchedUpdateListener>();
+ private List<WatchedUpdateListener> listeners = new CopyOnWriteArrayList<>();
public ApolloConfigurationSourceImpl() {
}
- private UpdateHandler updateHandler = new UpdateHandler();
+ private final UpdateHandler updateHandler = new UpdateHandler();
@Override
public void init(Configuration localConfiguration) {
@@ -56,7 +57,7 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
init();
}
- public void init() {
+ private void init() {
ApolloClient apolloClient = new ApolloClient(updateHandler);
apolloClient.refreshApolloConfig();
}
@@ -75,7 +76,7 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
}
}
- public void updateConfiguration(WatchedUpdateResult result) {
+ private void updateConfiguration(WatchedUpdateResult result) {
for (WatchedUpdateListener l : listeners) {
try {
l.updateConfiguration(result);
@@ -102,12 +103,14 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
Map<String, Object> configuration = ConfigMapping.getConvertedMap(config);
if ("create".equals(action)) {
valueCache.putAll(configuration);
- updateConfiguration(createIncremental(ImmutableMap.<String, Object>copyOf(configuration),
+
+ updateConfiguration(createIncremental(ImmutableMap.copyOf(configuration),
null,
null));
} else if ("set".equals(action)) {
valueCache.putAll(configuration);
- updateConfiguration(createIncremental(null, ImmutableMap.<String, Object>copyOf(configuration),
+
+ updateConfiguration(createIncremental(null, ImmutableMap.copyOf(configuration),
null));
} else if ("delete".equals(action)) {
for (String itemKey : configuration.keySet()) {
@@ -115,7 +118,7 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
}
updateConfiguration(createIncremental(null,
null,
- ImmutableMap.<String, Object>copyOf(configuration)));
+ ImmutableMap.copyOf(configuration)));
} else {
LOGGER.error("action: {} is invalid.", action);
return;
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
index ad6bbaa..065c724 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
@@ -20,6 +20,7 @@ package io.servicecomb.config.client;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -37,8 +38,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
import io.servicecomb.foundation.common.utils.JsonUtils;
-import io.servicecomb.foundation.vertx.client.ClientPoolManager;
-import io.servicecomb.foundation.vertx.client.http.HttpClientWithContext;
public class ApolloClient {
@@ -46,29 +45,29 @@ public class ApolloClient {
private static final ApolloConfig APOLLO_CONFIG = ApolloConfig.INSTANCE;
- public static final Map<String, Object> originalConfigMap = new HashMap<>();
+ private static final Map<String, Object> originalConfigMap = new ConcurrentHashMap<>();
- private static ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(1);
+ private static final ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(1);
- private int refreshInterval = APOLLO_CONFIG.getRefreshInterval();
+ private final int refreshInterval = APOLLO_CONFIG.getRefreshInterval();
- private int firstRefreshInterval = APOLLO_CONFIG.getFirstRefreshInterval();
+ private final int firstRefreshInterval = APOLLO_CONFIG.getFirstRefreshInterval();
- private String serviceUri = APOLLO_CONFIG.getServerUri();
+ private final String serviceUri = APOLLO_CONFIG.getServerUri();
- private String serviceName = APOLLO_CONFIG.getServiceName();
+ private final String serviceName = APOLLO_CONFIG.getServiceName();
- private String token = APOLLO_CONFIG.getToken();
+ private final String token = APOLLO_CONFIG.getToken();
- private String env = APOLLO_CONFIG.getEnv();
+ private final String env = APOLLO_CONFIG.getEnv();
- private String clusters = APOLLO_CONFIG.getServerClusters();
+ private final String clusters = APOLLO_CONFIG.getServerClusters();
- private String namespace = APOLLO_CONFIG.getNamespace();
+ private final String namespace = APOLLO_CONFIG.getNamespace();
- private UpdateHandler updateHandler;
+ private final UpdateHandler updateHandler;
- private static ClientPoolManager<HttpClientWithContext> clientMgr = new ClientPoolManager<>();
+ private static RestTemplate rest = new RestTemplate();
public ApolloClient(UpdateHandler updateHandler) {
this.updateHandler = updateHandler;
@@ -82,7 +81,7 @@ public class ApolloClient {
class ConfigRefresh implements Runnable {
private String serviceUri;
- public ConfigRefresh(String serviceUris) {
+ ConfigRefresh(String serviceUris) {
this.serviceUri = serviceUris;
}
@@ -91,16 +90,16 @@ public class ApolloClient {
try {
refreshConfig();
} catch (Exception e) {
- LOGGER.error("client refresh thread exception", e);
+
+ LOGGER.error("client refresh thread exception ", e);
}
}
- public void refreshConfig() {
- RestTemplate rest = new RestTemplate();
+ void refreshConfig() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json;charset=UTF-8");
headers.add("Authorization", token);
- HttpEntity<String> entity = new HttpEntity<String>(headers);
+ HttpEntity<String> entity = new HttpEntity<>(headers);
ResponseEntity<String> exchange = rest.exchange(composeAPI(), HttpMethod.GET, entity, String.class);
if (HttpResponseStatus.OK.code() == exchange.getStatusCode().value()) {
try {
@@ -109,8 +108,11 @@ public class ApolloClient {
});
refreshConfigItems((Map<String, Object>) body.get("configurations"));
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.error("JsonObject parse config center response error: ", e);
}
+ } else {
+ LOGGER.error("fetch configuration failed, error code:{} for {}", exchange.getStatusCodeValue(),
+ exchange.getBody());
}
}
@@ -129,7 +131,7 @@ public class ApolloClient {
originalConfigMap.putAll(map);
}
- private void compareChangedConfig(Map<String, Object> before, Map<String, Object> after) {
+ void compareChangedConfig(Map<String, Object> before, Map<String, Object> after) {
Map<String, Object> itemsCreated = new HashMap<>();
Map<String, Object> itemsDeleted = new HashMap<>();
Map<String, Object> itemsModified = new HashMap<>();
diff --git a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
new file mode 100644
index 0000000..83d7614
--- /dev/null
+++ b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.archaius.sources;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.netflix.config.WatchedUpdateListener;
+
+import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
+import mockit.Deencapsulation;
+
+public class ApolloConfigurationSourceImplTest {
+ @Test
+ public void testCreate() throws Exception {
+
+ ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
+ apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getAdded().isEmpty()));
+ UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
+ Map<String, Object> createItems = new HashMap<>();
+ createItems.put("testKey", "testValue");
+ udateHandler.handle("create", createItems);
+ }
+
+ @Test
+ public void testUpdate() throws Exception {
+
+ ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
+ apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getChanged().isEmpty()));
+ UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
+ Map<String, Object> updateItems = new HashMap<>();
+ updateItems.put("testKey", "testValue");
+ udateHandler.handle("set", updateItems);
+ }
+
+ @Test
+ public void testDelete() throws Exception {
+ ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
+ apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getDeleted().isEmpty()));
+ UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
+ Map<String, Object> deleteItems = new HashMap<>();
+ deleteItems.put("testKey", "testValue");
+
+ apolloConfigurationSource.getCurrentData().put("testKey", "testValue");
+ udateHandler.handle("delete", deleteItems);
+ Assert.assertTrue(apolloConfigurationSource.getCurrentData().isEmpty());
+ }
+
+ @Test
+ public void testRemoveUpdateListener() {
+ ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
+ WatchedUpdateListener watchedUpdateListener = Mockito.mock(WatchedUpdateListener.class);
+ apolloConfigurationSource.addUpdateListener(watchedUpdateListener);
+ apolloConfigurationSource.removeUpdateListener(watchedUpdateListener);
+ Assert.assertTrue(apolloConfigurationSource.getCurrentListeners().isEmpty());
+ }
+}
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
new file mode 100644
index 0000000..74a250d
--- /dev/null
+++ b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.client;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import io.servicecomb.config.ConfigUtil;
+import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl;
+import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
+import io.servicecomb.config.client.ApolloClient.ConfigRefresh;
+import mockit.Deencapsulation;
+
+public class ApolloClientTest {
+ @BeforeClass
+ public static void setUpClass() {
+
+ ApolloConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
+ }
+
+ @Test
+ public void refreshApolloConfig() {
+ ApolloConfig apolloConfig = ApolloConfig.INSTANCE;
+ RestTemplate rest = Mockito.mock(RestTemplate.class);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<>(
+ "{\"apollo\":\"mocked\", \"configurations\":{\"timeout\":1000}}", HttpStatus.OK);
+ Mockito.when(rest.exchange(
+ Matchers.anyString(),
+ Matchers.any(HttpMethod.class),
+ Matchers.<HttpEntity<String>>any(),
+ Matchers.<Class<String>>any()
+ )
+ ).thenReturn(responseEntity);
+ ApolloConfigurationSourceImpl impl = new ApolloConfigurationSourceImpl();
+ UpdateHandler updateHandler = impl.new UpdateHandler();
+ ApolloClient apolloClient = new ApolloClient(updateHandler);
+ Deencapsulation.setField(apolloClient, "rest", rest);
+ ConfigRefresh cr = apolloClient.new ConfigRefresh(apolloConfig.getServerUri());
+ cr.run();
+
+ Map<String, Object> originMap = Deencapsulation.getField(apolloClient, "originalConfigMap");
+ Assert.assertEquals(1, originMap.size());
+ }
+
+ @Test
+ public void testCompareChangedConfig() {
+ boolean status = true;
+ Map<String, Object> before = new HashMap<>();
+ Map<String, Object> after = new HashMap<>();
+
+ ApolloConfigurationSourceImpl impl = new ApolloConfigurationSourceImpl();
+ UpdateHandler updateHandler = impl.new UpdateHandler();
+ ApolloClient apolloClient = new ApolloClient(updateHandler);
+
+ ConfigRefresh cr = apolloClient.new ConfigRefresh("");
+
+ ApolloConfig instance = ApolloConfig.INSTANCE;
+ try {
+ Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
+ } catch (Exception e) {
+ status = false;
+ }
+ Assert.assertTrue(status);
+
+ status = true;
+ before.put("test", "testValue");
+ try {
+ Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
+ } catch (Exception e) {
+ status = false;
+ }
+ Assert.assertTrue(status);
+
+ status = true;
+ after.put("test", "testValue2");
+ try {
+ Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
+ } catch (Exception e) {
+ status = false;
+ }
+ Assert.assertTrue(status);
+
+ status = true;
+ try {
+ Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
+ } catch (Exception e) {
+ status = false;
+ }
+ Assert.assertTrue(status);
+ }
+}
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloConfigTest.java b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloConfigTest.java
new file mode 100644
index 0000000..e343cc9
--- /dev/null
+++ b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloConfigTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.client;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import io.servicecomb.config.ConfigUtil;
+
+public class ApolloConfigTest {
+ @BeforeClass
+ public static void setUpClass() {
+ ApolloConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
+ }
+
+ @Test
+ public void getServiceName() {
+ ApolloConfig instance = ApolloConfig.INSTANCE;
+ Assert.assertEquals("apollo-test", instance.getServiceName());
+ Assert.assertEquals("http://127.0.0.1:8070", instance.getServerUri());
+ Assert.assertEquals("DEV", instance.getEnv());
+ Assert.assertEquals("test-cluster", instance.getServerClusters());
+ Assert.assertEquals("application", instance.getNamespace());
+ Assert.assertEquals("xxx", instance.getToken());
+ Assert.assertEquals(30, instance.getRefreshInterval());
+ Assert.assertEquals(0, instance.getFirstRefreshInterval());
+ }
+}
\ No newline at end of file
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
similarity index 94%
copy from samples/config-apollo-sample/src/main/resources/microservice.yaml
copy to dynamic-config/config-apollo/src/test/resources/microservice.yaml
index 1bbd3c2..05efe7f 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
@@ -32,8 +32,9 @@ apollo:
env: DEV
clusters: test-cluster
namespace: application
- token: #get token from Apollo web pages
-
+ token: xxx
+ refreshInterval: 30
+ firstRefreshInterval: 0
cse:
service:
registry:
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
index 4d25131..d627783 100644
--- a/dynamic-config/pom.xml
+++ b/dynamic-config/pom.xml
@@ -21,9 +21,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>java-chassis</artifactId>
<groupId>io.servicecomb</groupId>
+ <artifactId>java-chassis-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/samples/config-apollo-sample/pom.xml b/samples/config-apollo-sample/pom.xml
index c2a3f58..e08aceb 100644
--- a/samples/config-apollo-sample/pom.xml
+++ b/samples/config-apollo-sample/pom.xml
@@ -41,6 +41,10 @@
<groupId>io.servicecomb</groupId>
<artifactId>config-apollo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
diff --git a/samples/config-apollo-sample/src/main/resources/log4j.properties b/samples/config-apollo-sample/src/main/resources/log4j.properties
new file mode 100644
index 0000000..ba21655
--- /dev/null
+++ b/samples/config-apollo-sample/src/main/resources/log4j.properties
@@ -0,0 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+log4j.rootLogger=INFO
\ No newline at end of file
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 1bbd3c2..8035c47 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -33,7 +33,6 @@ apollo:
clusters: test-cluster
namespace: application
token: #get token from Apollo web pages
-
cse:
service:
registry:
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 04/07: SCB-36 resolve problems
of dependencies, final variables, create rest template each time, etc.
Posted by li...@apache.org.
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
commit 68bc800a2c263728bc837f539946b38813303395
Author: lijasonvip <li...@huawei.com>
AuthorDate: Tue Jan 9 14:17:54 2018 +0800
SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
Signed-off-by: lijasonvip <li...@huawei.com>
---
.../main/java/io/servicecomb/config/client/ApolloConfig.java | 10 +++++-----
.../config-apollo/src/test/resources/microservice.yaml | 4 ----
.../src/main/java/io/servicecomb/config/ConfigUtil.java | 5 +----
.../config-apollo-sample/src/main/resources/microservice.yaml | 4 ----
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
index d4dbdc6..b55b5db 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
@@ -17,12 +17,12 @@
package io.servicecomb.config.client;
-import com.netflix.config.ConcurrentCompositeConfiguration;
+import org.apache.commons.configuration.Configuration;
public class ApolloConfig {
public static final ApolloConfig INSTANCE = new ApolloConfig();
- private static ConcurrentCompositeConfiguration finalConfig;
+ private static Configuration finalConfig;
private static final String SERVER_URL_KEY = "apollo.config.serverUri";
@@ -47,11 +47,11 @@ public class ApolloConfig {
private ApolloConfig() {
}
- public static void setConcurrentCompositeConfiguration(ConcurrentCompositeConfiguration config) {
- finalConfig = (ConcurrentCompositeConfiguration) config;
+ public static void setConcurrentCompositeConfiguration(Configuration config) {
+ finalConfig = config;
}
- public ConcurrentCompositeConfiguration getConcurrentCompositeConfiguration() {
+ public Configuration getConcurrentCompositeConfiguration() {
return finalConfig;
}
diff --git a/dynamic-config/config-apollo/src/test/resources/microservice.yaml b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
index 05efe7f..431e4d9 100644
--- a/dynamic-config/config-apollo/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-apollo/src/test/resources/microservice.yaml
@@ -21,10 +21,6 @@ service_description:
name: apollo-test
version: 1.0.1
-dynamic:
- config:
- enabled: true
-
apollo:
config:
serverUri: http://127.0.0.1:8070
diff --git a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
index 3a92454..d0c4038 100644
--- a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
@@ -53,8 +53,6 @@ public final class ConfigUtil {
protected static final String configCenterUrlKey = "cse.config.client.serverUri";
- protected static final String dynamicConfigEnabled = "dynamic.config.enabled";
-
private static final String MICROSERVICE_CONFIG_LOADER_KEY = "cse-microservice-config-loader";
private ConfigUtil() {
@@ -153,8 +151,7 @@ public final class ConfigUtil {
}
public static DynamicWatchedConfiguration createConfigFromConfigCenter(Configuration localConfiguration) {
- if (localConfiguration.getProperty(configCenterUrlKey) == null &&
- !localConfiguration.getBoolean(dynamicConfigEnabled, false)) {
+ if (localConfiguration.getProperty(configCenterUrlKey) == null) {
LOGGER.info("config center URL is missing, skip to load configuration from config center");
return null;
}
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 8035c47..5dbf37c 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -21,10 +21,6 @@ service_description:
name: apollo-test
version: 1.0.1
-dynamic:
- config:
- enabled: true
-
apollo:
config:
serverUri: http://127.0.0.1:8070
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 03/07: SCB-36 resolve problems
of dependencies, final variables, create rest template each time, etc.
Posted by li...@apache.org.
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
commit 69083f3fc31d4939f9b450f431a8f90db909f069
Author: lijasonvip <li...@huawei.com>
AuthorDate: Tue Jan 9 10:58:20 2018 +0800
SCB-36 resolve problems of dependencies, final variables, create rest template each time, etc.
Signed-off-by: lijasonvip <li...@huawei.com>
---
dynamic-config/config-apollo/pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
index 856f53e..16c278b 100644
--- a/dynamic-config/config-apollo/pom.xml
+++ b/dynamic-config/config-apollo/pom.xml
@@ -31,12 +31,10 @@
<dependency>
<groupId>io.servicecomb</groupId>
<artifactId>foundation-config</artifactId>
- <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.servicecomb</groupId>
<artifactId>foundation-vertx</artifactId>
- <version>0.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-java-chassis] 07/07: SCB-36 use enum to
store configuration actions
Posted by li...@apache.org.
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
commit cd6baf12c56f90f0a4879fc897684884817e4944
Author: lijasonvip <li...@huawei.com>
AuthorDate: Wed Jan 10 10:30:44 2018 +0800
SCB-36 use enum to store configuration actions
Signed-off-by: lijasonvip <li...@huawei.com>
---
dynamic-config/config-apollo/pom.xml | 4 +++
.../sources/ApolloConfigurationSourceImpl.java | 34 +++++++++++-----------
.../io/servicecomb/config/client/ApolloClient.java | 16 ++++++----
.../config/client/ConfigurationAction.java | 24 +++++++++++++++
.../sources/ApolloConfigurationSourceImplTest.java | 10 +++++--
5 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
index 16c278b..1f08254 100644
--- a/dynamic-config/config-apollo/pom.xml
+++ b/dynamic-config/config-apollo/pom.xml
@@ -40,5 +40,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
index 37b79f4..b4d6b4e 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
@@ -18,25 +18,29 @@
package io.servicecomb.config.archaius.sources;
import static com.netflix.config.WatchedUpdateResult.createIncremental;
+import static io.servicecomb.config.client.ConfigurationAction.CREATE;
+import static io.servicecomb.config.client.ConfigurationAction.DELETE;
+import static io.servicecomb.config.client.ConfigurationAction.SET;
import java.util.List;
import java.util.Map;
-
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import javax.validation.constraints.NotNull;
+
import org.apache.commons.configuration.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
-import com.netflix.config.ConcurrentCompositeConfiguration;
import com.netflix.config.WatchedUpdateListener;
import com.netflix.config.WatchedUpdateResult;
import io.servicecomb.config.ConfigMapping;
import io.servicecomb.config.client.ApolloClient;
import io.servicecomb.config.client.ApolloConfig;
+import io.servicecomb.config.client.ConfigurationAction;
import io.servicecomb.config.spi.ConfigCenterConfigurationSource;
public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationSource {
@@ -53,7 +57,7 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
@Override
public void init(Configuration localConfiguration) {
- ApolloConfig.setConcurrentCompositeConfiguration((ConcurrentCompositeConfiguration) localConfiguration);
+ ApolloConfig.setConcurrentCompositeConfiguration(localConfiguration);
init();
}
@@ -63,17 +67,13 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
}
@Override
- public void addUpdateListener(WatchedUpdateListener watchedUpdateListener) {
- if (watchedUpdateListener != null) {
- listeners.add(watchedUpdateListener);
- }
+ public void addUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ listeners.add(watchedUpdateListener);
}
@Override
- public void removeUpdateListener(WatchedUpdateListener watchedUpdateListener) {
- if (watchedUpdateListener != null) {
- listeners.remove(watchedUpdateListener);
- }
+ public void removeUpdateListener(@NotNull WatchedUpdateListener watchedUpdateListener) {
+ listeners.remove(watchedUpdateListener);
}
private void updateConfiguration(WatchedUpdateResult result) {
@@ -96,23 +96,23 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
}
public class UpdateHandler {
- public void handle(String action, Map<String, Object> config) {
+ public void handle(ConfigurationAction action, Map<String, Object> config) {
if (config == null || config.isEmpty()) {
return;
}
Map<String, Object> configuration = ConfigMapping.getConvertedMap(config);
- if ("create".equals(action)) {
+ if (CREATE.equals(action)) {
valueCache.putAll(configuration);
updateConfiguration(createIncremental(ImmutableMap.copyOf(configuration),
null,
null));
- } else if ("set".equals(action)) {
+ } else if (SET.equals(action)) {
valueCache.putAll(configuration);
updateConfiguration(createIncremental(null, ImmutableMap.copyOf(configuration),
null));
- } else if ("delete".equals(action)) {
+ } else if (DELETE.equals(action)) {
for (String itemKey : configuration.keySet()) {
valueCache.remove(itemKey);
}
@@ -120,10 +120,10 @@ public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationS
null,
ImmutableMap.copyOf(configuration)));
} else {
- LOGGER.error("action: {} is invalid.", action);
+ LOGGER.error("action: {} is invalid.", action.name());
return;
}
- LOGGER.warn("Config value cache changed: action:{}; item:{}", action, configuration.keySet());
+ LOGGER.warn("Config value cache changed: action:{}; item:{}", action.name(), configuration.keySet());
}
}
}
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
index 065c724..fcf70df 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
@@ -17,6 +17,10 @@
package io.servicecomb.config.client;
+import static io.servicecomb.config.client.ConfigurationAction.CREATE;
+import static io.servicecomb.config.client.ConfigurationAction.DELETE;
+import static io.servicecomb.config.client.ConfigurationAction.SET;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -79,7 +83,7 @@ public class ApolloClient {
}
class ConfigRefresh implements Runnable {
- private String serviceUri;
+ private final String serviceUri;
ConfigRefresh(String serviceUris) {
this.serviceUri = serviceUris;
@@ -136,11 +140,11 @@ public class ApolloClient {
Map<String, Object> itemsDeleted = new HashMap<>();
Map<String, Object> itemsModified = new HashMap<>();
if (before == null || before.isEmpty()) {
- updateHandler.handle("create", after);
+ updateHandler.handle(CREATE, after);
return;
}
if (after == null || after.isEmpty()) {
- updateHandler.handle("delete", before);
+ updateHandler.handle(DELETE, before);
return;
}
for (String itemKey : after.keySet()) {
@@ -155,9 +159,9 @@ public class ApolloClient {
itemsDeleted.put(itemKey, "");
}
}
- updateHandler.handle("create", itemsCreated);
- updateHandler.handle("set", itemsModified);
- updateHandler.handle("delete", itemsDeleted);
+ updateHandler.handle(CREATE, itemsCreated);
+ updateHandler.handle(SET, itemsModified);
+ updateHandler.handle(DELETE, itemsDeleted);
}
}
}
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ConfigurationAction.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ConfigurationAction.java
new file mode 100644
index 0000000..62552a1
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ConfigurationAction.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.servicecomb.config.client;
+
+public enum ConfigurationAction {
+ CREATE,
+ SET,
+ DELETE
+}
diff --git a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
index 83d7614..848cdd1 100644
--- a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
+++ b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
@@ -17,6 +17,10 @@
package io.servicecomb.config.archaius.sources;
+import static io.servicecomb.config.client.ConfigurationAction.CREATE;
+import static io.servicecomb.config.client.ConfigurationAction.DELETE;
+import static io.servicecomb.config.client.ConfigurationAction.SET;
+
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +42,7 @@ public class ApolloConfigurationSourceImplTest {
UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
Map<String, Object> createItems = new HashMap<>();
createItems.put("testKey", "testValue");
- udateHandler.handle("create", createItems);
+ udateHandler.handle(CREATE, createItems);
}
@Test
@@ -49,7 +53,7 @@ public class ApolloConfigurationSourceImplTest {
UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
Map<String, Object> updateItems = new HashMap<>();
updateItems.put("testKey", "testValue");
- udateHandler.handle("set", updateItems);
+ udateHandler.handle(SET, updateItems);
}
@Test
@@ -61,7 +65,7 @@ public class ApolloConfigurationSourceImplTest {
deleteItems.put("testKey", "testValue");
apolloConfigurationSource.getCurrentData().put("testKey", "testValue");
- udateHandler.handle("delete", deleteItems);
+ udateHandler.handle(DELETE, deleteItems);
Assert.assertTrue(apolloConfigurationSource.getCurrentData().isEmpty());
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.