You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/10/09 10:49:43 UTC
[isis] branch master updated: ISIS-2445: fixes CommandJdo queries
(adds property 'targetStr')
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e11740f ISIS-2445: fixes CommandJdo queries (adds property 'targetStr')
e11740f is described below
commit e11740f5c6e1ac775e54b8a480c73f2df2250610
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 9 12:49:29 2020 +0200
ISIS-2445: fixes CommandJdo queries (adds property 'targetStr')
---
.../apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java | 8 ++++++--
.../isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java | 3 ---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
index 7491170..baf7fb4 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
@@ -64,7 +65,6 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
/**
* A persistent representation of a {@link Command}.
@@ -251,7 +251,7 @@ import lombok.extern.log4j.Log4j2;
cssClassUiEvent = CommandJdo.CssClassUiEvent.class,
layoutUiEvent = CommandJdo.LayoutUiEvent.class
)
-@Log4j2
+//@Log4j2
@NoArgsConstructor
public class CommandJdo
implements DomainChangeRecord, Comparable<CommandJdo>, HasCommandDto {
@@ -439,6 +439,10 @@ public class CommandJdo
@Getter @Setter
private Bookmark target;
+ public String getTargetStr() {
+ return Optional.ofNullable(getTarget()).map(Bookmark::toString).orElse(null);
+ }
+
@Override
public String getTargetMember() {
return getCommandDto().getMember().getLogicalMemberIdentifier();
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
index aec9182..93819a5 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.extensions.commandlog.impl.jdo;
-import java.rmi.activation.ActivationID;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collections;
@@ -26,7 +25,6 @@ import java.util.List;
import java.util.Optional;
import java.util.UUID;
-
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Named;
@@ -52,7 +50,6 @@ import org.apache.isis.schema.cmd.v2.CommandsDto;
import org.apache.isis.schema.cmd.v2.MapDto;
import org.apache.isis.schema.common.v2.InteractionType;
import org.apache.isis.schema.common.v2.OidDto;
-import org.apache.isis.schema.ixn.v2.ActionInvocationDto;
import lombok.RequiredArgsConstructor;
import lombok.val;