This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit d2722799b2bfa750dff9c8f91cc9126b8c975bae Merge: b25e15fae8 72fdd94b00 Author: Dan Haywood <[email protected]> AuthorDate: Tue Jun 25 22:04:48 2024 +0200 merges from v2, fixes jakarta imports ...sewayModuleApplibChangeAndExecutionLoggers.java | 10 ++- .../publishing/log/EntityPropertyChangeLogger.java | 3 +- ...Logger.java => PageRenderCollectionLogger.java} | 55 +++++----------- ...gger.java => PageRenderDomainObjectLogger.java} | 75 ++++----------------- ...hangeLogger.java => PageRenderValueLogger.java} | 44 ++++++++----- .../applib/services/publishing/log/Timing.java | 31 +++++++++ .../viewer/wicket/viewer/integration/Timing.java | 31 +++++++++ .../integration/WebRequestCycleForCauseway.java | 76 +++++++++++++++++----- 8 files changed, 187 insertions(+), 138 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java index d6eb31069e,b10666cf16..d197d04cdf --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/EntityPropertyChangeLogger.java @@@ -18,11 -18,9 +18,9 @@@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; - import org.apache.causeway.commons.collections.Can; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java index b6bbdb67e0,f0b9ef500a..f315898e7f --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderCollectionLogger.java @@@ -109,16 -91,9 +91,9 @@@ public class PageRenderCollectionLogge } - @Override - public void onRenderedValue(final Object value) { - if(log.isDebugEnabled()) { - log.debug("rendered value: [ {} ]", doubleQuoted(value)); - } - } - // -- 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) diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java index b6bbdb67e0,56bb8745b0..9c16f52006 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderDomainObjectLogger.java @@@ -18,17 -18,11 +18,11 @@@ */ package org.apache.causeway.applib.services.publishing.log; - import java.util.List; - 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 jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; - import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; import org.apache.causeway.applib.CausewayModuleApplib; diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java index d6eb31069e,224a31b65c..7e04977e16 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/publishing/log/PageRenderValueLogger.java @@@ -18,11 -18,10 +18,10 @@@ */ package org.apache.causeway.applib.services.publishing.log; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; ++import jakarta.inject.Inject; +import jakarta.inject.Named; - import org.apache.causeway.commons.collections.Can; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service;
