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 e39228dc66 ISIS-3123: converts Character,char showcase to generated
e39228dc66 is described below
commit e39228dc6638a69a54eec75c8d59a64dbc126430
Author: andi-huber <[email protected]>
AuthorDate: Thu Aug 18 08:41:50 2022 +0200
ISIS-3123: converts Character,char showcase to generated
---
.../javalang/characters/WrapperCharacters-common.adoc | 7 +++++--
.../characters/WrapperCharacters-description.adoc | 10 ++++++----
.../types/javalang/characters/WrapperCharacters.java | 15 ++++++++++-----
.../javalang/characters/WrapperCharacters.layout.xml | 2 ++
.../characters/holder/WrapperCharacterHolder.java | 17 +++++++++--------
.../characters/holder/WrapperCharacterHolder2.java | 11 ++++++-----
.../holder/WrapperCharacterHolder_actionReturning.java | 4 ++--
...rapperCharacterHolder_actionReturningCollection.java | 10 +++++-----
.../holder/WrapperCharacterHolder_mixinProperty.java | 4 ++--
...rCharacterHolder_updateReadOnlyOptionalProperty.java | 6 ++++--
.../WrapperCharacterHolder_updateReadOnlyProperty.java | 6 ++++--
...aracterHolder_updateReadOnlyPropertyWithChoices.java | 14 ++++++++------
.../characters/jdo/WrapperCharacterJdo-description.adoc | 6 ++++--
.../javalang/characters/jdo/WrapperCharacterJdo.java | 13 +++++++------
.../characters/jdo/WrapperCharacterJdoEntities.java | 5 +++--
.../characters/jpa/WrapperCharacterJpa-description.adoc | 15 ++++++---------
.../javalang/characters/jpa/WrapperCharacterJpa.java | 15 ++++++++-------
.../characters/jpa/WrapperCharacterJpaEntities.java | 5 +++--
.../characters/persistence/WrapperCharacterEntity.java | 5 +++--
.../persistence/WrapperCharacterEntity.layout.xml | 2 ++
.../characters/persistence/WrapperCharacterSeeding.java | 7 +++++--
.../characters/samples/WrapperCharacterSamples.java | 9 ++++++---
.../characters/vm/WrapperCharacterVm-description.adoc | 6 ++++--
.../javalang/characters/vm/WrapperCharacterVm.java | 13 +++++++------
.../characters/vm/WrapperCharacterVm.layout.xml | 2 ++
.../types/primitive/chars/PrimitiveChars-common.adoc | 14 +++++++++++++-
.../primitive/chars/PrimitiveChars-description.adoc | 7 ++++---
.../dom/types/primitive/chars/PrimitiveChars.java | 15 +++++++++------
.../dom/types/primitive/chars/PrimitiveChars.layout.xml | 2 ++
.../primitive/chars/holder/PrimitiveCharHolder.java | 1 +
.../primitive/chars/holder/PrimitiveCharHolder2.java | 3 ++-
.../holder/PrimitiveCharHolder_actionReturning.java | 2 +-
.../PrimitiveCharHolder_actionReturningArray.java | 7 +++----
.../chars/holder/PrimitiveCharHolder_mixinProperty.java | 2 +-
.../PrimitiveCharHolder_updateReadOnlyProperty.java | 1 +
...iveCharHolder_updateReadOnlyPropertyWithChoices.java | 13 +++++--------
.../chars/jdo/PrimitiveCharJdo-description.adoc | 8 +++++---
.../dom/types/primitive/chars/jdo/PrimitiveCharJdo.java | 9 +++++----
.../primitive/chars/jdo/PrimitiveCharJdoEntities.java | 7 ++++---
.../chars/jpa/PrimitiveCharJpa-description.adoc | 15 ++++++---------
.../dom/types/primitive/chars/jpa/PrimitiveCharJpa.java | 9 +++++----
.../primitive/chars/jpa/PrimitiveCharJpaEntities.java | 7 ++++---
.../chars/persistence/PrimitiveCharEntity.java | 5 +++--
.../chars/persistence/PrimitiveCharEntity.layout.xml | 3 +++
.../chars/persistence/PrimitiveCharSeeding.java | 6 ++++--
.../primitive/chars/vm/PrimitiveCharVm-description.adoc | 10 +++++-----
.../dom/types/primitive/chars/vm/PrimitiveCharVm.java | 7 ++++---
.../types/primitive/chars/vm/PrimitiveCharVm.layout.xml | 3 +++
.../metaprog/demoshowcases/value/ValueShowCase.java | 14 ++++++++++++++
49 files changed, 230 insertions(+), 149 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-common.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-common.adoc
index 8e9c57140d..74d6e64e54 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-common.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-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 `WrapperCharacterHolder`
interface, demonstrate the use of `Character` as a parameter and as a return
type.
+A number of mixin actions contribute through the `WrapperCharacterHolder`
interface, demonstrate the use of `java.lang.Character` as a parameter and as a
return type.
For example:
* the `updateReadOnlyProperty` action is:
@@ -48,7 +50,7 @@
include::holder/WrapperCharacterHolder_mixinProperty.java[tags=class]
== @PropertyLayout(labelPosition=...)
-There is also an extended interface, `WrapperCharacterHolder2`, 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 `WrapperCharacterHolder2` interface:
[source,java]
----
@@ -63,3 +65,4 @@ include::holder/WrapperCharacterHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label completely.
+
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-description.adoc
index c336f20777..11302f3709 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters-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 `Character`.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+The framework has built-in support for the `java.lang.Character` data type.
From here you can:
-* navigate to an entity that uses the `Character` datatype
-* open a view model that uses the `Character` datatype
+* navigate to an entity that uses the `java.lang.Character` datatype
+* open a view model that uses the `java.lang.Character` datatype
Some properties on these domain objects are mandatory, some optional.
@@ -26,4 +28,4 @@ include::holder/WrapperCharacterHolder.java[tags=class]
The `WrapperCharacterHolder2` 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/characters/WrapperCharacters.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
index 3502f7c310..23847055d3 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.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.characters.persistence.WrapperCharacterEntity;
import demoapp.dom.types.javalang.characters.vm.WrapperCharacterVm;
+/* 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.characters.vm.WrapperCharacterVm;
public class WrapperCharacters implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "Character (wrapper) data type";
+ return "java.lang.Character data type";
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public WrapperCharacterVm openViewModel(final Character initialValue) {
+ public WrapperCharacterVm openViewModel(final java.lang.Character
initialValue) {
return new WrapperCharacterVm(initialValue);
}
- @MemberSupport public Character default0OpenViewModel() {
- return 'a';
+ @MemberSupport public java.lang.Character default0OpenViewModel() {
+ return samples.single();
}
@Collection
@@ -72,7 +74,10 @@ public class WrapperCharacters implements
HasAsciiDocDescription {
@Inject
@XmlTransient
- ValueHolderRepository<Character, ? extends WrapperCharacterEntity>
entities;
+ ValueHolderRepository<java.lang.Character, ? extends
WrapperCharacterEntity> entities;
+ @Inject
+ @XmlTransient
+ Samples<java.lang.Character> samples;
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml
index 74e0160a87..247ed17506 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.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/characters/holder/WrapperCharacterHolder.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
index af7d920df3..b966ea034d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder.java
@@ -20,21 +20,22 @@ package demoapp.dom.types.javalang.characters.holder;
import javax.inject.Named;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperCharacterHolder")
//tag::class[]
public interface WrapperCharacterHolder {
- Character getReadOnlyProperty();
- void setReadOnlyProperty(Character c);
+ java.lang.Character getReadOnlyProperty();
+ void setReadOnlyProperty(java.lang.Character c);
- Character getReadWriteProperty();
- void setReadWriteProperty(Character c);
+ java.lang.Character getReadWriteProperty();
+ void setReadWriteProperty(java.lang.Character c);
- Character getReadOnlyOptionalProperty();
- void setReadOnlyOptionalProperty(Character c);
+ java.lang.Character getReadOnlyOptionalProperty();
+ void setReadOnlyOptionalProperty(java.lang.Character c);
- Character getReadWriteOptionalProperty();
- void setReadWriteOptionalProperty(Character c);
+ java.lang.Character getReadWriteOptionalProperty();
+ void setReadWriteOptionalProperty(java.lang.Character c);
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
index c52b84abc2..bd377cfa0f 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.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 WrapperCharacterHolder2 extends WrapperCharacterHolder {
@@ -32,8 +33,8 @@ public interface WrapperCharacterHolder2 extends
WrapperCharacterHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions", sequence = "1") // <.>
- default Character getReadOnlyPropertyDerivedLabelPositionLeft() {
+ fieldSetId = "label-positions", sequence = "1") // <.>
+ default java.lang.Character getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +45,7 @@ public interface WrapperCharacterHolder2 extends
WrapperCharacterHolder {
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "2")
- default Character getReadOnlyPropertyDerivedLabelPositionTop() {
+ default java.lang.Character getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +56,7 @@ public interface WrapperCharacterHolder2 extends
WrapperCharacterHolder {
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "3")
- default Character getReadOnlyPropertyDerivedLabelPositionRight() {
+ default java.lang.Character getReadOnlyPropertyDerivedLabelPositionRight()
{
return getReadOnlyProperty();
}
@@ -66,7 +67,7 @@ public interface WrapperCharacterHolder2 extends
WrapperCharacterHolder {
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "4")
- default Character getReadOnlyPropertyDerivedLabelPositionNone() {
+ default java.lang.Character getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturning.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturning.java
index f2214ddb76..11181a7c5d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturning.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_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 WrapperCharacterHolder_actionReturning {
private final WrapperCharacterHolder holder;
- public Character act() {
+ public java.lang.Character act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
index dd9454f829..cb802a5b02 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_actionReturningCollection.java
@@ -26,11 +26,10 @@ 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,12 +37,13 @@ public class
WrapperCharacterHolder_actionReturningCollection {
private final WrapperCharacterHolder holder;
- public Collection<Character> act() {
+ public Collection<java.lang.Character> act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Character> samples;
+ Samples<java.lang.Character> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
index cfb1a4b78d..d07a028c98 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_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 WrapperCharacterHolder_mixinProperty {
private final WrapperCharacterHolder holder;
- public Character prop() {
+ public java.lang.Character prop() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalProperty.java
index 5634d578d3..246367a786 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyOptionalProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_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,12 +45,13 @@ public class
WrapperCharacterHolder_updateReadOnlyOptionalProperty {
@MemberSupport public WrapperCharacterHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
- final Character newValue
+ final java.lang.Character newValue
) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public Character default0Act() {
+
+ @MemberSupport public java.lang.Character default0Act() {
return holder.getReadOnlyOptionalProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyProperty.java
index f12051d2d3..715cecbf99 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_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,11 +41,12 @@ public class WrapperCharacterHolder_updateReadOnlyProperty {
private final WrapperCharacterHolder holder;
- @MemberSupport public WrapperCharacterHolder act(final Character newValue)
{
+ @MemberSupport public WrapperCharacterHolder act(final java.lang.Character
newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Character default0Act() {
+
+ @MemberSupport public java.lang.Character default0Act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
index 7e3714a78d..d79c5e1dd2 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_updateReadOnlyPropertyWithChoices.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_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,20 +47,22 @@ public class
WrapperCharacterHolder_updateReadOnlyPropertyWithChoices {
private final WrapperCharacterHolder holder;
- @MemberSupport public WrapperCharacterHolder act(final Character newValue)
{
+ @MemberSupport public WrapperCharacterHolder act(final java.lang.Character
newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Character default0Act() {
+
+ @MemberSupport public java.lang.Character default0Act() {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<Character> choices0Act() {
+
+ @MemberSupport public List<java.lang.Character> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Character> samples;
+ Samples<java.lang.Character> samples;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
index 8287f8d9ba..9f16a5893e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-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 `Character`
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.Character` 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,4 +17,4 @@ Apache Isis assumes properties are mandatory, so no
additional annotation is req
<.> optional property as defined to JDO/DataNucleus
-include::../WrapperCharacters-common.adoc[]
\ No newline at end of file
+include::../WrapperCharacters-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
index a7d30ab42a..d6ee35651c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import
demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
+/* 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 WrapperCharacterJdo
// <.>
extends WrapperCharacterEntity {
//end::class[]
- public WrapperCharacterJdo(final Character initialValue) {
+ public WrapperCharacterJdo(final java.lang.Character initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Character (wrapper) JDO entity: ")
+ @Title(prepend = "java.lang.Character JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false")
// <.>
@Getter @Setter
- private Character readOnlyProperty;
+ private java.lang.Character readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
- private Character readWriteProperty;
+ private java.lang.Character readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true")
// <.>
@Getter @Setter
- private Character readOnlyOptionalProperty;
+ private java.lang.Character readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
- private Character readWriteOptionalProperty;
+ private java.lang.Character readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdoEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdoEntities.java
index 3a55e55c1b..6b0ec7dfa1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdoEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdoEntities.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 WrapperCharacterJdoEntities
-extends ValueHolderRepository<Character, WrapperCharacterJdo> {
+extends ValueHolderRepository<java.lang.Character, WrapperCharacterJdo> {
protected WrapperCharacterJdoEntities() {
super(WrapperCharacterJdo.class);
}
@Override
- protected WrapperCharacterJdo newDetachedEntity(Character value) {
+ protected WrapperCharacterJdo newDetachedEntity(java.lang.Character value)
{
return new WrapperCharacterJdo(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
index 64d5b45720..1741547bc1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
@@ -1,23 +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 `Character`
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.Character` 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::WrapperCharacterJpa.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::../WrapperCharacters-common.adoc[]
\ No newline at end of file
+include::../WrapperCharacters-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
index 38dfb22be5..42eed3ac20 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
@@ -42,6 +42,7 @@ import lombok.Setter;
import
demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
+/* 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.characters.persistence.WrapperCharacterEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.WrapperCharacterEntity")
@DomainObject
-@NoArgsConstructor
+@NoArgsConstructor
// <.>
public class WrapperCharacterJpa
extends WrapperCharacterEntity {
//end::class[]
- public WrapperCharacterJpa(final Character initialValue) {
+ public WrapperCharacterJpa(final java.lang.Character initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
@@ -67,29 +68,29 @@ public class WrapperCharacterJpa
@GeneratedValue
private Long id;
- @Title(prepend = "Character (wrapper) JPA entity: ")
+ @Title(prepend = "java.lang.Character JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(nullable = false)
// <.>
@Getter @Setter
- private Character readOnlyProperty;
+ private java.lang.Character readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(nullable = false)
@Getter @Setter
- private Character readWriteProperty;
+ private java.lang.Character readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(nullable = true)
// <.>
@Getter @Setter
- private Character readOnlyOptionalProperty;
+ private java.lang.Character readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(nullable = true)
@Getter @Setter
- private Character readWriteOptionalProperty;
+ private java.lang.Character readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpaEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpaEntities.java
index 0ff7e64782..2941253462 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpaEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpaEntities.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 WrapperCharacterJpaEntities
-extends ValueHolderRepository<Character, WrapperCharacterJpa> {
+extends ValueHolderRepository<java.lang.Character, WrapperCharacterJpa> {
protected WrapperCharacterJpaEntities() {
super(WrapperCharacterJpa.class);
}
@Override
- protected WrapperCharacterJpa newDetachedEntity(Character value) {
+ protected WrapperCharacterJpa newDetachedEntity(java.lang.Character value)
{
return new WrapperCharacterJpa(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
index 67f724458b..13d93fd764 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.java
@@ -26,16 +26,17 @@ import
demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.javalang.characters.holder.WrapperCharacterHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperCharacterEntity") // shared permissions with concrete sub
class
@DomainObject
public abstract class WrapperCharacterEntity
implements
HasAsciiDocDescription,
WrapperCharacterHolder2,
- ValueHolder<Character> {
+ ValueHolder<java.lang.Character> {
@Override
- public Character value() {
+ public java.lang.Character value() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.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/characters/persistence/WrapperCharacterSeeding.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java
index 1ca6eb16a7..7bfd4c53ef 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterSeeding.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 WrapperCharacterSeeding extends SeedServiceAbstract {
+public class WrapperCharacterSeeding
+extends SeedServiceAbstract {
@Inject
- public WrapperCharacterSeeding(ValueHolderRepository<Character, ? extends
WrapperCharacterEntity> entities) {
+ public WrapperCharacterSeeding(ValueHolderRepository<java.lang.Character,
? extends WrapperCharacterEntity> entities) {
super(entities);
}
+
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/samples/WrapperCharacterSamples.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/samples/WrapperCharacterSamples.java
index 8fc0b6a51d..d38728070e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/samples/WrapperCharacterSamples.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/samples/WrapperCharacterSamples.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 WrapperCharacterSamples implements Samples<Character> {
+public class WrapperCharacterSamples implements Samples<java.lang.Character> {
@Override
- public Stream<Character> stream() {
- return Stream.of('a', 'b', 'c');
+ public Stream<java.lang.Character> stream() {
+ return new
org.apache.isis.core.metamodel.valuesemantics.CharacterValueSemantics()
+ .getExamples()
+ .stream();
}
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
index 15a6f93f61..70652022ae 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-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 `Character`
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.Character` 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::WrapperCharacterVm.java[tags=class]
This is the default for JAXB so no additional annotation required.
-include::../WrapperCharacters-common.adoc[]
\ No newline at end of file
+include::../WrapperCharacters-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
index e1e4b110fa..097054fe9c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javalang.characters.holder.WrapperCharacterHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -51,33 +52,33 @@ public class WrapperCharacterVm
implements HasAsciiDocDescription, WrapperCharacterHolder2 {
//end::class[]
- public WrapperCharacterVm(final Character initialValue) {
+ public WrapperCharacterVm(final java.lang.Character initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Character (wrapper) view model: ")
+ @Title(prepend = "java.lang.Character view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true)
// <.>
@Getter @Setter
- private Character readOnlyProperty;
+ private java.lang.Character readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
- private Character readWriteProperty;
+ private java.lang.Character readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
- private Character readOnlyOptionalProperty;
+ private java.lang.Character readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
- private Character readWriteOptionalProperty;
+ private java.lang.Character readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.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/primitive/chars/PrimitiveChars-common.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-common.adoc
index 72b7030832..7201fefc07 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-common.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-common.adoc
@@ -1,5 +1,7 @@
: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 `PrimitiveCharHolder`
interface, demonstrate the use of `char` as a parameter and as a return type.
@@ -19,6 +21,14 @@
include::holder/PrimitiveCharHolder_updateReadOnlyProperty.java[tags=class]
include::holder/PrimitiveCharHolder_actionReturning.java[tags=class]
----
+
+* the `actionReturningArray` action is:
++
+[source,java]
+----
+include::holder/PrimitiveCharHolder_actionReturningArray.java[tags=class]
+----
+
== Mixin properties
We also use the interface to contribute a mixin property:
@@ -30,9 +40,10 @@ We also use the interface to contribute a mixin property:
include::holder/PrimitiveCharHolder_mixinProperty.java[tags=class]
----
+
== @PropertyLayout(labelPosition=...)
-The `PrimitiveCharHolder2` interface is used to demonstrate support for label
positions using `@PropertyLayout(labelPosition=...)`:
+To demonstrate support for label positions using
`@PropertyLayout(labelPosition=...)`, the entity and view model objects both
implement the extended `PrimitiveCharHolder2` interface:
[source,java]
----
@@ -47,3 +58,4 @@ include::holder/PrimitiveCharHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label completely.
+
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-description.adoc
index f349efe594..c036203331 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars-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 [...]
-The framework has built-in support for all of the primitive data types,
including `char`.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+The framework has built-in support for the (primitive) `char` data type.
From here you can:
@@ -22,9 +24,8 @@ The `PrimitiveCharHolder` interface is used to contribute a
number of mixins to
include::holder/PrimitiveCharHolder.java[tags=class]
----
-
=== PrimitiveCharHolder2
The `PrimitiveCharHolder2` 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/primitive/chars/PrimitiveChars.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
index 1a3b4540db..92b8cc5414 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
@@ -41,21 +41,21 @@ 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.primitive.chars.persistence.PrimitiveCharEntity;
import demoapp.dom.types.primitive.chars.vm.PrimitiveCharVm;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@Named("demo.PrimitiveChars")
-@DomainObject(
- nature=Nature.VIEW_MODEL,
- editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
//@Log4j2
public class PrimitiveChars implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "char (primitive) data type";
+ return "char data type";
}
@Action(semantics = SemanticsOf.SAFE)
@@ -64,7 +64,7 @@ public class PrimitiveChars implements HasAsciiDocDescription
{
return new PrimitiveCharVm(initialValue);
}
@MemberSupport public char default0OpenViewModel() {
- return 'a';
+ return samples.single();
}
@Collection
@@ -74,7 +74,10 @@ public class PrimitiveChars implements
HasAsciiDocDescription {
@Inject
@XmlTransient
- ValueHolderRepository<Character, ? extends PrimitiveCharEntity> entities;
+ ValueHolderRepository<java.lang.Character, ? extends PrimitiveCharEntity>
entities;
+ @Inject
+ @XmlTransient
+ Samples<java.lang.Character> samples;
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml
index 74e0160a87..247ed17506 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.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/primitive/chars/holder/PrimitiveCharHolder.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder.java
index 64841e76be..cc2dec571c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder.java
@@ -20,6 +20,7 @@ package demoapp.dom.types.primitive.chars.holder;
import javax.inject.Named;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.PrimitiveCharHolder")
//tag::class[]
public interface PrimitiveCharHolder {
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
index dbf779d01f..6f226c9063 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.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 PrimitiveCharHolder2 extends PrimitiveCharHolder {
@@ -32,7 +33,7 @@ public interface PrimitiveCharHolder2 extends
PrimitiveCharHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default char getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturning.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturning.java
index 376c69028c..2d1dfc3e08 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturning.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_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
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
index aa496b2be3..1520ffa5bd 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
@@ -24,12 +24,11 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.commons.functional.IndexedConsumer;
+import demoapp.dom.types.Samples;
import lombok.RequiredArgsConstructor;
import lombok.val;
-import demoapp.dom.types.Samples;
-
-@SuppressWarnings("unused")
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(semantics = SemanticsOf.SAFE)
@RequiredArgsConstructor
@@ -45,7 +44,7 @@ public class PrimitiveCharHolder_actionReturningArray {
}
@Inject
- Samples<Character> samples;
+ Samples<java.lang.Character> samples;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
index ac59db9cb4..62dfb1e46a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_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")
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyProperty.java
index e5112b80d4..1f9cb519dc 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_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
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyPropertyWithChoices.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyPropertyWithChoices.java
index 9fa26d6ec2..633ba69b9c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_updateReadOnlyPropertyWithChoices.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_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
@@ -56,16 +56,13 @@ public class
PrimitiveCharHolder_updateReadOnlyPropertyWithChoices {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<Character> choices0Act() {
+ @MemberSupport public List<java.lang.Character> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
- @MemberSupport public boolean hideAct() {
- return true; // TODO: choices doesn't seem to work for this datatype
- }
-
@Inject
- Samples<Character> samples;
+ Samples<java.lang.Character> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo-description.adoc
index 3110095f93..0adf846745 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo-description.adoc
@@ -1,13 +1,15 @@
: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 `char`
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 `char` 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]
----
-include::PrimitiveCharJdo.java[tags="class"]
+include::PrimitiveCharJdo.java[tags=class]
----
<.> a no-arg constructor is introduced by JDO enhancer
<.> no additional JDO annotations required.
-include::../PrimitiveChars-common.adoc[]
\ No newline at end of file
+include::../PrimitiveChars-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
index 13b65ec7f2..d2a5338a09 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
@@ -37,14 +37,15 @@ import lombok.Setter;
import demoapp.dom.types.primitive.chars.persistence.PrimitiveCharEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@Named("demo.PrimitiveCharEntity")
@DomainObject
-public class PrimitiveCharJdo // <.>
- extends PrimitiveCharEntity {
+public class PrimitiveCharJdo // <.>
+ extends PrimitiveCharEntity {
//end::class[]
public PrimitiveCharJdo(final char initialValue) {
@@ -56,9 +57,9 @@ public class PrimitiveCharJdo
// <.>
@Title(prepend = "char (primitive) JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
- private char readOnlyProperty; // <.>
+ private char readOnlyProperty; // <.>
- @Property(editing = Editing.ENABLED)
+ @Property(editing = Editing.ENABLED)
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private char readWriteProperty;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntities.java
index 225c8cd4b8..81deb49e0b 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntities.java
@@ -23,18 +23,19 @@ 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 PrimitiveCharJdoEntities
-extends ValueHolderRepository<Character, PrimitiveCharJdo> {
+extends ValueHolderRepository<java.lang.Character, PrimitiveCharJdo> {
protected PrimitiveCharJdoEntities() {
super(PrimitiveCharJdo.class);
}
@Override
- protected PrimitiveCharJdo newDetachedEntity(Character value) {
+ protected PrimitiveCharJdo newDetachedEntity(java.lang.Character value) {
return new PrimitiveCharJdo(value);
}
-}
\ No newline at end of file
+}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa-description.adoc
index 09440ee384..ffc7c610f6 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa-description.adoc
@@ -1,18 +1,15 @@
: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 `char`
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 `char` 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::PrimitiveCharJpa.java[tags="class"]
+include::PrimitiveCharJpa.java[tags=class]
----
-<.> a no-arg constructor is introduced by JDO enhancer
-<.> no additional JDO annotations required.
+<.> a no-arg constructor for convenience
+<.> no additional JPA annotations required.
-include::../PrimitiveChars-common.adoc[]
\ No newline at end of file
+include::../PrimitiveChars-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
index 4eced079b2..7c1b44bfe4 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
@@ -40,6 +40,7 @@ import lombok.Setter;
import demoapp.dom.types.primitive.chars.persistence.PrimitiveCharEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -50,9 +51,9 @@ import
demoapp.dom.types.primitive.chars.persistence.PrimitiveCharEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.PrimitiveCharEntity")
@DomainObject
-@NoArgsConstructor
+@NoArgsConstructor
// <.>
public class PrimitiveCharJpa
- extends PrimitiveCharEntity {
+ extends PrimitiveCharEntity {
//end::class[]
public PrimitiveCharJpa(final char initialValue) {
@@ -68,9 +69,9 @@ public class PrimitiveCharJpa
@Title(prepend = "char (primitive) JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
- private char readOnlyProperty; // <.>
+ private char readOnlyProperty; // <.>
- @Property(editing = Editing.ENABLED)
+ @Property(editing = Editing.ENABLED)
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private char readWriteProperty;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpaEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpaEntities.java
index 76c5e34cbd..903fd29b30 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpaEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpaEntities.java
@@ -23,18 +23,19 @@ 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 PrimitiveCharJpaEntities
-extends ValueHolderRepository<Character, PrimitiveCharJpa> {
+extends ValueHolderRepository<java.lang.Character, PrimitiveCharJpa> {
protected PrimitiveCharJpaEntities() {
super(PrimitiveCharJpa.class);
}
@Override
- protected PrimitiveCharJpa newDetachedEntity(Character value) {
+ protected PrimitiveCharJpa newDetachedEntity(java.lang.Character value) {
return new PrimitiveCharJpa(value);
}
-}
\ No newline at end of file
+}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.java
index fc1dd15f3f..40e07c9f41 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.java
@@ -26,16 +26,17 @@ import
demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.PrimitiveCharEntity") // shared permissions with concrete sub
class
@DomainObject
public abstract class PrimitiveCharEntity
implements
HasAsciiDocDescription,
PrimitiveCharHolder2,
- ValueHolder<Character> {
+ ValueHolder<java.lang.Character> {
@Override
- public Character value() {
+ public java.lang.Character value() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
index d01899a6f0..bf6c6ddd0c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
@@ -15,10 +15,13 @@
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 />
<cpt:action id="actionReturning"/>
+ <cpt:action id="actionReturningArray"/>
</bs3:col>
<bs3:col span="2">
<cpt:fieldSet name="" id="sources" />
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharSeeding.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharSeeding.java
index d2c23f4c5e..5e03ea43d3 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharSeeding.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharSeeding.java
@@ -25,11 +25,13 @@ 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 PrimitiveCharSeeding extends SeedServiceAbstract {
+public class PrimitiveCharSeeding
+extends SeedServiceAbstract {
@Inject
- public PrimitiveCharSeeding(ValueHolderRepository<Character, ? extends
PrimitiveCharEntity> entities) {
+ public PrimitiveCharSeeding(ValueHolderRepository<java.lang.Character, ?
extends PrimitiveCharEntity> entities) {
super(entities);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm-description.adoc
index a58656a427..24640e5e1e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm-description.adoc
@@ -1,14 +1,14 @@
: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 `char`
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 `char` 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]
----
-include::PrimitiveCharVm.java[tags="class"]
+include::PrimitiveCharVm.java[tags=class]
----
<.> a no-arg constructor is required by JAXB
<.> no additional JAXB annotations required.
-
-
-include::../PrimitiveChars-common.adoc[]
\ No newline at end of file
+include::../PrimitiveChars-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
index f485e96fca..ec7e94a1a9 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
@@ -37,6 +37,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -44,7 +45,7 @@ import
demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder2;
@Named("demo.PrimitiveCharVm")
@DomainObject(
nature=Nature.VIEW_MODEL)
[email protected] // <.>
[email protected]
// <.>
public class PrimitiveCharVm
implements HasAsciiDocDescription, PrimitiveCharHolder2 {
@@ -58,9 +59,9 @@ public class PrimitiveCharVm
@Title(prepend = "char (primitive) view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
- private char readOnlyProperty; // <.>
+ private char readOnlyProperty; // <.>
- @Property(editing = Editing.ENABLED)
+ @Property(editing = Editing.ENABLED)
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private char readWriteProperty;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
index d01899a6f0..bf6c6ddd0c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
@@ -15,10 +15,13 @@
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 />
<cpt:action id="actionReturning"/>
+ <cpt:action id="actionReturningArray"/>
</bs3:col>
<bs3:col span="2">
<cpt:fieldSet name="" id="sources" />
diff --git
a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
index fd08299664..83ff9aed91 100644
---
a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
+++
b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
@@ -35,6 +35,14 @@ public enum ValueShowCase {
.javaPackage("demoapp.dom.types.javautil.uuids")
.showcaseValueType("java.util.UUID")
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.UUIDValueSemantics")),
+
+ PCHAR(fundamentalTypeSupportNotice()
+ .showcaseName("PrimitiveChar")
+ .javaPackage("demoapp.dom.types.primitive.chars")
+ .showcaseValueType("char")
+
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.CharacterValueSemantics")
+ .templates(Template.PRIMITIVE_SET)
+ .templateVariant(TemplateVariant.PRIMITIVE)),
PLONG(fundamentalTypeSupportNotice()
.showcaseName("PrimitiveLong")
.javaPackage("demoapp.dom.types.primitive.longs")
@@ -77,6 +85,12 @@ public enum ValueShowCase {
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.FloatValueSemantics")
.templates(Template.PRIMITIVE_SET)
.templateVariant(TemplateVariant.PRIMITIVE)),
+
+ WCHAR(fundamentalTypeSupportNotice()
+ .showcaseName("WrapperCharacter")
+ .javaPackage("demoapp.dom.types.javalang.characters")
+ .showcaseValueType("java.lang.Character")
+
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.CharacterValueSemantics")),
WLONG(fundamentalTypeSupportNotice()
.showcaseName("WrapperLong")
.javaPackage("demoapp.dom.types.javalang.longs")
