From 344595aa28ca14717ff358dafdc018b8e9806877 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 25 Jul 2016 10:57:02 +0800 Subject: [PATCH] version upgrade to 0.0.6 and refactor apollo-demo --- apollo-adminservice/pom.xml | 2 +- apollo-assembly/pom.xml | 2 +- apollo-biz/pom.xml | 2 +- apollo-buildtools/pom.xml | 2 +- apollo-client/README.md | 2 +- apollo-client/pom.xml | 2 +- apollo-common/pom.xml | 2 +- apollo-configservice/pom.xml | 2 +- apollo-core/pom.xml | 2 +- apollo-demo/pom.xml | 2 +- .../src/main/java/ApolloConfigDemo.java | 34 ++++++++++++ .../src/main/java/ApolloConfigFileDemo.java | 54 ------------------- apollo-portal/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 46 insertions(+), 66 deletions(-) delete mode 100644 apollo-demo/src/main/java/ApolloConfigFileDemo.java diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml index ececd50d054..cd89c245d32 100644 --- a/apollo-adminservice/pom.xml +++ b/apollo-adminservice/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml index 75ebb43f348..ff5af360349 100644 --- a/apollo-assembly/pom.xml +++ b/apollo-assembly/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml index 97956ff4bf1..cc7e8bc9714 100644 --- a/apollo-biz/pom.xml +++ b/apollo-biz/pom.xml @@ -4,7 +4,7 @@ apollo com.ctrip.framework.apollo - 0.0.6-SNAPSHOT + 0.0.6 4.0.0 apollo-biz diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml index 8f3b4b89fa9..4caf191bd46 100644 --- a/apollo-buildtools/pom.xml +++ b/apollo-buildtools/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-client/README.md b/apollo-client/README.md index 8c985920f00..8d2e21e58e3 100644 --- a/apollo-client/README.md +++ b/apollo-client/README.md @@ -88,7 +88,7 @@ If you need this functionality, you could specify the cluster as follows: com.ctrip.framework.apollo apollo-client - 0.0.5 + 0.0.6 ## III. Client Usage diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml index 7ec984a109b..278e4c10d10 100644 --- a/apollo-client/pom.xml +++ b/apollo-client/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml index c75192628e5..a4f81fa596d 100644 --- a/apollo-common/pom.xml +++ b/apollo-common/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml index 6011cf77be4..28d38a6f11a 100644 --- a/apollo-configservice/pom.xml +++ b/apollo-configservice/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml index a299485b509..7cffe8fb014 100644 --- a/apollo-core/pom.xml +++ b/apollo-core/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml index c50fb20d2c8..38c04ccedbe 100644 --- a/apollo-demo/pom.xml +++ b/apollo-demo/pom.xml @@ -4,7 +4,7 @@ apollo com.ctrip.framework.apollo - 0.0.6-SNAPSHOT + 0.0.6 4.0.0 apollo-demo diff --git a/apollo-demo/src/main/java/ApolloConfigDemo.java b/apollo-demo/src/main/java/ApolloConfigDemo.java index 53e22e6bb40..eaa0c12b04b 100644 --- a/apollo-demo/src/main/java/ApolloConfigDemo.java +++ b/apollo-demo/src/main/java/ApolloConfigDemo.java @@ -1,6 +1,8 @@ import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigChangeListener; +import com.ctrip.framework.apollo.ConfigFile; import com.ctrip.framework.apollo.ConfigService; +import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; import com.ctrip.framework.apollo.model.ConfigChange; import com.ctrip.framework.apollo.model.ConfigChangeEvent; @@ -19,6 +21,8 @@ public class ApolloConfigDemo { private String DEFAULT_VALUE = "undefined"; private Config config; private Config publicConfig; + private ConfigFile applicationConfigFile; + private ConfigFile xmlConfigFile; public ApolloConfigDemo() { ConfigChangeListener changeListener = new ConfigChangeListener() { @@ -37,6 +41,8 @@ public void onChange(ConfigChangeEvent changeEvent) { config.addChangeListener(changeListener); publicConfig = ConfigService.getConfig("FX.apollo"); publicConfig.addChangeListener(changeListener); + applicationConfigFile = ConfigService.getConfigFile("application", ConfigFileFormat.Properties); + xmlConfigFile = ConfigService.getConfigFile("datasources", ConfigFileFormat.XML); } private String getConfig(String key) { @@ -48,6 +54,26 @@ private String getConfig(String key) { return result; } + private void print(String namespace) { + switch (namespace) { + case "application": + print(applicationConfigFile); + return; + case "xml": + print(xmlConfigFile); + return; + } + } + + private void print(ConfigFile configFile) { + if (!configFile.hasContent()) { + System.out.println("No config file content found for " + configFile.getNamespace()); + return; + } + System.out.println("=== Config File Content for " + configFile.getNamespace() + " is as follows: "); + System.out.println(configFile.getContent()); + } + public static void main(String[] args) throws IOException { ApolloConfigDemo apolloConfigDemo = new ApolloConfigDemo(); System.out.println( @@ -59,6 +85,14 @@ public static void main(String[] args) throws IOException { continue; } input = input.trim(); + if (input.equalsIgnoreCase("application")) { + apolloConfigDemo.print("application"); + continue; + } + if (input.equalsIgnoreCase("xml")) { + apolloConfigDemo.print("xml"); + continue; + } if (input.equalsIgnoreCase("quit")) { System.exit(0); } diff --git a/apollo-demo/src/main/java/ApolloConfigFileDemo.java b/apollo-demo/src/main/java/ApolloConfigFileDemo.java deleted file mode 100644 index 30e91b952a4..00000000000 --- a/apollo-demo/src/main/java/ApolloConfigFileDemo.java +++ /dev/null @@ -1,54 +0,0 @@ -import com.ctrip.framework.apollo.ConfigFile; -import com.ctrip.framework.apollo.ConfigService; -import com.ctrip.framework.apollo.core.enums.ConfigFileFormat; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.util.Properties; - -/** - * @author Jason Song(song_s@ctrip.com) - */ -public class ApolloConfigFileDemo { - private static final Logger logger = LoggerFactory.getLogger(ApolloConfigDemo.class); - private ConfigFile configFile; - private String namespace = "application"; - - public ApolloConfigFileDemo() { - configFile = ConfigService.getConfigFile(namespace, ConfigFileFormat.Properties); - } - - private void print() { - if (!configFile.hasContent()) { - System.out.println("No config file content found for " + namespace); - return; - } - System.out.println("=== Config File Content for " + namespace + " is as follows: "); - System.out.println(configFile.getContent()); - } - - public static void main(String[] args) throws IOException { - ApolloConfigFileDemo apolloConfigFileDemo = new ApolloConfigFileDemo(); - System.out.println( - "Apollo Config File Demo. Please input print to get the config file content."); - while (true) { - System.out.print("> "); - String input = new BufferedReader(new InputStreamReader(System.in)).readLine(); - if (input == null || input.length() == 0) { - continue; - } - input = input.trim(); - if (input.equalsIgnoreCase("print")) { - apolloConfigFileDemo.print(); - } - if (input.equalsIgnoreCase("quit")) { - System.exit(0); - } - } - } -} diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml index 0f9355f1c93..aa7fb39371e 100644 --- a/apollo-portal/pom.xml +++ b/apollo-portal/pom.xml @@ -4,7 +4,7 @@ com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a398743d5f1..745f4f5271a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.ctrip.framework.apollo apollo - 0.0.6-SNAPSHOT + 0.0.6 Apollo pom Ctrip Configuration Center