Use StartUp to init

project-chip · Dec 4, 2024 · 96b12a6 · 96b12a6
1 parent 2ed8dfb
commit 96b12a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp
@@ -1836,8 +1836,6 @@ DataModel::Provider * InteractionModelEngine::SetDataModelProvider(DataModel::Pr
     mDataModelProvider = model;
     if (mDataModelProvider != nullptr)
     {
-        mDataModelProvider->Init();
-
         DataModel::InteractionModelContext context;
 
         context.eventsGenerator         = &EventManagement::GetInstance();

diff --git a/src/app/codegen-data-model-provider/CodegenDataModelProvider.h b/src/app/codegen-data-model-provider/CodegenDataModelProvider.h
@@ -21,6 +21,7 @@
 #include <app/CommandHandlerInterface.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/data-model-provider/ActionReturnStatus.h>
+#include <app/data-model-provider/Context.h>
 #include <app/util/DataModelHandler.h>
 #include <app/util/af-types.h>
 
@@ -126,13 +127,6 @@ class CodegenDataModelProvider : public DataModel::Provider
     };
 
 public:
-    void Init() override
-    {
-        // Call the Ember-specific InitDataModelHandler
-        InitDataModelHandler();
-        ChipLogProgress(AppServer, "CodegenDataModelHandler initialized.");
-    }
-
     /// clears out internal caching. Especially useful in unit tests,
     /// where path caching does not really apply (the same path may result in different outcomes)
     void Reset()
@@ -143,6 +137,17 @@ class CodegenDataModelProvider : public DataModel::Provider
     }
 
     /// Generic model implementations
+    CHIP_ERROR Startup(DataModel::InteractionModelContext context) override
+    {
+        // Call the base class's Startup method to ensure base initialization
+        ReturnErrorOnFailure(DataModel::Provider::Startup(context));
+
+        // Call the Ember-specific InitDataModelHandler
+        InitDataModelHandler();
+
+        return CHIP_NO_ERROR;
+    }
+
     CHIP_ERROR Shutdown() override
     {
         Reset();

diff --git a/src/app/data-model-provider/Provider.h b/src/app/data-model-provider/Provider.h
@@ -47,8 +47,6 @@ class Provider : public ProviderMetadataTree
 public:
     virtual ~Provider() = default;
 
-    virtual void Init() = 0;
-
     // `context` pointers  will be guaranteed valid until Shutdown is called()
     virtual CHIP_ERROR Startup(InteractionModelContext context)
     {