feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java

@@ -1,3 +1,20 @@
+/*
+ * 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 com.ctrip.framework.apollo.internals;
 
 import com.ctrip.framework.apollo.Config;
@@ -21,6 +38,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import java.util.HashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -450,7 +468,7 @@ public void run() {
           String listenerName = listener.getClass().getName();
           Transaction transaction = Tracer.newTransaction("Apollo.ConfigChangeListener", listenerName);
           try {
-            listener.onChange(changeEvent);
+            listener.onChange(resolve(listener, changeEvent));
             transaction.setStatus(Transaction.SUCCESS);
           } catch (Throwable ex) {
             transaction.setStatus(ex);
@@ -494,6 +512,37 @@ private boolean isConfigChangeListenerInterested(ConfigChangeListener configChan
     return false;
   }
 
+  /**
+   * @return new {@link ConfigChangeEvent} contains interested and changed keys
+   */
+  private ConfigChangeEvent resolve(ConfigChangeListener configChangeListener, ConfigChangeEvent configChangeEvent) {
+    Set<String> interestedKeys = m_interestedKeys.get(configChangeListener);
+    Set<String> interestedKeyPrefixes = m_interestedKeyPrefixes.get(configChangeListener);
+
+    Set<String> interestedChangedKeys = resolveInterestedChangedKeys(configChangeEvent.changedKeys(), interestedKeys, interestedKeyPrefixes);
+    return new ConfigChangeEvent(configChangeEvent.getNamespace(), configChangeEvent.getChanges(), interestedChangedKeys);
+  }
+
+  static Set<String> resolveInterestedChangedKeys(Set<String> changedKeys, Set<String> interestedKeys, Set<String> interestedKeyPrefixes) {
+    Set<String> interestedChangedKeys = new HashSet<>();
+
+    for (String interestedKey : interestedKeys) {
+      if (changedKeys.contains(interestedKey)) {
+        interestedChangedKeys.add(interestedKey);
+      }
+    }
+
+    for (String interestedKeyPrefix : interestedKeyPrefixes) {
+      for (String changedKey : changedKeys) {
+        if (changedKey.startsWith(interestedKeyPrefix)) {
+          interestedChangedKeys.add(changedKey);
+        }
+      }
+    }
+
+    return interestedChangedKeys;
+  }
+
   List<ConfigChange> calcPropertyChanges(String namespace, Properties previous,
                                          Properties current) {
     if (previous == null) {

apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChangeEvent.java

@@ -1,5 +1,26 @@
+/*
+ * 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 com.ctrip.framework.apollo.model;
 
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigChangeListener;
+import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -11,15 +32,29 @@ public class ConfigChangeEvent {
   private final String m_namespace;
   private final Map<String, ConfigChange> m_changes;
 
+  /**
+   * @see Config#addChangeListener(ConfigChangeListener, Set)
+   * @see Config#addChangeListener(ConfigChangeListener, Set, Set)
+   * @see ApolloConfigChangeListener#interestedKeys()
+   * @see ApolloConfigChangeListener#interestedKeyPrefixes()
+   */
+  private final Set<String> m_interestedChangedKeys;
+
   /**
    * Constructor.
    * @param namespace the namespace of this change
    * @param changes the actual changes
    */
   public ConfigChangeEvent(String namespace,
                            Map<String, ConfigChange> changes) {
-    m_namespace = namespace;
-    m_changes = changes;
+    this(namespace, changes, Collections.<String>emptySet());
+  }
+
+  public ConfigChangeEvent(String namespace,
+      Map<String, ConfigChange> changes, Set<String> interestedChangedKeys) {
+    this.m_namespace = namespace;
+    this.m_changes = changes;
+    this.m_interestedChangedKeys = interestedChangedKeys;
   }
 
   /**
@@ -30,6 +65,13 @@ public Set<String> changedKeys() {
     return m_changes.keySet();
   }
 
+  /**
+   * @return interested and changed keys
+   */
+  public Set<String> interestedChangedKeys() {
+    return Collections.unmodifiableSet(this.m_interestedChangedKeys);
+  }
+
   /**
    * Get a specific change instance for the key specified.
    * @param key the changed key
@@ -55,4 +97,11 @@ public boolean isChanged(String key) {
   public String getNamespace() {
     return m_namespace;
   }
+
+  /**
+   * @return all changed keys and instances
+   */
+  public Map<String, ConfigChange> getChanges() {
+    return Collections.unmodifiableMap(this.m_changes);
+  }
 }