[*ChangeListener] replace AttributesChangedListener with ProviderChangeListener

AttributesChangedListener is a duplicate of ProviderChangeListener and
there is no need to keep both. Since AttributesChangedListener is for
ember and ProviderChangeListener is from DataModel, it makes more sense
to keep ProviderChangeListener.

Author: zenghuchen-gg

src/app/util/AttributesChangedListener.h

@@ -55,7 +55,6 @@ source_set("types") {
 # This source set also depends on data-model
 source_set("af-types") {
   sources = [
-    "AttributesChangedListener.h",
     "MarkAttributeDirty.h",
     "af-types.h",
   ]

src/app/util/BUILD.gn

@@ -26,7 +26,6 @@
 #include <stdbool.h> // For bool
 #include <stdint.h>  // For various uint*_t types
 
-#include <app/util/AttributesChangedListener.h>
 #include <app/util/MarkAttributeDirty.h>
 #include <app/util/basic-types.h>
 #include <app/util/types_stub.h> // For various types.

src/app/util/af-types.h

@@ -20,6 +20,7 @@
 #include <app/AttributeAccessInterfaceRegistry.h>
 #include <app/CommandHandlerInterfaceRegistry.h>
 #include <app/InteractionModelEngine.h>
+#include <app/data-model-provider/ProviderChangeListener.h>
 #include <app/persistence/AttributePersistenceProvider.h>
 #include <app/persistence/AttributePersistenceProviderInstance.h>
 #include <app/persistence/PascalString.h>
@@ -1576,28 +1577,13 @@ DataVersion * emberAfDataVersionStorage(const ConcreteClusterPath & aConcreteClu
     return ep.dataVersions + clusterIndex;
 }
 
-namespace {
-class GlobalInteractionModelEngineChangedpathListener : public AttributesChangedListener
-{
-public:
-    ~GlobalInteractionModelEngineChangedpathListener() = default;
-
-    void MarkDirty(const AttributePathParams & path) override
-    {
-        InteractionModelEngine::GetInstance()->GetReportingEngine().SetDirty(path);
-    }
-};
-
-} // namespace
-
-AttributesChangedListener * emberAfGlobalInteractionModelAttributesChangedListener()
+DataModel::ProviderChangeListener * emberAfGlobalInteractionModelAttributesChangedListener()
 {
-    static GlobalInteractionModelEngineChangedpathListener listener;
-    return &listener;
+    return &InteractionModelEngine::GetInstance()->GetReportingEngine();
 }
 
 void emberAfAttributeChanged(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
-                             AttributesChangedListener * listener)
+                             DataModel::ProviderChangeListener * listener)
 {
     // Increase cluster data path
     DataVersion * version = emberAfDataVersionStorage(ConcreteClusterPath(endpoint, clusterId));
@@ -1616,7 +1602,7 @@ void emberAfAttributeChanged(EndpointId endpoint, ClusterId clusterId, Attribute
     listener->MarkDirty(AttributePathParams(endpoint, clusterId, attributeId));
 }
 
-void emberAfEndpointChanged(EndpointId endpoint, AttributesChangedListener * listener)
+void emberAfEndpointChanged(EndpointId endpoint, DataModel::ProviderChangeListener * listener)
 {
     listener->MarkDirty(AttributePathParams(endpoint));
 }

src/app/util/attribute-storage.cpp

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <app/data-model-provider/ProviderChangeListener.h>
 #include <app/util/af-types.h>
 #include <app/util/attribute-metadata.h>
 #include <app/util/config.h>
@@ -336,7 +337,7 @@ CHIP_ERROR emberAfSetDeviceTypeList(chip::EndpointId endpoint, chip::Span<const
 
 /// Returns a change listener that uses the global InteractionModelEngine
 /// instance to report dirty paths
-chip::app::AttributesChangedListener * emberAfGlobalInteractionModelAttributesChangedListener();
+chip::app::DataModel::ProviderChangeListener * emberAfGlobalInteractionModelAttributesChangedListener();
 
 /// Mark the given attribute as having changed:
 ///   - increases the cluster data version for the given cluster
@@ -347,13 +348,13 @@ chip::app::AttributesChangedListener * emberAfGlobalInteractionModelAttributesCh
 /// This is a convenience function to make it clear when a `emberAfDataVersionStorage` increase
 /// and a `AttributesChangeListener::MarkDirty` always occur in lock-step.
 void emberAfAttributeChanged(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                             chip::app::AttributesChangedListener * listener);
+                             chip::app::DataModel::ProviderChangeListener * listener);
 
 /// Mark attributes on the given endpoint as having changed.
 ///
 /// Schedules reporting engine to consider the endpoint dirty, however does NOT increase/alter
 /// any cluster data versions.
-void emberAfEndpointChanged(chip::EndpointId endpoint, chip::app::AttributesChangedListener * listener);
+void emberAfEndpointChanged(chip::EndpointId endpoint, chip::app::DataModel::ProviderChangeListener * listener);
 
 /// Maintains a increasing index of structural changes within ember
 /// that determine if existing "indexes" and metadata pointers within ember

src/app/util/attribute-storage.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #include <app/ConcreteAttributePath.h>
-#include <app/util/AttributesChangedListener.h>
+#include <app/data-model-provider/ProviderChangeListener.h>
 #include <app/util/MarkAttributeDirty.h>
 #include <app/util/attribute-metadata.h>
 #include <lib/core/DataModelTypes.h>
@@ -50,7 +50,7 @@ struct EmberAfWriteDataInput
     // Listener called when when the written data is consided changed/dirty.
     // This being called depends on settings of `markDirty` combined with the actual contents of dataPtr
     // vs the contents of the current attribute storage.
-    chip::app::AttributesChangedListener * changeListener = nullptr;
+    chip::app::DataModel::ProviderChangeListener * changeListener = nullptr;
 
     EmberAfWriteDataInput(uint8_t * data, EmberAfAttributeType type) : dataPtr(data), dataType(type) {}
 
@@ -60,7 +60,7 @@ struct EmberAfWriteDataInput
         return *this;
     }
 
-    EmberAfWriteDataInput & SetChangeListener(chip::app::AttributesChangedListener * listener)
+    EmberAfWriteDataInput & SetChangeListener(chip::app::DataModel::ProviderChangeListener * listener)
     {
         changeListener = listener;
         return *this;

src/app/util/attribute-table.h

@@ -30,6 +30,7 @@
 
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/ids/Attributes.h>
+#include <app/data-model-provider/ProviderChangeListener.h>
 #include <app/MessageDef/AttributeDataIB.h>
 #include <app/MessageDef/AttributeReportIB.h>
 #include <app/MessageDef/AttributeStatusIB.h>
@@ -391,13 +392,13 @@ chip::Span<const EmberAfDeviceType> emberAfDeviceTypeListFromEndpointIndex(unsig
 }
 
 void emberAfAttributeChanged(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId,
-                             AttributesChangedListener * listener)
+                             DataModel::ProviderChangeListener * listener)
 {
     dataVersion++;
     listener->MarkDirty(AttributePathParams(endpoint, clusterId, attributeId));
 }
 
-void emberAfEndpointChanged(EndpointId endpoint, AttributesChangedListener * listener)
+void emberAfEndpointChanged(EndpointId endpoint, DataModel::ProviderChangeListener * listener)
 {
     listener->MarkDirty(AttributePathParams(endpoint));
 }

src/app/util/mock/attribute-storage.cpp

@@ -48,7 +48,7 @@ namespace {
 using namespace chip::app::Compatibility::Internal;
 using Protocols::InteractionModel::Status;
 
-class ContextAttributesChangeListener : public AttributesChangedListener
+class ContextAttributesChangeListener : public DataModel::ProviderChangeListener
 {
 public:
     ContextAttributesChangeListener(DataModel::ProviderChangeListener & listener) : mListener(listener) {}