From 2483cd7199b0210cd8f04a1291c91fd17696e903 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 18 Nov 2024 11:07:39 -0500 Subject: [PATCH] One more path update --- examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp | 2 +- examples/all-clusters-app/linux/fuzzing-main.cpp | 2 +- examples/all-clusters-app/mbed/main/AppTask.cpp | 2 +- .../all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp | 2 +- examples/all-clusters-minimal-app/linux/fuzzing-main.cpp | 2 +- examples/all-clusters-minimal-app/mbed/main/AppTask.cpp | 2 +- examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp | 2 +- examples/chef/esp32/main/main.cpp | 2 +- examples/chef/nrfconnect/main.cpp | 2 +- examples/lighting-app/mbed/main/AppTask.cpp | 2 +- examples/lock-app/cc32xx/main/AppTask.cpp | 2 +- examples/lock-app/genio/src/AppTask.cpp | 2 +- examples/lock-app/mbed/main/AppTask.cpp | 2 +- examples/ota-requestor-app/mbed/main/AppTask.cpp | 2 +- examples/platform/asr/init_Matter.cpp | 2 +- examples/platform/beken/common/BekenAppServer.cpp | 2 +- examples/platform/esp32/common/Esp32AppServer.cpp | 2 +- examples/platform/linux/AppMain.cpp | 2 +- examples/platform/nxp/common/app_task/source/AppTaskBase.cpp | 2 +- examples/platform/nxp/se05x/linux/AppMain.cpp | 2 +- examples/platform/silabs/MatterConfig.cpp | 2 +- examples/shell/cc13x4_26x4/main/AppTask.cpp | 2 +- examples/tv-casting-app/linux/main.cpp | 2 +- src/app/server/java/AndroidAppServerWrapper.cpp | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp index f95183f3b5ce07..3b127091f13277 100644 --- a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp @@ -130,7 +130,7 @@ static void InitServer(intptr_t context) // Init ZCL Data Model static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); // We only have network commissioning on endpoint 0. diff --git a/examples/all-clusters-app/linux/fuzzing-main.cpp b/examples/all-clusters-app/linux/fuzzing-main.cpp index eb57f4fc05dd60..5056f08cce65f4 100644 --- a/examples/all-clusters-app/linux/fuzzing-main.cpp +++ b/examples/all-clusters-app/linux/fuzzing-main.cpp @@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize) // ChipLinuxAppMainLoop blocks, and we don't want that here. static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR); ApplicationInit(); diff --git a/examples/all-clusters-app/mbed/main/AppTask.cpp b/examples/all-clusters-app/mbed/main/AppTask.cpp index 5b6fa6eb06590e..98b8597ba43e5f 100644 --- a/examples/all-clusters-app/mbed/main/AppTask.cpp +++ b/examples/all-clusters-app/mbed/main/AppTask.cpp @@ -72,7 +72,7 @@ int AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); error = Server::GetInstance().Init(initParams); if (error != CHIP_NO_ERROR) { diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp index c2cb142f845e46..29ad68b74241f1 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp +++ b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp @@ -128,7 +128,7 @@ static void InitServer(intptr_t context) // Init ZCL Data Model static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); // We only have network commissioning on endpoint 0. diff --git a/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp b/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp index 3d41fecde609da..ccd2ffa782b4dd 100644 --- a/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp +++ b/examples/all-clusters-minimal-app/linux/fuzzing-main.cpp @@ -44,7 +44,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize) // ChipLinuxAppMainLoop blocks, and we don't want that here. static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR); ApplicationInit(); diff --git a/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp index 4886455b1c0364..e516aee49e6e74 100644 --- a/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/mbed/main/AppTask.cpp @@ -68,7 +68,7 @@ int AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); error = Server::GetInstance().Init(initParams); if (error != CHIP_NO_ERROR) { diff --git a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp index 49e39c922b1e1b..8d9771fa593204 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp +++ b/examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp @@ -174,7 +174,7 @@ CHIP_ERROR AppTask::Init() initParams.operationalKeystore = &sPSAOperationalKeystore; #endif (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams)); AppFabricTableDelegate::Init(); diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp index 4bea3003556823..ef5dd73dcabcf3 100644 --- a/examples/chef/esp32/main/main.cpp +++ b/examples/chef/esp32/main/main.cpp @@ -160,7 +160,7 @@ void InitServer(intptr_t) // Start IM server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); // Device Attestation & Onboarding codes diff --git a/examples/chef/nrfconnect/main.cpp b/examples/chef/nrfconnect/main.cpp index e2fd0e6a633e6c..e7e706409ff421 100644 --- a/examples/chef/nrfconnect/main.cpp +++ b/examples/chef/nrfconnect/main.cpp @@ -126,7 +126,7 @@ int main() initParams.operationalKeystore = &sPSAOperationalKeystore; #endif (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); err = chip::Server::GetInstance().Init(initParams); if (err != CHIP_NO_ERROR) { diff --git a/examples/lighting-app/mbed/main/AppTask.cpp b/examples/lighting-app/mbed/main/AppTask.cpp index 8d5b9725ed94f3..ce4d45a3aa9758 100644 --- a/examples/lighting-app/mbed/main/AppTask.cpp +++ b/examples/lighting-app/mbed/main/AppTask.cpp @@ -117,7 +117,7 @@ int AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); error = Server::GetInstance().Init(initParams); if (error != CHIP_NO_ERROR) diff --git a/examples/lock-app/cc32xx/main/AppTask.cpp b/examples/lock-app/cc32xx/main/AppTask.cpp index 8a605f9c5db9d1..d610325b54a3fe 100644 --- a/examples/lock-app/cc32xx/main/AppTask.cpp +++ b/examples/lock-app/cc32xx/main/AppTask.cpp @@ -152,7 +152,7 @@ int AppTask::Init() PLAT_LOG("Initialize Server"); static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); // Initialize device attestation config diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp index 234730ef51f53d..fad169f9100abd 100644 --- a/examples/lock-app/genio/src/AppTask.cpp +++ b/examples/lock-app/genio/src/AppTask.cpp @@ -138,7 +138,7 @@ CHIP_ERROR AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); // Initialize device attestation config diff --git a/examples/lock-app/mbed/main/AppTask.cpp b/examples/lock-app/mbed/main/AppTask.cpp index 32c8bbd2b136a9..bfa4ae73c0b258 100644 --- a/examples/lock-app/mbed/main/AppTask.cpp +++ b/examples/lock-app/mbed/main/AppTask.cpp @@ -120,7 +120,7 @@ int AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); error = Server::GetInstance().Init(initParams); if (error != CHIP_NO_ERROR) diff --git a/examples/ota-requestor-app/mbed/main/AppTask.cpp b/examples/ota-requestor-app/mbed/main/AppTask.cpp index d42d8240a12991..90436d57296acd 100644 --- a/examples/ota-requestor-app/mbed/main/AppTask.cpp +++ b/examples/ota-requestor-app/mbed/main/AppTask.cpp @@ -107,7 +107,7 @@ int AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); error = Server::GetInstance().Init(initParams); if (error != CHIP_NO_ERROR) diff --git a/examples/platform/asr/init_Matter.cpp b/examples/platform/asr/init_Matter.cpp index 4eaff125dc8b0f..8280618c2668e1 100644 --- a/examples/platform/asr/init_Matter.cpp +++ b/examples/platform/asr/init_Matter.cpp @@ -101,7 +101,7 @@ CHIP_ERROR MatterInitializer::Init_Matter_Server(void) chip::DeviceLayer::PlatformMgr().LockChipStack(); static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider); chip::Server::GetInstance().Init(initParams); diff --git a/examples/platform/beken/common/BekenAppServer.cpp b/examples/platform/beken/common/BekenAppServer.cpp index 8a735dacb0ac8d..7db986538189a7 100644 --- a/examples/platform/beken/common/BekenAppServer.cpp +++ b/examples/platform/beken/common/BekenAppServer.cpp @@ -39,7 +39,7 @@ void BekenAppServer::Init(AppDelegate * sAppDelegate) // Init ZCL Data Model and CHIP App Server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); if (sAppDelegate != nullptr) { initParams.appDelegate = sAppDelegate; diff --git a/examples/platform/esp32/common/Esp32AppServer.cpp b/examples/platform/esp32/common/Esp32AppServer.cpp index f61b6545cd4889..e05817bfe0676d 100644 --- a/examples/platform/esp32/common/Esp32AppServer.cpp +++ b/examples/platform/esp32/common/Esp32AppServer.cpp @@ -152,7 +152,7 @@ void Esp32AppServer::Init(AppDelegate * sAppDelegate) initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate; #endif // CONFIG_TEST_EVENT_TRIGGER_ENABLED && CONFIG_ENABLE_OTA_REQUESTOR (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); if (sAppDelegate != nullptr) { initParams.appDelegate = sAppDelegate; diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp index 03179da3945fb5..ddd4d82420d026 100644 --- a/examples/platform/linux/AppMain.cpp +++ b/examples/platform/linux/AppMain.cpp @@ -533,7 +533,7 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl) static chip::CommonCaseDeviceServerInitParams initParams; VerifyOrDie(initParams.InitializeStaticResourcesBeforeServerInit() == CHIP_NO_ERROR); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); #if defined(ENABLE_CHIP_SHELL) Engine::Root().Init(); diff --git a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp index 5748c68d13c7c9..00ccbb9ea31269 100644 --- a/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp +++ b/examples/platform/nxp/common/app_task/source/AppTaskBase.cpp @@ -186,7 +186,7 @@ void chip::NXP::App::AppTaskBase::InitServer(intptr_t arg) initParams.operationalKeystore = chip::NXP::App::OperationalKeystore::GetInstance(); #endif (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); #if CONFIG_NET_L2_OPENTHREAD // Init ZCL Data Model and start server diff --git a/examples/platform/nxp/se05x/linux/AppMain.cpp b/examples/platform/nxp/se05x/linux/AppMain.cpp index f19945958a6ba0..5baf36112b31b2 100644 --- a/examples/platform/nxp/se05x/linux/AppMain.cpp +++ b/examples/platform/nxp/se05x/linux/AppMain.cpp @@ -292,7 +292,7 @@ void ChipLinuxAppMainLoop(AppMainLoopImplementation * impl) static chip::CommonCaseDeviceServerInitParams initParams; VerifyOrDie(initParams.InitializeStaticResourcesBeforeServerInit() == CHIP_NO_ERROR); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); #if defined(ENABLE_CHIP_SHELL) Engine::Root().Init(); diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp index 6fc1383404228a..c382a3ab1aa98f 100644 --- a/examples/platform/silabs/MatterConfig.cpp +++ b/examples/platform/silabs/MatterConfig.cpp @@ -276,7 +276,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName) // Initialize the remaining (not overridden) providers to the SDK example defaults (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); #if CHIP_ENABLE_OPENTHREAD // Set up OpenThread configuration when OpenThread is included diff --git a/examples/shell/cc13x4_26x4/main/AppTask.cpp b/examples/shell/cc13x4_26x4/main/AppTask.cpp index 17dda2b7eb06c0..cc6122cef027bc 100644 --- a/examples/shell/cc13x4_26x4/main/AppTask.cpp +++ b/examples/shell/cc13x4_26x4/main/AppTask.cpp @@ -162,7 +162,7 @@ CHIP_ERROR AppTask::Init() // Init ZCL Data Model and start server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); chip::Server::GetInstance().Init(initParams); ret = PlatformMgr().StartEventLoopTask(); diff --git a/examples/tv-casting-app/linux/main.cpp b/examples/tv-casting-app/linux/main.cpp index d2d4ed3a6af94c..3a41f15d531c30 100644 --- a/examples/tv-casting-app/linux/main.cpp +++ b/examples/tv-casting-app/linux/main.cpp @@ -141,7 +141,7 @@ int main(int argc, char * argv[]) // Enter commissioning mode, open commissioning window static chip::CommonCaseDeviceServerInitParams initParams; VerifyOrDie(CHIP_NO_ERROR == initParams.InitializeStaticResourcesBeforeServerInit()); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); VerifyOrDie(CHIP_NO_ERROR == chip::Server::GetInstance().Init(initParams)); if (argc > 1) diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp index 38b6e45e7be383..893049820eee8a 100644 --- a/src/app/server/java/AndroidAppServerWrapper.cpp +++ b/src/app/server/java/AndroidAppServerWrapper.cpp @@ -51,7 +51,7 @@ CHIP_ERROR ChipAndroidAppInit(AppDelegate * appDelegate) // Init ZCL Data Model and CHIP App Server static chip::CommonCaseDeviceServerInitParams initParams; (void) initParams.InitializeStaticResourcesBeforeServerInit(); - initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(); + initParams.dataModelProvider = app::CodegenDataModelProviderInstance(); if (appDelegate != nullptr) { initParams.appDelegate = appDelegate;