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 53453e65b1f9b313147c3da18e7517512a0d93ad Author: heyile <[email protected]> AuthorDate: Mon Aug 6 14:27:30 2018 +0800 make currentVersionInfo and flatItems private --- .../servicecomb/config/client/ConfigCenterClient.java | 2 +- .../servicecomb/config/client/ParseConfigUtils.java | 16 ++++++++++------ .../config/client/TestConfigCenterClient.java | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java index 3f78b20..e7aa18f 100644 --- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java +++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java @@ -364,7 +364,7 @@ public class ConfigCenterClient { encodeServiceName = StringUtils.deleteWhitespace(serviceName); } String path = uriConst.ITEMS + "?dimensionsInfo=" + encodeServiceName + "&revision=" - + ParseConfigUtils.CURRENT_VERSION_INFO; + + ParseConfigUtils.getCurrentVersionInfo(); clientMgr.findThreadBindClientPool().runOnContext(client -> { IpPort ipPort = NetUtils.parseIpPortFromURI(configcenter); HttpClientRequest request = client.get(ipPort.getPort(), ipPort.getHostOrIp(), path, rsp -> { diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java index b9e517e..79366dc 100644 --- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java +++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ParseConfigUtils.java @@ -39,10 +39,10 @@ public class ParseConfigUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ParseConfigUtils.class); private static LinkedHashMap<String, Map<String, Object>> multiDimensionItems = new LinkedHashMap<>(); + //it's dangerous that makes flatItems public + private static final Map<String, Object> flatItems = new HashMap<>(); - public static final Map<String, Object> flatItems = new HashMap<>(); - - public static String CURRENT_VERSION_INFO = "default"; + private static String currentVersionInfo = "default"; private UpdateHandler updateHandler; @@ -60,10 +60,10 @@ public class ParseConfigUtils { public void refreshConfigItems(Map<String, Map<String, Object>> remoteItems) { try { configLock.lock(); - CURRENT_VERSION_INFO = + currentVersionInfo = remoteItems.getOrDefault("revision", new HashMap<>()).getOrDefault("version", "default").toString(); - //make sure the CURRENT_VERSION_INFO != "" - CURRENT_VERSION_INFO = CURRENT_VERSION_INFO.equals("") ? "default" : CURRENT_VERSION_INFO; + //make sure the currentVersionInfo != "" + currentVersionInfo = currentVersionInfo.equals("") ? "default" : currentVersionInfo; remoteItems.remove("revision");//the key revision is not the config setting multiDimensionItems.clear(); multiDimensionItems.putAll(remoteItems); @@ -74,6 +74,10 @@ public class ParseConfigUtils { } } + public static String getCurrentVersionInfo() { + return currentVersionInfo; + } + public void refreshConfigItemsIncremental(Map<String, Object> action) { try { configLock.lock(); diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java index 58d76af..f672d9e 100644 --- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java +++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterClient.java @@ -179,7 +179,7 @@ public class TestConfigCenterClient { ConfigRefresh refresh = cc.new ConfigRefresh(parseConfigUtils, memberdis); Deencapsulation.setField(cc, "refreshMode", 1); refresh.run(); - String currentVersionInfo = Deencapsulation.getField(parseConfigUtils, "CURRENT_VERSION_INFO").toString(); + String currentVersionInfo = Deencapsulation.getField(parseConfigUtils, "currentVersionInfo").toString(); return currentVersionInfo; }
