You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2024/06/18 14:33:03 UTC
(causeway) branch CAUSEWAY-3781 updated: CAUSEWAY-3781: in logging, trims length if bookmark is not an entity
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3781
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/CAUSEWAY-3781 by this push:
new 777840c566 CAUSEWAY-3781: in logging, trims length if bookmark is not an entity
777840c566 is described below
commit 777840c56642fa3f3c1e9bc06200c939955ad62d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 18 15:32:56 2024 +0100
CAUSEWAY-3781: in logging, trims length if bookmark is not an entity
---
.../causeway/core/metamodel/commons/UtilStr.java | 45 ++++++++++++++++++++++
.../specloader/specimpl/ObjectActionDefault.java | 10 +++--
.../specloader/specimpl/ObjectActionMixedIn.java | 15 +++++---
.../command/CommandExecutorServiceDefault.java | 20 ++++++----
4 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java
new file mode 100644
index 0000000000..8ea6ddd524
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/commons/UtilStr.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.core.metamodel.commons;
+
+import lombok.experimental.UtilityClass;
+import lombok.val;
+
+import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
+import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
+
+@UtilityClass
+public class UtilStr {
+
+ /**
+ * String representation of bookmark for entities (otherwise only the logical type name).
+ */
+ public static String entityAsStr(Bookmark bookmark, SpecificationLoader specificationLoader) {
+ val logicalTypeName = bookmark.getLogicalTypeName();
+ val isEntity = specificationLoader
+ .lookupLogicalType(logicalTypeName)
+ .flatMap(specificationLoader::specForLogicalType)
+ .map(ObjectSpecification::isEntity)
+ .orElse(false);
+ return isEntity
+ ? bookmark.stringify()
+ : logicalTypeName;
+ }
+}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 10f9a23902..19c67c78cc 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -38,6 +38,7 @@ import org.apache.causeway.commons.functional.IndexedFunction;
import org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Lazy;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.core.metamodel.commons.UtilStr;
import org.apache.causeway.core.metamodel.consent.Consent;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.consent.InteractionResultSet;
@@ -462,13 +463,16 @@ implements ObjectAction {
if(!interactionInitiatedBy.isPassThrough()) {
setupCommand(head, argumentAdapters);
+
if(log.isInfoEnabled()) {
- log.info("Executing: {} {} {}",
+ Optional<Bookmark> bookmarkIfAny = owner.getBookmark();
+ bookmarkIfAny.ifPresent(bookmark -> { // should always be true
+ log.info("Executing: {} {} {}",
getFeatureIdentifier(),
- owner.getBookmark().map(Bookmark::toString).orElse(null),
+ UtilStr.entityAsStr(bookmark, getSpecificationLoader()),
argsFor(getParameters(), argumentAdapters));
+ });
}
-
}
return this.executeInternal(head, argumentAdapters, interactionInitiatedBy);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index e5a946d2ce..c75a151974 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -27,6 +27,7 @@ import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.collections.CanVector;
import org.apache.causeway.commons.functional.IndexedFunction;
import org.apache.causeway.commons.internal.assertions._Assert;
+import org.apache.causeway.core.metamodel.commons.UtilStr;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
@@ -45,6 +46,7 @@ import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import lombok.val;
+import java.util.Optional;
import java.util.stream.Collectors;
@Log4j2
@@ -180,13 +182,16 @@ implements MixedInMember {
"head has the wrong target (should be a mixed-in adapter, but is the mixee adapter)");
if(!interactionInitiatedBy.isPassThrough()) {
- // skip if is PASS_THROUGH
setupCommand(head, argumentAdapters);
+
if(log.isInfoEnabled()) {
- log.info("Executing: {} {} {}",
- getFeatureIdentifier(),
- owner.getBookmark().map(Bookmark::toString).orElse(null),
- argsFor(getParameters(), argumentAdapters));
+ Optional<Bookmark> bookmarkIfAny = owner.getBookmark();
+ bookmarkIfAny.ifPresent(bookmark -> { // should always be true
+ log.info("Executing: {} {} {}",
+ getFeatureIdentifier(),
+ UtilStr.entityAsStr(bookmark, getSpecificationLoader()),
+ argsFor(getParameters(), argumentAdapters));
+ });
}
}
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java
index e2d01cfe0c..3eb439a18d 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -28,11 +28,12 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
-import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.core.metamodel.commons.UtilStr;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
+import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.bookmark.Bookmark;
import org.apache.causeway.applib.services.bookmark.BookmarkService;
@@ -40,6 +41,7 @@ import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.command.CommandExecutorService;
import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker;
+import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.sudo.SudoService;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
@@ -92,6 +94,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
@Inject final TransactionService transactionService;
@Inject final InteractionLayerTracker interactionLayerTracker;
@Inject final SchemaValueMarshaller valueMarshaller;
+ @Inject final MetaModelService metaModelService;
@Inject Provider<CommandPublisher> commandPublisherProvider;
@Inject @Getter final SpecificationLoader specificationLoader;
@@ -172,9 +175,11 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
private Bookmark doExecuteCommand(final CommandDto dto) {
if(log.isInfoEnabled()) {
- log.info("Executing: {} {} {} {} {}",
+ log.info("Executing: {} {} {} {}",
dto.getMember().getLogicalMemberIdentifier(),
- dto.getTimestamp(), dto.getInteractionId(), oidFor(dto), argsFor(dto));
+ dto.getInteractionId(),
+ targetBookmarkStrFor(dto, specificationLoader),
+ argStrFor(dto));
}
val memberDto = dto.getMember();
@@ -242,12 +247,13 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
return null;
}
- private static String oidFor(CommandDto dto) {
- Stream<String> bookmarkStrings = dto.getTargets().getOid().stream().map(Bookmark::forOidDto).map(Bookmark::stringify);
- return bookmarkStrings.collect(Collectors.joining(","));
+ private String targetBookmarkStrFor(CommandDto dto, SpecificationLoader specificationLoader) {
+ return dto.getTargets().getOid().stream()
+ .map(oidDto -> UtilStr.entityAsStr(Bookmark.forOidDto(oidDto), specificationLoader))
+ .collect(Collectors.joining(";"));
}
- private String argsFor(CommandDto dto) {
+ private String argStrFor(CommandDto dto) {
val memberDto = dto.getMember();
if(memberDto instanceof ActionDto) {
val actionDto = (ActionDto) memberDto;