samples: matter: Align AttributePersistenceProvider with upstream

Aligned DefaultAttributePersistenceProvider and
DeferredAttributePersistenceProvider with the recent changes
in Matter Upstream repository.

Signed-off-by: Arkadiusz Balys <[email protected]>

Author: ArekBalysNordic

samples/matter/light_bulb/CMakeLists.txt

@@ -37,6 +37,7 @@ target_sources(app PRIVATE
     src/app_task.cpp
     src/main.cpp
     src/zcl_callbacks.cpp
+    ${CHIP_ROOT}/src/app/util/persistence/DeferredAttributePersistenceProvider.cpp
 )
 
 ncs_configure_data_model()

samples/matter/light_bulb/src/app_task.cpp

@@ -18,9 +18,10 @@
 #endif
 
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/DeferredAttributePersistenceProvider.h>
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/server/Server.h>
+#include <app/util/persistence/DefaultAttributePersistenceProvider.h>
+#include <app/util/persistence/DeferredAttributePersistenceProvider.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
 #include <zephyr/logging/log.h>
@@ -57,7 +58,10 @@ const struct pwm_dt_spec sLightPwmDevice = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led1));
 // be written, so it must live so long as the DeferredAttributePersistenceProvider object.
 DeferredAttribute gCurrentLevelPersister(ConcreteAttributePath(kLightEndpointId, Clusters::LevelControl::Id,
 							       Clusters::LevelControl::Attributes::CurrentLevel::Id));
-DeferredAttributePersistenceProvider gDeferredAttributePersister(Server::GetInstance().GetDefaultAttributePersister(),
+
+// Deferred persistence will be auto-initialized as soon as the default persistence is initialized
+DefaultAttributePersistenceProvider gSimpleAttributePersistence;
+DeferredAttributePersistenceProvider gDeferredAttributePersister(gSimpleAttributePersistence,
 								 Span<DeferredAttribute>(&gCurrentLevelPersister, 1),
 								 System::Clock::Milliseconds32(5000));