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 88c853422a ISIS-3111: Demo: use "pretty-render" value-semantics for
ChangesDto
88c853422a is described below
commit 88c853422a61c932a16b984412b1f27e475c7f8e
Author: Andi Huber <[email protected]>
AuthorDate: Thu Aug 4 15:37:14 2022 +0200
ISIS-3111: Demo: use "pretty-render" value-semantics for ChangesDto
- yet does not work for Collections, I'll open a follow up issue
---
.../demoapp/dom/domain/_changes/ExposeCapturedChanges_changes.java | 5 +++++
...tEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java | 3 +++
.../metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java | 2 ++
.../metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java | 2 ++
.../semantics/InteractionDtoValueSemanticsPrettyRender.java | 2 ++
5 files changed, 14 insertions(+)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_changes.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_changes.java
index 7de13480f8..59ee9b38b1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_changes.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/_changes/ExposeCapturedChanges_changes.java
@@ -24,6 +24,8 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.schema.chg.v2.ChangesDto;
import lombok.RequiredArgsConstructor;
@@ -36,8 +38,11 @@ public class ExposeCapturedChanges_changes {
// ...
//end::class[]
+ @SuppressWarnings("unused")
private final ExposeCapturedChanges exposeCapturedChanges;
+ @MemberSupport
+ @ValueSemantics(provider = "pretty-render")
//tag::class[]
public List<ChangesDto> coll() {
val list = new LinkedList<ChangesDto>();
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
index 273c6dfa45..f47b548e63 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
@@ -23,6 +23,8 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ValueSemantics;
import lombok.RequiredArgsConstructor;
@@ -36,6 +38,7 @@ public class
DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEnti
@SuppressWarnings("unused")
private final DomainObjectEntityChangePublishingVm mixee;
+ @MemberSupport
public List<? extends DomainObjectEntityChangePublishingEnabledEntity>
coll() {
return publishingEnabledEntities.all();
}
diff --git
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java
index 538a00f2da..a2a2c87d46 100644
---
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java
+++
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/ChangesDtoValueSemanticsPrettyRender.java
@@ -20,6 +20,7 @@ package
org.apache.isis.valuetypes.asciidoc.metamodel.semantics;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@@ -33,6 +34,7 @@ import lombok.NonNull;
@Component
@Named(IsisModuleValAsciidocApplib.NAMESPACE +
"ChangesDtoValueSemanticsPrettyRender")
@Order(PriorityPrecedence.EARLY)
+@Qualifier("pretty-render")
public class ChangesDtoValueSemanticsPrettyRender
extends ChangesDtoValueSemantics {
diff --git
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java
index d30e38be55..362584c2ac 100644
---
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java
+++
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/CommandDtoValueSemanticsPrettyRender.java
@@ -20,6 +20,7 @@ package
org.apache.isis.valuetypes.asciidoc.metamodel.semantics;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@ import lombok.NonNull;
@Component
@Named(IsisModuleValAsciidocApplib.NAMESPACE +
".CommandDtoValueSemanticsPrettyRender")
@Order(PriorityPrecedence.EARLY)
+@Qualifier("pretty-render")
public class CommandDtoValueSemanticsPrettyRender
extends CommandDtoValueSemantics {
diff --git
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java
index ad789718d6..a96734a34a 100644
---
a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java
+++
b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/InteractionDtoValueSemanticsPrettyRender.java
@@ -20,6 +20,7 @@ package
org.apache.isis.valuetypes.asciidoc.metamodel.semantics;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@ import lombok.NonNull;
@Component
@Named(IsisModuleValAsciidocApplib.NAMESPACE +
".InteractionDtoValueSemanticsPrettyRender")
@Order(PriorityPrecedence.EARLY)
+@Qualifier("pretty-render")
public class InteractionDtoValueSemanticsPrettyRender
extends InteractionDtoValueSemantics {