This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 15904b050b ISIS-3267: fixes inconsistent semantics
15904b050b is described below
commit 15904b050b6c5de50b628121c62598924640fc17
Author: Dan Haywood <[email protected]>
AuthorDate: Fri Nov 4 12:13:15 2022 +0000
ISIS-3267: fixes inconsistent semantics
---
.../apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java | 2 ++
.../apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
index 27c1224560..962b006d76 100644
---
a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++
b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/causeway/extensions/commandlog/jdo/dom/CommandLogEntry.java
@@ -32,6 +32,7 @@ import javax.jdo.annotations.Queries;
import javax.jdo.annotations.Query;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
@@ -265,6 +266,7 @@ extends
org.apache.causeway.extensions.commandlog.applib.dom.CommandLogEntry {
@Column(allowsNull = Parent.ALLOWS_NULL, length = InteractionId.MAX_LENGTH)
+ @Domain.Exclude
@InteractionId
@Getter @Setter
private UUID parentInteractionId;
diff --git
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
index c4220a3978..dc7cb0dd08 100644
---
a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
+++
b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/causeway/extensions/commandlog/jpa/dom/CommandLogEntry.java
@@ -29,6 +29,7 @@ import javax.inject.Named;
import javax.persistence.*;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.apache.causeway.applib.annotation.Domain;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.Publishing;
@@ -262,12 +263,12 @@ public class CommandLogEntry extends
org.apache.causeway.extensions.commandlog.a
@Convert(converter = JavaUtilUuidConverter.class)
+ @Domain.Exclude
@Column(nullable = Parent.NULLABLE, length = InteractionId.MAX_LENGTH)
@Getter @Setter
private UUID parentInteractionId;
-
@Column(nullable = LogicalMemberIdentifier.NULLABLE, length =
LogicalMemberIdentifier.MAX_LENGTH)
@LogicalMemberIdentifier
@Getter @Setter
