Remove dependency between DataModel::Provider and CommandHandlerInter…

…face (project-chip#37747) This splits out the CHI to be separate from command handlers and keep the command handler as a stand-alone item.
silabs-olivierb · Feb 24, 2025 · d618ccb · d618ccb
1 parent d09d176
commit d618ccb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/src/app/AttributePathExpandIterator.h b/src/app/AttributePathExpandIterator.h
@@ -25,6 +25,7 @@
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/LinkedList.h>
 #include <lib/support/Span.h>
+#include <messaging/ExchangeContext.h>
 
 #include <limits>
 

diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -362,20 +362,37 @@ source_set("status-response") {
   ]
 }
 
-source_set("command-handler-interface") {
+source_set("command-handler") {
   sources = [
     "CommandHandler.cpp",
     "CommandHandler.h",
+  ]
+
+  public_deps = [
+    ":paths",
+    "${chip_root}/src/access:types",
+    "${chip_root}/src/app/data-model",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/messaging",
+    "${chip_root}/src/protocols/interaction_model",
+  ]
+}
+
+source_set("command-handler-interface") {
+  sources = [
     "CommandHandlerExchangeInterface.h",
     "CommandHandlerInterface.h",
     "CommandHandlerInterfaceRegistry.cpp",
     "CommandHandlerInterfaceRegistry.h",
   ]
 
   public_deps = [
+    ":command-handler",
     ":paths",
     "${chip_root}/src/access:types",
     "${chip_root}/src/app/data-model",
+    "${chip_root}/src/app/data-model-provider",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/messaging",

diff --git a/src/app/CommandHandler.h b/src/app/CommandHandler.h
@@ -17,14 +17,15 @@
  */
 #pragma once
 
-#include <app/CommandHandlerExchangeInterface.h>
+#include <access/SubjectDescriptor.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model/EncodableToTLV.h>
 #include <app/data-model/Encode.h>
 #include <lib/core/CHIPCore.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/IntrusiveList.h>
 #include <lib/support/logging/CHIPLogging.h>
+#include <messaging/ExchangeContext.h>
 #include <protocols/interaction_model/StatusCode.h>
 
 namespace chip {

diff --git a/src/app/CommandHandlerImpl.h b/src/app/CommandHandlerImpl.h
@@ -18,6 +18,8 @@
 
 #include <app/CommandHandler.h>
 
+#include <app/CommandHandlerExchangeInterface.h>
+#include <app/CommandHandlerInterface.h>
 #include <app/CommandPathRegistry.h>
 #include <app/MessageDef/InvokeRequestMessage.h>
 #include <app/MessageDef/InvokeResponseMessage.h>

diff --git a/src/app/data-model-provider/BUILD.gn b/src/app/data-model-provider/BUILD.gn
@@ -45,7 +45,7 @@ source_set("data-model-provider") {
   public_deps = [
     ":metadata",
     "${chip_root}/src/app:attribute-access",
-    "${chip_root}/src/app:command-handler-interface",
+    "${chip_root}/src/app:command-handler",
     "${chip_root}/src/app:events",
     "${chip_root}/src/app:paths",
     "${chip_root}/src/app/MessageDef",