File rename and source_set split

zenghuchen-gg · zenghuchen-gg · commit ae12f74552dd · 2025-11-06T12:01:07.000-05:00
diff --git a/examples/all-clusters-app/esp32/main/Globals.cpp b/examples/all-clusters-app/esp32/main/Globals.cpp
@@ -18,7 +18,7 @@
 
 #include "Globals.h"
 #include "DeviceCallbacks.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 
 LEDWidget statusLED1;
 LEDWidget statusLED2;
diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp
@@ -44,7 +44,7 @@
 #include <Options.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app/CommandHandler.h>
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
 #include <app/clusters/identify-server/IdentifyCluster.h>
 #include <app/clusters/identify-server/identify-server.h>
diff --git a/examples/energy-management-app/energy-management-common/common/src/Identify.cpp b/examples/energy-management-app/energy-management-common/common/src/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/examples/lighting-app-data-mode-no-unique-id/linux/Identify.cpp b/examples/lighting-app-data-mode-no-unique-id/linux/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/examples/lit-icd-app/lit-icd-common/Identify.cpp b/examples/lit-icd-app/lit-icd-common/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/examples/lock-app/lock-common/src/Identify.cpp b/examples/lock-app/lock-common/src/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/examples/microwave-oven-app/microwave-oven-common/src/Identify.cpp b/examples/microwave-oven-app/microwave-oven-common/src/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp
@@ -30,7 +30,7 @@
 #include <data-model-providers/codegen/Instance.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 
 #include <platform/CommissionableDataProvider.h>
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
@@ -69,8 +69,8 @@
 static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeystore;
 #endif
 
+#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
-#include <app/TimerDelegateDefault.h>
 #include <data-model-providers/codegen/Instance.h>
 #include <headers/ProvisionManager.h>
 
diff --git a/examples/rvc-app/linux/Identify.cpp b/examples/rvc-app/linux/Identify.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Identify.h"
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <data-model-providers/codegen/CodegenDataModelProvider.h>
 
 using namespace chip::app;
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -175,6 +175,8 @@ static_library("interaction-model") {
     "CASESessionManager.h",
     "CommandSender.cpp",
     "CommandSender.h",
+    "DefaultTimerDelegate.cpp",
+    "DefaultTimerDelegate.h",
     "DeviceProxy.cpp",
     "DeviceProxy.h",
     "InteractionModelDelegatePointers.cpp",
@@ -196,8 +198,6 @@ static_library("interaction-model") {
     "TimedHandler.h",
     "TimedRequest.cpp",
     "TimedRequest.h",
-    "TimerDelegateDefault.cpp",
-    "TimerDelegateDefault.h",
     "WriteClient.cpp",
     "WriteClient.h",
     "reporting/Engine.cpp",
diff --git a/src/app/DefaultTimerDelegate.cpp b/src/app/DefaultTimerDelegate.cpp
@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 
+#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
-#include <app/TimerDelegateDefault.h>
 #include <system/SystemClock.h>
 
 using Timeout = chip::System::Clock::Timeout;
@@ -31,6 +31,7 @@ static void TimerCallbackInterface(System::Layer * aLayer, void * aAppState)
 }
 CHIP_ERROR DefaultTimerDelegate::StartTimer(TimerContext * context, Timeout aTimeout)
 {
+    // TODO(#41825): Remove the coupling of InteractionModelEngine
     return InteractionModelEngine::GetInstance()->GetExchangeManager()->GetSessionManager()->SystemLayer()->StartTimer(
         aTimeout, TimerCallbackInterface, context);
 }
diff --git a/src/app/DefaultTimerDelegate.h b/src/app/DefaultTimerDelegate.h
diff --git a/src/app/clusters/identify-server/CodegenIntegration.cpp b/src/app/clusters/identify-server/CodegenIntegration.cpp
@@ -23,8 +23,8 @@
 #include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
+#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
-#include <app/TimerDelegateDefault.h>
 #include <app/clusters/identify-server/IdentifyCluster.h>
 #include <app/server-cluster/DefaultServerCluster.h>
 #include <data-model-providers/codegen/ClusterIntegration.h>
@@ -148,9 +148,8 @@ Identify::Identify(EndpointId endpoint, onIdentifyStartCb onIdentifyStart, onIde
                    IdentifyTypeEnum identifyType, onEffectIdentifierCb onEffectIdentifier, EffectIdentifierEnum effectIdentifier,
                    EffectVariantEnum effectVariant, chip::TimerDelegate * timerDelegate) :
 
-    mOnIdentifyStart(onIdentifyStart),
-    mOnIdentifyStop(onIdentifyStop), mIdentifyType(identifyType), mOnEffectIdentifier(onEffectIdentifier),
-    mCurrentEffectIdentifier(effectIdentifier), mEffectVariant(effectVariant),
+    mOnIdentifyStart(onIdentifyStart), mOnIdentifyStop(onIdentifyStop), mIdentifyType(identifyType),
+    mOnEffectIdentifier(onEffectIdentifier), mCurrentEffectIdentifier(effectIdentifier), mEffectVariant(effectVariant),
     mCluster(chip::app::Clusters::IdentifyCluster::Config(endpoint, timerDelegate ? *timerDelegate : sDefaultTimerDelegate)
                  .WithIdentifyType(identifyType)
                  .WithDelegate(&gLegacyDelegate)
diff --git a/src/app/clusters/identify-server/README.md b/src/app/clusters/identify-server/README.md
@@ -56,7 +56,7 @@ for each endpoint that requires it. Using `RegisteredServerCluster` simplifies
 registration.
 
 ```cpp
-#include "app/TimerDelegateDefault.h"
+#include "app/DefaultTimerDelegate.h"
 #include "app/server-cluster/ServerClusterInterfaceRegistry.h"
 
 // In a .cpp file
@@ -113,7 +113,7 @@ you more control and results in a smaller, more efficient binary.
 // In a header or source file:
 #include "app/clusters/identify-server/IdentifyCluster.h"
 #include "app/server-cluster/ServerClusterInterfaceRegistry.h"
-#include "app/TimerDelegateDefault.h"
+#include "app/DefaultTimerDelegate.h"
 
 class MyIdentifyDelegate : public chip::app::Clusters::IdentifyDelegate { /* ... */ };
 
diff --git a/src/app/clusters/identify-server/tests/BUILD.gn b/src/app/clusters/identify-server/tests/BUILD.gn
@@ -33,7 +33,7 @@ chip_test_suite("tests") {
     "${chip_root}/src/app/data-model-provider/tests:encode-decode",
     "${chip_root}/src/app/server-cluster/testing:testing",
     "${chip_root}/src/lib/support",
-    "${chip_root}/src/lib/support:timer-delegate",
+    "${chip_root}/src/lib/support:timer-delegate-mock",
   ]
 }
 
@@ -60,6 +60,6 @@ chip_test_suite("tests-backwards-compatibility") {
     "${chip_root}/src/app/server-cluster/testing:testing",
     "${chip_root}/src/data-model-providers/codegen/tests:mock_model",
     "${chip_root}/src/lib/support",
-    "${chip_root}/src/lib/support:timer-delegate",
+    "${chip_root}/src/lib/support:timer-delegate-mock",
   ]
 }
diff --git a/src/app/reporting/tests/MockReportScheduler.cpp b/src/app/reporting/tests/MockReportScheduler.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/reporting/SynchronizedReportSchedulerImpl.h>
 
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -68,7 +68,7 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
 #include <transport/raw/WiFiPAF.h>
 #endif
-#include <app/TimerDelegateDefault.h>
+#include <app/DefaultTimerDelegate.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <transport/raw/UDP.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_NFC_BASED_COMMISSIONING
diff --git a/src/app/tests/TestCommissioningWindowManager.cpp b/src/app/tests/TestCommissioningWindowManager.cpp
@@ -15,8 +15,8 @@
  *    limitations under the License.
  */
 
+#include <app/DefaultTimerDelegate.h>
 #include <app/TestEventTriggerDelegate.h>
-#include <app/TimerDelegateDefault.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/Server.h>
diff --git a/src/controller/CHIPDeviceControllerFactory.cpp b/src/controller/CHIPDeviceControllerFactory.cpp
@@ -24,9 +24,9 @@
 
 #include <controller/CHIPDeviceControllerFactory.h>
 
+#include <app/DefaultTimerDelegate.h>
 #include <app/InteractionModelEngine.h>
 #include <app/OperationalSessionSetup.h>
-#include <app/TimerDelegateDefault.h>
 #include <app/reporting/ReportSchedulerImpl.h>
 #include <app/util/DataModelHandler.h>
 #include <lib/core/ErrorStr.h>
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
@@ -184,11 +184,17 @@ source_set("static-support") {
 }
 
 source_set("timer-delegate") {
-  sources = [
-    "TimerDelegate.h",
-    "TimerDelegateMock.h",
+  sources = [ "TimerDelegate.h" ]
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
   ]
+}
+
+source_set("timer-delegate-mock") {
+  sources = [ "TimerDelegateMock.h" ]
   public_deps = [
+    ":timer-delegate",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
   ]
