From 9051a6be96c2109079b5fe724c72a75b142ce9f1 Mon Sep 17 00:00:00 2001
From: lawrence wu <532157002@qq.com>
Date: Wed, 20 Mar 2019 11:31:46 +0800
Subject: [PATCH] Improve field naming in ApolloDataSource (#593)

---
 .../datasource/apollo/ApolloDataSource.java   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sentinel-extension/sentinel-datasource-apollo/src/main/java/com/alibaba/csp/sentinel/datasource/apollo/ApolloDataSource.java b/sentinel-extension/sentinel-datasource-apollo/src/main/java/com/alibaba/csp/sentinel/datasource/apollo/ApolloDataSource.java
index 45bf0a61..97d572e7 100644
--- a/sentinel-extension/sentinel-datasource-apollo/src/main/java/com/alibaba/csp/sentinel/datasource/apollo/ApolloDataSource.java
+++ b/sentinel-extension/sentinel-datasource-apollo/src/main/java/com/alibaba/csp/sentinel/datasource/apollo/ApolloDataSource.java
@@ -25,8 +25,8 @@ import com.google.common.collect.Sets;
 public class ApolloDataSource<T> extends AbstractDataSource<String, T> {
 
     private final Config config;
-    private final String flowRulesKey;
-    private final String defaultFlowRuleValue;
+    private final String ruleKey;
+    private final String defaultRuleValue;
 
     private ConfigChangeListener configChangeListener;
 
@@ -34,27 +34,26 @@ public class ApolloDataSource<T> extends AbstractDataSource<String, T> {
      * Constructs the Apollo data source
      *
      * @param namespaceName        the namespace name in Apollo, should not be null or empty
-     * @param flowRulesKey         the flow rules key in the namespace, should not be null or empty
-     * @param defaultFlowRuleValue the default flow rules value when the flow rules key is not found or any error
+     * @param ruleKey              the rule key in the namespace, should not be null or empty
+     * @param defaultRuleValue     the default rule value when the ruleKey is not found or any error
      *                             occurred
      * @param parser               the parser to transform string configuration to actual flow rules
      */
-    public ApolloDataSource(String namespaceName, String flowRulesKey, String defaultFlowRuleValue,
+    public ApolloDataSource(String namespaceName, String ruleKey, String defaultRuleValue,
                             Converter<String, T> parser) {
         super(parser);
 
         Preconditions.checkArgument(!Strings.isNullOrEmpty(namespaceName), "Namespace name could not be null or empty");
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(flowRulesKey), "FlowRuleKey could not be null or empty!");
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(ruleKey), "RuleKey could not be null or empty!");
 
-        this.flowRulesKey = flowRulesKey;
-        this.defaultFlowRuleValue = defaultFlowRuleValue;
+        this.ruleKey = ruleKey;
+        this.defaultRuleValue = defaultRuleValue;
 
         this.config = ConfigService.getConfig(namespaceName);
 
         initialize();
 
-        RecordLog.info(String.format("Initialized rule for namespace: %s, flow rules key: %s",
-            namespaceName, flowRulesKey));
+        RecordLog.info(String.format("Initialized rule for namespace: %s, rule key: %s", namespaceName, ruleKey));
     }
 
     private void initialize() {
@@ -78,7 +77,7 @@ public class ApolloDataSource<T> extends AbstractDataSource<String, T> {
         configChangeListener = new ConfigChangeListener() {
             @Override
             public void onChange(ConfigChangeEvent changeEvent) {
-                ConfigChange change = changeEvent.getChange(flowRulesKey);
+                ConfigChange change = changeEvent.getChange(ruleKey);
                 //change is never null because the listener will only notify for this key
                 if (change != null) {
                     RecordLog.info("[ApolloDataSource] Received config changes: " + change.toString());
@@ -86,12 +85,12 @@ public class ApolloDataSource<T> extends AbstractDataSource<String, T> {
                 loadAndUpdateRules();
             }
         };
-        config.addChangeListener(configChangeListener, Sets.newHashSet(flowRulesKey));
+        config.addChangeListener(configChangeListener, Sets.newHashSet(ruleKey));
     }
 
     @Override
     public String readSource() throws Exception {
-        return config.getProperty(flowRulesKey, defaultFlowRuleValue);
+        return config.getProperty(ruleKey, defaultRuleValue);
     }
 
     @Override