Branch: refs/heads/backport/stable-16.10.x/pr-4470 Home: https://github.com/xwiki/xwiki-platform Commit: f9c4d92fe1a52914cf4ffbe8b486f27117d3d054 https://github.com/xwiki/xwiki-platform/commit/f9c4d92fe1a52914cf4ffbe8b486f... Author: Simon Urli <[email protected]> Date: 2025-08-14 (Thu, 14 Aug 2025) Changed paths: M xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/src/main/java/org/xwiki/extension/security/internal/livedata/ExtensionSecurityLiveDataConfigurationResolver.java A xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/AbstractLiveDataConfigurationResolver.java M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/src/main/java/org/xwiki/livedata/internal/JSONMerge.java M xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/DefaultLiveDataConfigurationResolver.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/custom/NotificationCustomFiltersLiveDataConfigurationResolver.java M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/system/NotificationSystemFiltersLiveDataConfigurationResolver.java Log Message: ----------- XWIKI-23451: Configuration of CustomNotificationFilterPreferences livedata cannot be overridden (#4470) * Define a common abstraction for all LiveDataConfigurationResolvers that are using LiveDataConfiguration to ensure that the ID is properly set and that the merge is used in the right way * Use that new common abstraction in all existing resolvers * Simplify a bit the code * Provide more doc on JSONMerge --------- Co-authored-by: Marius Dumitru Florea <[email protected]> (cherry picked from commit 7f5e1a505c56aea062bb9019eef05eedea3b3b05) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications