Allow Storage, Groups and Access Delegate injection on Server::Init() (…

…#16956)

* Allow Storage, Groups and Access Delegate injection on Server::Init()

- Clean-up Server::Init() arguments to have a single extendable
  struct of arguments.
- Extract `Server::DeviceStorageDelegate` to a new
  reusable `KvsPersistentStorageDelegate` class
- Allow injection of group data provider
- Allow injection if
- Fix names of the operational/UDC ports that were misleading
- Show usage of new injection via a couple line delta on all examples.

Fixes #12276

* Restyled by clang-format

* Add missing refactors

* Fix CI

* Fix CI

* Apply review comments

Co-authored-by: Restyled.io <commits@restyled.io>

examples/all-clusters-app/ameba/main/chipinterface.cpp

@@ -146,7 +146,9 @@ static void InitServer(intptr_t context)
 #endif
 
     // Init ZCL Data Model and CHIP App Server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/all-clusters-app/esp32/main/main.cpp

@@ -90,14 +90,14 @@ app::Clusters::NetworkCommissioning::Instance
 class AppCallbacks : public AppDelegate
 {
 public:
-    void OnRendezvousStarted() override { bluetoothLED.Set(true); }
-    void OnRendezvousStopped() override
+    void OnCommissioningSessionStarted() override { bluetoothLED.Set(true); }
+    void OnCommissioningSessionStopped() override
     {
         bluetoothLED.Set(false);
         pairingWindowLED.Set(false);
     }
-    void OnPairingWindowOpened() override { pairingWindowLED.Set(true); }
-    void OnPairingWindowClosed() override { pairingWindowLED.Set(false); }
+    void OnCommissioningWindowOpened() override { pairingWindowLED.Set(true); }
+    void OnCommissioningWindowClosed() override { pairingWindowLED.Set(false); }
 };
 
 AppCallbacks sCallbacks;
@@ -109,7 +109,10 @@ constexpr EndpointId kNetworkCommissioningEndpointSecondary = 0xFFFE;
 static void InitServer(intptr_t context)
 {
     // Init ZCL Data Model and CHIP App Server
-    chip::Server::GetInstance().Init(&sCallbacks);
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    initParams.appDelegate = &sCallbacks;
+    chip::Server::GetInstance().Init(initParams);
 
     // We only have network commissioning on endpoint 0.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);

examples/all-clusters-app/linux/fuzzing-main.cpp

@@ -41,7 +41,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
         VerifyOrDie(PlatformMgr().InitChipStack() == CHIP_NO_ERROR);
 
         // ChipLinuxAppMainLoop blocks, and we don't want that here.
-        VerifyOrDie(Server::GetInstance().Init() == CHIP_NO_ERROR);
+        static chip::CommonCaseDeviceServerInitParams initParams;
+        (void) initParams.InitializeStaticResourcesBeforeServerInit();
+        VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
 
         ApplicationInit();
 

examples/all-clusters-app/mbed/main/AppTask.cpp

@@ -63,7 +63,9 @@ int AppTask::Init()
         0);
 
     // Init ZCL Data Model and start server
-    error = Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    error = Server::GetInstance().Init(initParams);
     if (error != CHIP_NO_ERROR)
     {
         ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());

examples/all-clusters-app/nrfconnect/main/AppTask.cpp

@@ -130,7 +130,10 @@ CHIP_ERROR AppTask::Init()
 
     // Initialize CHIP server
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-    ReturnErrorOnFailure(chip::Server::GetInstance().Init());
+
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
 #if CONFIG_CHIP_OTA_REQUESTOR
     InitBasicOTARequestor();
 #endif

examples/all-clusters-app/p6/src/AppTask.cpp

@@ -84,7 +84,9 @@ void NetWorkCommissioningInstInit()
 static void InitServer(intptr_t context)
 {
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/bridge-app/esp32/main/main.cpp

@@ -371,7 +371,9 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask)
 
 static void InitServer(intptr_t context)
 {
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/bridge-app/linux/main.cpp

@@ -654,7 +654,9 @@ int main(int argc, char * argv[])
     chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(true);
 
     // Init ZCL Data Model and CHIP App Server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/light-switch-app/efr32/src/main.cpp

@@ -167,7 +167,9 @@ int main(void)
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     EFR32_LOG("Starting Platform Manager Event Loop");

examples/light-switch-app/nrfconnect/main/AppTask.cpp

@@ -159,7 +159,9 @@ CHIP_ERROR AppTask::Init()
 
     // Print initial configs
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-    ReturnErrorOnFailure(Server::GetInstance().Init());
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    ReturnErrorOnFailure(initParams.InitializeStaticResourcesBeforeServerInit());
+    ReturnErrorOnFailure(Server::GetInstance().Init(initParams));
 #if CONFIG_CHIP_OTA_REQUESTOR
     InitBasicOTARequestor();
 #endif

examples/lighting-app/ameba/main/chipinterface.cpp

@@ -167,7 +167,9 @@ static void InitServer(intptr_t context)
 #endif
 
     // Init ZCL Data Model and CHIP App Server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lighting-app/cyw30739/src/main.cpp

@@ -136,7 +136,9 @@ void InitApp(intptr_t args)
     PlatformMgrImpl().AddEventHandler(EventHandler, 0);
 
     /* Start CHIP datamodel server */
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 

examples/lighting-app/efr32/src/main.cpp

@@ -171,7 +171,9 @@ int main(void)
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     EFR32_LOG("Starting Platform Manager Event Loop");

examples/lighting-app/esp32/main/main.cpp

@@ -81,7 +81,9 @@ static void InitServer(intptr_t context)
     // Print QR Code URL
     PrintOnboardingCodes(chip::RendezvousInformationFlags(CONFIG_RENDEZVOUS_MODE));
 
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lighting-app/mbed/main/AppTask.cpp

@@ -115,7 +115,10 @@ int AppTask::Init()
     LightingMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Init ZCL Data Model and start server
-    error = Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    error = Server::GetInstance().Init(initParams);
     if (error != CHIP_NO_ERROR)
     {
         ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());

examples/lighting-app/nrfconnect/main/AppTask.cpp

@@ -168,7 +168,11 @@ CHIP_ERROR AppTask::Init()
     // Initialize CHIP server
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     chip::app::DnssdServer::Instance().SetExtendedDiscoveryTimeoutSecs(kExtDiscoveryTimeoutSecs);
-    ReturnErrorOnFailure(chip::Server::GetInstance().Init());
+
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
 #if CONFIG_CHIP_OTA_REQUESTOR
     InitBasicOTARequestor();
 #endif

examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp

@@ -111,7 +111,9 @@ CHIP_ERROR AppTask::Init()
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     // Init ZCL Data Model and start server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
 #ifdef ENABLE_HSM_DEVICE_ATTESTATION

examples/lighting-app/p6/src/AppTask.cpp

@@ -88,7 +88,9 @@ void NetWorkCommissioningInstInit()
 static void InitServer(intptr_t context)
 {
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lighting-app/qpg/src/AppTask.cpp

@@ -114,7 +114,9 @@ CHIP_ERROR AppTask::Init()
 #endif
 
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Init OTA engine
     InitializeOTARequestor();

examples/lighting-app/telink/src/AppTask.cpp

@@ -98,7 +98,9 @@ CHIP_ERROR AppTask::Init()
     LightingMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Init ZCL Data Model and start server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp

@@ -156,7 +156,9 @@ int AppTask::Init()
 
     // Init ZCL Data Model and start server
     PLAT_LOG("Initialize Server");
-    Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lock-app/cyw30739/src/main.cpp

@@ -132,7 +132,9 @@ APPLICATION_START()
     PlatformMgrImpl().AddEventHandler(EventHandler, 0);
 
     /* Start CHIP datamodel server */
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 

examples/lock-app/efr32/src/main.cpp

@@ -167,7 +167,9 @@ int main(void)
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     EFR32_LOG("Starting Platform Manager Event Loop");

examples/lock-app/esp32/main/main.cpp

@@ -63,7 +63,9 @@ app::Clusters::NetworkCommissioning::Instance
 
 static void InitServer(intptr_t context)
 {
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lock-app/mbed/main/AppTask.cpp

@@ -118,7 +118,10 @@ int AppTask::Init()
     BoltLockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Init ZCL Data Model and start server
-    error = Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    error = Server::GetInstance().Init(initParams);
     if (error != CHIP_NO_ERROR)
     {
         ChipLogError(NotSpecified, "Server initialization failed: %s", error.AsString());

examples/lock-app/nrfconnect/main/AppTask.cpp

@@ -149,7 +149,10 @@ CHIP_ERROR AppTask::Init()
 
     // Initialize CHIP server
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-    ReturnErrorOnFailure(chip::Server::GetInstance().Init());
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
 #if CONFIG_CHIP_OTA_REQUESTOR
     InitBasicOTARequestor();
 #endif

examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp

@@ -86,7 +86,9 @@ CHIP_ERROR AppTask::Init()
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     // Init ZCL Data Model and start server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lock-app/p6/src/AppTask.cpp

@@ -86,7 +86,9 @@ void NetWorkCommissioningInstInit()
 static void InitServer(intptr_t context)
 {
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/lock-app/qpg/src/AppTask.cpp

@@ -117,7 +117,9 @@ CHIP_ERROR AppTask::Init()
 #endif
 
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Init OTA engine
     InitializeOTARequestor();

examples/log-source-app/linux/main.cpp

@@ -100,7 +100,9 @@ int main(int argc, char * argv[])
     }
 
     chip::DeviceLayer::ConfigurationMgr().LogDeviceConfig();
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(chip::Credentials::Examples::GetExampleDACProvider());

examples/ota-provider-app/esp32/main/main.cpp

@@ -70,7 +70,9 @@ app::Clusters::NetworkCommissioning::Instance
 
 static void InitServer(intptr_t context)
 {
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/ota-requestor-app/ameba/main/chipinterface.cpp

@@ -127,7 +127,9 @@ static void InitServer(intptr_t context)
     InitOTARequestor();
 
     // Init ZCL Data Model and CHIP App Server
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     // Initialize device attestation config
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

examples/ota-requestor-app/cyw30739/src/main.cpp

@@ -124,7 +124,9 @@ void InitApp(intptr_t args)
     ConfigurationMgr().LogDeviceConfig();
 
     /* Start CHIP datamodel server */
-    Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 

examples/ota-requestor-app/efr32/src/AppTask.cpp

@@ -127,7 +127,9 @@ CHIP_ERROR AppTask::Init()
     CHIP_ERROR err = CHIP_NO_ERROR;
 
     // Init ZCL Data Model
-    chip::Server::GetInstance().Init();
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    chip::Server::GetInstance().Init(initParams);
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
     // Initialize device attestation config