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
commit 65b52ada1ae09c3a31239be72459a41b1bb54a09 Author: andi-huber <[email protected]> AuthorDate: Thu Aug 18 09:52:30 2022 +0200 ISIS-3123: converts Boolean showcase to generated --- .../javalang/booleans/WrapperBooleans-common.adoc | 9 +++- .../booleans/WrapperBooleans-description.adoc | 10 +++-- .../types/javalang/booleans/WrapperBooleans.java | 50 +++++----------------- .../javalang/booleans/WrapperBooleans.layout.xml | 2 + .../booleans/holder/WrapperBooleanHolder.java | 17 ++++---- .../booleans/holder/WrapperBooleanHolder2.java | 11 ++--- .../WrapperBooleanHolder_actionReturning.java | 4 +- ...perBooleanHolder_actionReturningCollection.java | 18 ++++---- .../holder/WrapperBooleanHolder_mixinProperty.java | 4 +- ...oleanHolder_updateReadOnlyOptionalProperty.java | 5 ++- ..._updateReadOnlyOptionalPropertyWithChoices.java | 12 +++--- ...rapperBooleanHolder_updateReadOnlyProperty.java | 5 ++- ...anHolder_updateReadOnlyPropertyWithChoices.java | 13 +++--- .../jdo/WrapperBooleanJdo-description.adoc | 7 +-- .../javalang/booleans/jdo/WrapperBooleanJdo.java | 13 +++--- .../booleans/jdo/WrapperBooleanJdoEntities.java | 5 ++- .../jpa/WrapperBooleanJpa-description.adoc | 16 +++---- .../javalang/booleans/jpa/WrapperBooleanJpa.java | 15 ++++--- .../booleans/jpa/WrapperBooleanJpaEntities.java | 5 ++- .../booleans/persistence/WrapperBooleanEntity.java | 5 ++- .../persistence/WrapperBooleanEntity.layout.xml | 2 + .../persistence/WrapperBooleanSeeding.java | 7 ++- .../booleans/samples/WrapperBooleanSamples.java | 9 ++-- .../booleans/vm/WrapperBooleanVm-description.adoc | 6 ++- .../javalang/booleans/vm/WrapperBooleanVm.java | 13 +++--- .../booleans/vm/WrapperBooleanVm.layout.xml | 2 + .../demoshowcases/value/ValueTypeGenTemplate.java | 10 +++-- ..._updateReadOnlyOptionalPropertyWithChoices.java | 18 ++++---- 28 files changed, 146 insertions(+), 147 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-common.adoc index c51af28329..8f21aabbac 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-common.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-common.adoc @@ -1,8 +1,10 @@ :Notice: 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 ag [...] +// // This file was GENERATED by the showcase generator (tooling). Do NOT edit! + == Mixin actions -A number of mixin actions contribute through the `WrapperBooleanHolder` interface, demonstrate the use of `Boolean` as a parameter and as a return type. +A number of mixin actions contribute through the `WrapperBooleanHolder` interface, demonstrate the use of `java.lang.Boolean` as a parameter and as a return type. For example: * the `updateReadOnlyProperty` action is: @@ -48,7 +50,7 @@ include::holder/WrapperBooleanHolder_mixinProperty.java[tags=class] == @PropertyLayout(labelPosition=...) -There is also an extended interface, `WrapperBooleanHolder2`, with default methods demonstrating the use of label positions: +To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `WrapperBooleanHolder2` interface: [source,java] ---- @@ -60,4 +62,7 @@ include::holder/WrapperBooleanHolder2.java[tags=class] <.> Using `@PropertyLayout(fieldSetId=...)` positions the properties into the appropriate `<field-set>` within the `Xxx.layout.xml` layout file. <.> Position label on top <.> Position label to the right ++ +CAUTION: currently not supported <.> Hide the label completely. + diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-description.adoc index b6402fd77a..a9b0d55823 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans-description.adoc @@ -1,11 +1,13 @@ :Notice: 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 ag [...] -The framework has built-in support for all of the Wrapper data types, including `Boolean`. +// // This file was GENERATED by the showcase generator (tooling). Do NOT edit! + +The framework has built-in support for the `java.lang.Boolean` data type. From here you can: -* navigate to an entity that uses the `Boolean` datatype -* open a view model that uses the `Boolean` datatype +* navigate to an entity that uses the `java.lang.Boolean` datatype +* open a view model that uses the `java.lang.Boolean` datatype Some properties on these domain objects are mandatory, some optional. @@ -26,4 +28,4 @@ include::holder/WrapperBooleanHolder.java[tags=class] The `WrapperBooleanHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`. -Further details, along with the effect of this annotation, can be seen on the entity and view model object pages. \ No newline at end of file +Further details, along with the effect of this annotation, can be seen on the entity and view model object pages. diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java index 5833234a24..d2c833b418 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java @@ -41,9 +41,11 @@ import org.apache.isis.applib.annotation.SemanticsOf; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolderRepository; +import demoapp.dom.types.Samples; import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity; import demoapp.dom.types.javalang.booleans.vm.WrapperBooleanVm; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @XmlRootElement(name = "Demo") @XmlType @XmlAccessorType(XmlAccessType.FIELD) @@ -53,16 +55,16 @@ import demoapp.dom.types.javalang.booleans.vm.WrapperBooleanVm; public class WrapperBooleans implements HasAsciiDocDescription { @ObjectSupport public String title() { - return "Boolean (wrapper) data type"; + return "java.lang.Boolean data type"; } @Action(semantics = SemanticsOf.SAFE) @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL) - public WrapperBooleanVm openViewModel(final Boolean initialValue) { + public WrapperBooleanVm openViewModel(final java.lang.Boolean initialValue) { return new WrapperBooleanVm(initialValue); } - @MemberSupport public Boolean default0OpenViewModel() { - return true; + @MemberSupport public java.lang.Boolean default0OpenViewModel() { + return samples.single(); } @Collection @@ -72,42 +74,10 @@ public class WrapperBooleans implements HasAsciiDocDescription { @Inject @XmlTransient - ValueHolderRepository<Boolean, ? extends WrapperBooleanEntity> entities; - - - //FIXME[ISIS-2387] - @Action - @ActionLayout( - promptStyle = PromptStyle.DIALOG_MODAL - , describedAs = "FIXME[ISIS-2387] even though primitive1 gets initialized with true, the model thinks its null" - ) - public WrapperBooleans booleanParams( - final boolean primitive0, - final boolean primitive1) { - return this; - } - @MemberSupport public boolean default1BooleanParams() { - return true; - } - - //FIXME[ISIS-2387] - @Action - @ActionLayout( - promptStyle = PromptStyle.DIALOG_MODAL - , describedAs = - "FIXME[ISIS-2387] contrary to the above, second parameter works; " + - "however, first parameter is however, first parameter is initialized to null but not " + - "rendered as 3-state. Either we fix rendering or we" + - " initialize with FALSE when null" - ) - public WrapperBooleans booleanBoxedParams( - final Boolean boxed0, - final Boolean boxed1) { - return this; - } - @MemberSupport public Boolean default1BooleanBoxedParams() { - return true; - } + ValueHolderRepository<java.lang.Boolean, ? extends WrapperBooleanEntity> entities; + @Inject + @XmlTransient + Samples<java.lang.Boolean> samples; } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml index 74e0160a87..247ed17506 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml @@ -15,6 +15,8 @@ xmlns:cpt="http://isis.apache.org/applib/layout/component"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! --> + <bs3:row> <bs3:col span="10" unreferencedActions="true"> <cpt:domainObject /> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java index f5bb57d4e6..f8f70b099c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder.java @@ -20,21 +20,22 @@ package demoapp.dom.types.javalang.booleans.holder; import javax.inject.Named; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Named("demo.WrapperBooleanHolder") //tag::class[] public interface WrapperBooleanHolder { - Boolean getReadOnlyProperty(); - void setReadOnlyProperty(Boolean c); + java.lang.Boolean getReadOnlyProperty(); + void setReadOnlyProperty(java.lang.Boolean c); - Boolean getReadWriteProperty(); - void setReadWriteProperty(Boolean c); + java.lang.Boolean getReadWriteProperty(); + void setReadWriteProperty(java.lang.Boolean c); - Boolean getReadOnlyOptionalProperty(); - void setReadOnlyOptionalProperty(Boolean c); + java.lang.Boolean getReadOnlyOptionalProperty(); + void setReadOnlyOptionalProperty(java.lang.Boolean c); - Boolean getReadWriteOptionalProperty(); - void setReadWriteOptionalProperty(Boolean c); + java.lang.Boolean getReadWriteOptionalProperty(); + void setReadWriteOptionalProperty(java.lang.Boolean c); } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java index d7eb7c3f68..955ddc9e7c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java @@ -23,6 +23,7 @@ import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.applib.annotation.Where; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] public interface WrapperBooleanHolder2 extends WrapperBooleanHolder { @@ -32,8 +33,8 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder { describedAs = "@PropertyLayout(labelPosition=LEFT)", hidden = Where.ALL_TABLES, - fieldSetId = "label-positions", sequence = "1") // <.> - default Boolean getReadOnlyPropertyDerivedLabelPositionLeft() { + fieldSetId = "label-positions", sequence = "1") // <.> + default java.lang.Boolean getReadOnlyPropertyDerivedLabelPositionLeft() { return getReadOnlyProperty(); } @@ -44,7 +45,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder { "@PropertyLayout(labelPosition=TOP)", hidden = Where.ALL_TABLES, fieldSetId = "label-positions", sequence = "2") - default Boolean getReadOnlyPropertyDerivedLabelPositionTop() { + default java.lang.Boolean getReadOnlyPropertyDerivedLabelPositionTop() { return getReadOnlyProperty(); } @@ -55,7 +56,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder { "@PropertyLayout(labelPosition=RIGHT)", hidden = Where.ALL_TABLES, fieldSetId = "label-positions", sequence = "3") - default Boolean getReadOnlyPropertyDerivedLabelPositionRight() { + default java.lang.Boolean getReadOnlyPropertyDerivedLabelPositionRight() { return getReadOnlyProperty(); } @@ -66,7 +67,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder { "@PropertyLayout(labelPosition=NONE)", hidden = Where.ALL_TABLES, fieldSetId = "label-positions", sequence = "4") - default Boolean getReadOnlyPropertyDerivedLabelPositionNone() { + default java.lang.Boolean getReadOnlyPropertyDerivedLabelPositionNone() { return getReadOnlyProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturning.java index 752fcc75d4..a576e94628 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturning.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturning.java @@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.SemanticsOf; import lombok.RequiredArgsConstructor; - +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action(semantics = SemanticsOf.SAFE) @RequiredArgsConstructor @@ -31,7 +31,7 @@ public class WrapperBooleanHolder_actionReturning { private final WrapperBooleanHolder holder; - public Boolean act() { + public java.lang.Boolean act() { return holder.getReadOnlyProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java index f663680c3d..760e78ca06 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_actionReturningCollection.java @@ -18,19 +18,18 @@ */ package demoapp.dom.types.javalang.booleans.holder; -import java.util.ArrayList; import java.util.Collection; +import java.util.stream.Collectors; import javax.inject.Inject; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.SemanticsOf; -import lombok.RequiredArgsConstructor; - import demoapp.dom.types.Samples; +import lombok.RequiredArgsConstructor; - +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action(semantics = SemanticsOf.SAFE) @RequiredArgsConstructor @@ -38,14 +37,13 @@ public class WrapperBooleanHolder_actionReturningCollection { private final WrapperBooleanHolder holder; - public Collection<Boolean> act() { - final Collection<Boolean> booleans = new ArrayList<>(); - samples.stream() - .forEach(booleans::add); - return booleans; + public Collection<java.lang.Boolean> act() { + return samples.stream() + .collect(Collectors.toList()); } @Inject - Samples<Boolean> samples; + Samples<java.lang.Boolean> samples; + } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java index 736c10bf63..0ff812a8dc 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java @@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Where; import lombok.RequiredArgsConstructor; - +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Property() @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1") @@ -33,7 +33,7 @@ public class WrapperBooleanHolder_mixinProperty { private final WrapperBooleanHolder holder; - public Boolean prop() { + public java.lang.Boolean prop() { return holder.getReadOnlyProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalProperty.java index 617499b00b..11801d5263 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalProperty.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalProperty.java @@ -28,6 +28,7 @@ import org.apache.isis.applib.annotation.SemanticsOf; import lombok.RequiredArgsConstructor; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action( semantics = SemanticsOf.IDEMPOTENT @@ -44,13 +45,13 @@ public class WrapperBooleanHolder_updateReadOnlyOptionalProperty { @MemberSupport public WrapperBooleanHolder act( @Parameter(optionality = Optionality.OPTIONAL) // <.> - final Boolean newValue + final java.lang.Boolean newValue ) { holder.setReadOnlyOptionalProperty(newValue); return holder; } - @MemberSupport public Boolean default0Act() { + @MemberSupport public java.lang.Boolean default0Act() { return holder.getReadOnlyOptionalProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java index e5dad299df..af4d777551 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java @@ -31,10 +31,10 @@ import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.PromptStyle; import org.apache.isis.applib.annotation.SemanticsOf; -import lombok.RequiredArgsConstructor; - import demoapp.dom.types.Samples; +import lombok.RequiredArgsConstructor; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action( semantics = SemanticsOf.IDEMPOTENT @@ -51,21 +51,21 @@ public class WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices { @MemberSupport public WrapperBooleanHolder act( @Parameter(optionality = Optionality.OPTIONAL) - final Boolean newValue) { + final java.lang.Boolean newValue) { holder.setReadOnlyOptionalProperty(newValue); return holder; } - @MemberSupport public Boolean default0Act() { + @MemberSupport public java.lang.Boolean default0Act() { return holder.getReadOnlyOptionalProperty(); } - @MemberSupport public List<Boolean> choices0Act() { + @MemberSupport public List<java.lang.Boolean> choices0Act() { return samples.stream() .collect(Collectors.toList()); } @Inject - Samples<Boolean> samples; + Samples<java.lang.Boolean> samples; } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyProperty.java index b270945e2f..5af9ed47af 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyProperty.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyProperty.java @@ -26,6 +26,7 @@ import org.apache.isis.applib.annotation.SemanticsOf; import lombok.RequiredArgsConstructor; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action( semantics = SemanticsOf.IDEMPOTENT @@ -40,12 +41,12 @@ public class WrapperBooleanHolder_updateReadOnlyProperty { private final WrapperBooleanHolder holder; - @MemberSupport public WrapperBooleanHolder act(final Boolean newValue) { + @MemberSupport public WrapperBooleanHolder act(final java.lang.Boolean newValue) { holder.setReadOnlyProperty(newValue); return holder; } - @MemberSupport public Boolean default0Act() { + @MemberSupport public java.lang.Boolean default0Act() { return holder.getReadOnlyProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java index 2c4ecb892d..17c0531b09 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyPropertyWithChoices.java @@ -29,10 +29,10 @@ import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.PromptStyle; import org.apache.isis.applib.annotation.SemanticsOf; -import lombok.RequiredArgsConstructor; - import demoapp.dom.types.Samples; +import lombok.RequiredArgsConstructor; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @Action( semantics = SemanticsOf.IDEMPOTENT @@ -47,21 +47,22 @@ public class WrapperBooleanHolder_updateReadOnlyPropertyWithChoices { private final WrapperBooleanHolder holder; - @MemberSupport public WrapperBooleanHolder act(final Boolean newValue) { + @MemberSupport public WrapperBooleanHolder act(final java.lang.Boolean newValue) { holder.setReadOnlyProperty(newValue); return holder; } - @MemberSupport public Boolean default0Act() { + @MemberSupport public java.lang.Boolean default0Act() { return holder.getReadOnlyProperty(); } - @MemberSupport public List<Boolean> choices0Act() { + @MemberSupport public List<java.lang.Boolean> choices0Act() { return samples.stream() .collect(Collectors.toList()); } @Inject - Samples<Boolean> samples; + Samples<java.lang.Boolean> samples; + } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc index 8eb992ad9b..864401ab28 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc @@ -1,6 +1,8 @@ :Notice: 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 ag [...] -JDO supports `Boolean` link:http://www.datanucleus.org:15080/products/accessplatform_5_2/jdo/mapping.html#_primitive_and_java_lang_types[out-of-the-box], so no special annotations are required. +// // This file was GENERATED by the showcase generator (tooling). Do NOT edit! + +JDO supports `java.lang.Boolean` out-of-the-box, so no special annotations are required. see link:https://www.datanucleus.org/products/accessplatform_6_0/jdo/mapping.html#_primitive_and_java_lang_types[DataNucleus] [source,java] ---- @@ -15,5 +17,4 @@ Apache Isis assumes properties are mandatory, so no additional annotation is req <.> optional property as defined to JDO/DataNucleus - -include::../WrapperBooleans-common.adoc[] \ No newline at end of file +include::../WrapperBooleans-common.adoc[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java index fb5217a374..53312b2e1b 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java @@ -39,6 +39,7 @@ import lombok.Setter; import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Profile("demo-jdo") //tag::class[] @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo") @@ -49,35 +50,35 @@ public class WrapperBooleanJdo // <.> extends WrapperBooleanEntity { //end::class[] - public WrapperBooleanJdo(final Boolean initialValue) { + public WrapperBooleanJdo(final java.lang.Boolean initialValue) { this.readOnlyProperty = initialValue; this.readWriteProperty = initialValue; } //tag::class[] - @Title(prepend = "Boolean (wrapper) JDO entity: ") + @Title(prepend = "java.lang.Boolean JDO entity: ") @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1") @Column(allowsNull = "false") // <.> @Getter @Setter - private Boolean readOnlyProperty; + private java.lang.Boolean readOnlyProperty; @Property(editing = Editing.ENABLED) // <.> @PropertyLayout(fieldSetId = "editable-properties", sequence = "1") @Column(allowsNull = "false") @Getter @Setter - private Boolean readWriteProperty; + private java.lang.Boolean readWriteProperty; @Property(optionality = Optionality.OPTIONAL) // <.> @PropertyLayout(fieldSetId = "optional-properties", sequence = "1") @Column(allowsNull = "true") // <.> @Getter @Setter - private Boolean readOnlyOptionalProperty; + private java.lang.Boolean readOnlyOptionalProperty; @Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL) @PropertyLayout(fieldSetId = "optional-properties", sequence = "2") @Column(allowsNull = "true") @Getter @Setter - private Boolean readWriteOptionalProperty; + private java.lang.Boolean readWriteOptionalProperty; } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdoEntities.java index d2e84849a7..76621ca510 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdoEntities.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdoEntities.java @@ -23,17 +23,18 @@ import org.springframework.stereotype.Service; import demoapp.dom._infra.values.ValueHolderRepository; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Profile("demo-jdo") @Service public class WrapperBooleanJdoEntities -extends ValueHolderRepository<Boolean, WrapperBooleanJdo> { +extends ValueHolderRepository<java.lang.Boolean, WrapperBooleanJdo> { protected WrapperBooleanJdoEntities() { super(WrapperBooleanJdo.class); } @Override - protected WrapperBooleanJdo newDetachedEntity(Boolean value) { + protected WrapperBooleanJdo newDetachedEntity(java.lang.Boolean value) { return new WrapperBooleanJdo(value); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc index f3a3b58208..72c12477b5 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc @@ -1,24 +1,20 @@ :Notice: 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 ag [...] -[WARNING] -==== -TODO this yet is just a copy from JDO -==== +// // This file was GENERATED by the showcase generator (tooling). Do NOT edit! -JDO supports `Boolean` link:http://www.datanucleus.org:15080/products/accessplatform_5_2/jdo/mapping.html#_primitive_and_java_lang_types[out-of-the-box], so no special annotations are required. +JDO supports `java.lang.Boolean` out-of-the-box, so no special annotations are required. see link:https://www.objectdb.com/java/jpa/entity/types#simple_java_data_types[ObjectDB] [source,java] ---- include::WrapperBooleanJpa.java[tags=class] ---- -<.> a no-arg constructor is introduced by JDO enhancer -<.> required property as defined to JDO/DataNucleus. +<.> a no-arg constructor for convenience +<.> required property as defined to JPA. + Apache Isis assumes properties are mandatory, so no additional annotation is required. <.> directly editable property as defined to Apache Isis <.> optional property as defined to Apache Isis -<.> optional property as defined to JDO/DataNucleus +<.> optional property as defined to JPA - -include::../WrapperBooleans-common.adoc[] \ No newline at end of file +include::../WrapperBooleans-common.adoc[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java index 21b829869f..fcc934adde 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java @@ -42,6 +42,7 @@ import lombok.Setter; import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Profile("demo-jpa") //tag::class[] @Entity @@ -52,12 +53,12 @@ import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity; @EntityListeners(IsisEntityListener.class) @Named("demo.WrapperBooleanEntity") @DomainObject -@NoArgsConstructor +@NoArgsConstructor // <.> public class WrapperBooleanJpa extends WrapperBooleanEntity { //end::class[] - public WrapperBooleanJpa(final Boolean initialValue) { + public WrapperBooleanJpa(final java.lang.Boolean initialValue) { this.readOnlyProperty = initialValue; this.readWriteProperty = initialValue; } @@ -67,29 +68,29 @@ public class WrapperBooleanJpa @GeneratedValue private Long id; - @Title(prepend = "Boolean (wrapper) JPA entity: ") + @Title(prepend = "java.lang.Boolean JPA entity: ") @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1") @Column(nullable = false) // <.> @Getter @Setter - private Boolean readOnlyProperty; + private java.lang.Boolean readOnlyProperty; @Property(editing = Editing.ENABLED) // <.> @PropertyLayout(fieldSetId = "editable-properties", sequence = "1") @Column(nullable = false) @Getter @Setter - private Boolean readWriteProperty; + private java.lang.Boolean readWriteProperty; @Property(optionality = Optionality.OPTIONAL) // <.> @PropertyLayout(fieldSetId = "optional-properties", sequence = "1") @Column(nullable = true) // <.> @Getter @Setter - private Boolean readOnlyOptionalProperty; + private java.lang.Boolean readOnlyOptionalProperty; @Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL) @PropertyLayout(fieldSetId = "optional-properties", sequence = "2") @Column(nullable = true) @Getter @Setter - private Boolean readWriteOptionalProperty; + private java.lang.Boolean readWriteOptionalProperty; } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpaEntities.java index 59ca1477e7..61082f89f2 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpaEntities.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpaEntities.java @@ -23,17 +23,18 @@ import org.springframework.stereotype.Service; import demoapp.dom._infra.values.ValueHolderRepository; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Profile("demo-jpa") @Service public class WrapperBooleanJpaEntities -extends ValueHolderRepository<Boolean, WrapperBooleanJpa> { +extends ValueHolderRepository<java.lang.Boolean, WrapperBooleanJpa> { protected WrapperBooleanJpaEntities() { super(WrapperBooleanJpa.class); } @Override - protected WrapperBooleanJpa newDetachedEntity(Boolean value) { + protected WrapperBooleanJpa newDetachedEntity(java.lang.Boolean value) { return new WrapperBooleanJpa(value); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java index 502cfe34e9..f182402cf2 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.java @@ -26,16 +26,17 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolder; import demoapp.dom.types.javalang.booleans.holder.WrapperBooleanHolder2; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Named("demo.WrapperBooleanEntity") // shared permissions with concrete sub class @DomainObject public abstract class WrapperBooleanEntity implements HasAsciiDocDescription, WrapperBooleanHolder2, - ValueHolder<Boolean> { + ValueHolder<java.lang.Boolean> { @Override - public Boolean value() { + public java.lang.Boolean value() { return getReadOnlyProperty(); } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml index fe9ce77481..c58ffa61a0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml @@ -15,6 +15,8 @@ xmlns:cpt="http://isis.apache.org/applib/layout/component"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! --> + <bs3:row> <bs3:col span="10" unreferencedActions="true"> <cpt:domainObject /> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java index df151bb236..e61f94467e 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanSeeding.java @@ -25,11 +25,14 @@ import org.springframework.stereotype.Service; import demoapp.dom._infra.seed.SeedServiceAbstract; import demoapp.dom._infra.values.ValueHolderRepository; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Service -public class WrapperBooleanSeeding extends SeedServiceAbstract { +public class WrapperBooleanSeeding +extends SeedServiceAbstract { @Inject - public WrapperBooleanSeeding(ValueHolderRepository<Boolean, ? extends WrapperBooleanEntity> entities) { + public WrapperBooleanSeeding(ValueHolderRepository<java.lang.Boolean, ? extends WrapperBooleanEntity> entities) { super(entities); } + } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/samples/WrapperBooleanSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/samples/WrapperBooleanSamples.java index 24279d41b6..198216ee35 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/samples/WrapperBooleanSamples.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/samples/WrapperBooleanSamples.java @@ -24,12 +24,15 @@ import org.springframework.stereotype.Service; import demoapp.dom.types.Samples; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ @Service -public class WrapperBooleanSamples implements Samples<Boolean> { +public class WrapperBooleanSamples implements Samples<java.lang.Boolean> { @Override - public Stream<Boolean> stream() { - return Stream.of(true, false); + public Stream<java.lang.Boolean> stream() { + return new org.apache.isis.core.metamodel.valuesemantics.BooleanValueSemantics() + .getExamples() + .stream(); } } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc index 74b6e2af6b..1fdc8dba61 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc @@ -1,6 +1,8 @@ :Notice: 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 ag [...] -JAXB supports `Boolean` link:https://docs.oracle.com/cd/E12840_01/wls/docs103/webserv/data_types.html#wp223908[out-of-the-box], so no special annotations are required. +// // This file was GENERATED by the showcase generator (tooling). Do NOT edit! + +JAXB supports `java.lang.Boolean` out-of-the-box, so no special annotations are required. see link:https://docs.oracle.com/cd/E12840_01/wls/docs103/webserv/data_types.html#wp223908[Oracle] [source,java] ---- @@ -14,4 +16,4 @@ include::WrapperBooleanVm.java[tags=class] This is the default for JAXB so no additional annotation required. -include::../WrapperBooleans-common.adoc[] \ No newline at end of file +include::../WrapperBooleans-common.adoc[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java index f574cf0edc..ef657d94e0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java @@ -39,6 +39,7 @@ import lombok.Setter; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom.types.javalang.booleans.holder.WrapperBooleanHolder2; +/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */ //tag::class[] @XmlRootElement(name = "root") @XmlType @@ -51,33 +52,33 @@ public class WrapperBooleanVm implements HasAsciiDocDescription, WrapperBooleanHolder2 { //end::class[] - public WrapperBooleanVm(final Boolean initialValue) { + public WrapperBooleanVm(final java.lang.Boolean initialValue) { this.readOnlyProperty = initialValue; this.readWriteProperty = initialValue; } //tag::class[] - @Title(prepend = "Boolean (wrapper) view model: ") + @Title(prepend = "java.lang.Boolean view model: ") @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1") @XmlElement(required = true) // <.> @Getter @Setter - private Boolean readOnlyProperty; + private java.lang.Boolean readOnlyProperty; @Property(editing = Editing.ENABLED) // <.> @PropertyLayout(fieldSetId = "editable-properties", sequence = "1") @XmlElement(required = true) @Getter @Setter - private Boolean readWriteProperty; + private java.lang.Boolean readWriteProperty; @Property(optionality = Optionality.OPTIONAL) // <.> @PropertyLayout(fieldSetId = "optional-properties", sequence = "1") @Getter @Setter - private Boolean readOnlyOptionalProperty; + private java.lang.Boolean readOnlyOptionalProperty; @Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL) @PropertyLayout(fieldSetId = "optional-properties", sequence = "2") @Getter @Setter - private Boolean readWriteOptionalProperty; + private java.lang.Boolean readWriteOptionalProperty; } //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml index fe9ce77481..c58ffa61a0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml @@ -15,6 +15,8 @@ xmlns:cpt="http://isis.apache.org/applib/layout/component"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! --> + <bs3:row> <bs3:col span="10" unreferencedActions="true"> <cpt:domainObject /> diff --git a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java index 1edd1d0ec6..a040213bf5 100644 --- a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java +++ b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java @@ -117,9 +117,10 @@ public class ValueTypeGenTemplate { HOLDER_ACTION_RETURNING_ARRAY("holder/%sHolder_actionReturningArray", Generator.JAVA), HOLDER_ACTION_RETURNING_COLLECTION("holder/%sHolder_actionReturningCollection", Generator.JAVA), HOLDER_MIXIN_PROPERTY("holder/%sHolder_mixinProperty", Generator.JAVA), - HOLDER_UPDATE_READONLY_OPTIONAL_PROPERTY("holder/%sHolder_updateReadOnlyOptionalProperty", Generator.JAVA), - HOLDER_updateReadOnlyProperty("holder/%sHolder_updateReadOnlyProperty", Generator.JAVA), - HOLDER_updateReadOnlyPropertyWithChoices("holder/%sHolder_updateReadOnlyPropertyWithChoices", Generator.JAVA), + HOLDER_UPDATE_RO_PROPERTY("holder/%sHolder_updateReadOnlyProperty", Generator.JAVA), + HOLDER_UPDATE_ROO_PROPERTY("holder/%sHolder_updateReadOnlyOptionalProperty", Generator.JAVA), + HOLDER_UPDATE_RO_PROPERTY_WITH_CHOICES("holder/%sHolder_updateReadOnlyPropertyWithChoices", Generator.JAVA), + HOLDER_UPDATE_ROO_PROPERTY_WITH_CHOICES("holder/%sHolder_updateReadOnlyOptionalPropertyWithChoices", Generator.JAVA), COLLECTION("%ss", Generator.JAVA), JDO("jdo/%sJdo", Generator.JAVA), JDO_ENTITIES("jdo/%sJdoEntities", Generator.JAVA), @@ -146,7 +147,8 @@ public class ValueTypeGenTemplate { public static Can<Template> PRIMITIVE_SET = Can.ofArray(Template.values()) .remove(HOLDER_ACTION_RETURNING_COLLECTION) - .remove(HOLDER_UPDATE_READONLY_OPTIONAL_PROPERTY) + .remove(HOLDER_UPDATE_ROO_PROPERTY) + .remove(HOLDER_UPDATE_ROO_PROPERTY_WITH_CHOICES) .remove(Template.SAMPLES); private final String pathTemplate; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java similarity index 81% copy from examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java copy to tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java index e5dad299df..c156d3eb7a 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices.java +++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalPropertyWithChoices.java @@ -31,10 +31,10 @@ import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.PromptStyle; import org.apache.isis.applib.annotation.SemanticsOf; -import lombok.RequiredArgsConstructor; - import demoapp.dom.types.Samples; +import lombok.RequiredArgsConstructor; +/*${generated-file-notice}*/ //tag::class[] @Action( semantics = SemanticsOf.IDEMPOTENT @@ -45,27 +45,27 @@ import demoapp.dom.types.Samples; , associateWith = "readOnlyOptionalProperty" , sequence = "2") @RequiredArgsConstructor -public class WrapperBooleanHolder_updateReadOnlyOptionalPropertyWithChoices { +public class /*${showcase-name}*/Holder_updateReadOnlyOptionalPropertyWithChoices { - private final WrapperBooleanHolder holder; + private final /*${showcase-name}*/Holder holder; - @MemberSupport public WrapperBooleanHolder act( + @MemberSupport public /*${showcase-name}*/Holder act( @Parameter(optionality = Optionality.OPTIONAL) - final Boolean newValue) { + final /*${showcase-type}*/ newValue) { holder.setReadOnlyOptionalProperty(newValue); return holder; } - @MemberSupport public Boolean default0Act() { + @MemberSupport public /*${showcase-type}*/ default0Act() { return holder.getReadOnlyOptionalProperty(); } - @MemberSupport public List<Boolean> choices0Act() { + @MemberSupport public List</*${showcase-type-boxed}*/> choices0Act() { return samples.stream() .collect(Collectors.toList()); } @Inject - Samples<Boolean> samples; + Samples</*${showcase-type-boxed}*/> samples; } //end::class[]
