This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 1061ba6be0078ec00e6338f0cb1e12f315a54f01 Merge: c2bff140ec 32a30b5e66 Author: andi-huber <[email protected]> AuthorDate: Mon Jun 24 07:52:23 2024 +0200 Merge remote-tracking branch 'origin/master' into v3 .../ROOT/partials/module-nav/extensions.adoc | 1 + .../unrecoverable/BookmarkNotFoundException.adoc | 19 ++ .../services/filter/CollectionFilterService.adoc | 68 +------ .../index/services/metrics/MetricsService.adoc | 40 +++- .../index/titlecache/applib/event/Cached.adoc | 40 ++++ .../applib/event/CachedWithCacheSettings.adoc | 38 ++++ .../caffeine/dom/TitleCacheSubscriber.adoc | 46 +++++ .../changetracking/EntityChangeTrackerDefault.adoc | 16 +- .../modules/ROOT/partials/extensions.adoc | 1 + antora/playbooks/site.NEXT.yml | 3 + antora/playbooks/site.yml | 3 + .../applib/services/metrics/MetricsService.java | 48 ++++- .../services/publishing/log/PageRenderLogger.java | 35 +++- .../commons/internal/primitives/_Longs.java | 18 +- core/adoc/modules/_overview/pages/about.adoc | 180 ++++++++++++------ .../config/pages/sections/causeway.applib.adoc | 9 + .../config/pages/sections/causeway.extensions.adoc | 23 +++ .../core/config/CausewayConfiguration.java | 49 +++++ core/metamodel/src/main/java/module-info.java | 3 +- .../specloader/specimpl/ObjectActionDefault.java | 5 +- .../specloader/specimpl/ObjectActionMixedIn.java | 5 +- .../specimpl/ObjectSpecificationAbstract.java | 19 ++ .../core/metamodel/spi/EntityTitleSubscriber.java | 31 ++++ .../command/CommandExecutorServiceDefault.java | 5 +- .../transaction/scope/StackedTransactionScope.java | 96 ++++++---- extensions/core/titlecache/adoc/antora.yml | 19 ++ .../titlecache/adoc/modules/titlecache/nav.adoc | 4 + .../adoc/modules/titlecache/pages/about.adoc | 124 +++++++++++++ .../modules/titlecache/partials/module-nav.adoc | 6 + extensions/core/titlecache/applib/pom.xml | 45 +++++ .../applib/src/main/java/module-info.java | 25 +++ .../applib/CausewayModuleExtTitlecacheApplib.java | 27 +++ .../extensions/titlecache/applib/event/Cached.java | 53 ++++++ .../applib/event/CachedWithCacheSettings.java | 39 ++++ extensions/core/titlecache/caffeine/pom.xml | 71 +++++++ .../caffeine/src/main/java/module-info.java | 34 ++++ .../CausewayModuleExtTitlecacheCaffeine.java | 61 ++++++ .../caffeine/dom/TitleCacheSubscriber.java | 204 +++++++++++++++++++++ extensions/core/titlecache/pom.xml | 55 ++++++ extensions/pom.xml | 1 + .../changetracking/EntityChangeTrackerDefault.java | 147 +++++++++------ 41 files changed, 1449 insertions(+), 267 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderLogger.java index b353f79656,8cbc18173c..b6bbdb67e0 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderLogger.java @@@ -23,8 -23,11 +23,9 @@@ import java.util.Objects import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; - -import org.apache.causeway.applib.services.metrics.MetricsService; +import jakarta.annotation.Priority; ++import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; @@@ -33,6 -36,6 +34,7 @@@ import org.springframework.stereotype.S import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.bookmark.Bookmark; ++import org.apache.causeway.applib.services.metrics.MetricsService; import org.apache.causeway.applib.services.publishing.spi.PageRenderSubscriber; import org.apache.causeway.commons.internal.base._NullSafe; @@@ -98,7 -119,7 +118,7 @@@ public class PageRenderLogger implement // -- HELPER -- private static String bookmarksStringified(Supplier<List<Bookmark>> bookmarkSupplier) { ++ private static String bookmarksStringified(final Supplier<List<Bookmark>> bookmarkSupplier) { return _NullSafe.stream(bookmarkSupplier.get()) .filter(Objects::nonNull) .map(Bookmark::stringify)
