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 60a30a65ff ISIS-3123: replace Short and Byte showcase with generated
files
60a30a65ff is described below
commit 60a30a65ff87fdeed1cd3bd2527aece1f337658e
Author: andi-huber <[email protected]>
AuthorDate: Wed Aug 17 09:10:30 2022 +0200
ISIS-3123: replace Short and Byte showcase with generated files
---
.../types/javalang/bytes/WrapperBytes-common.adoc | 7 ++++--
.../javalang/bytes/WrapperBytes-description.adoc | 10 ++++----
.../dom/types/javalang/bytes/WrapperBytes.java | 17 ++++++++-----
.../types/javalang/bytes/WrapperBytes.layout.xml | 2 ++
.../javalang/bytes/holder/WrapperByteHolder.java | 17 ++++++-------
.../javalang/bytes/holder/WrapperByteHolder2.java | 11 +++++----
.../holder/WrapperByteHolder_actionReturning.java | 4 ++--
...rapperByteHolder_actionReturningCollection.java | 10 ++++----
.../holder/WrapperByteHolder_mixinProperty.java | 4 ++--
...rByteHolder_updateReadOnlyOptionalProperty.java | 5 ++--
.../WrapperByteHolder_updateReadOnlyProperty.java | 5 ++--
...teHolder_updateReadOnlyPropertyWithChoices.java | 13 +++++-----
.../bytes/jdo/WrapperByteJdo-description.adoc | 6 +++--
.../types/javalang/bytes/jdo/WrapperByteJdo.java | 13 +++++-----
.../javalang/bytes/jdo/WrapperByteJdoEntities.java | 5 ++--
.../bytes/jpa/WrapperByteJpa-description.adoc | 15 +++++-------
.../types/javalang/bytes/jpa/WrapperByteJpa.java | 15 ++++++------
.../javalang/bytes/jpa/WrapperByteJpaEntities.java | 5 ++--
.../bytes/persistence/WrapperByteEntity.java | 5 ++--
.../bytes/persistence/WrapperByteEntity.layout.xml | 2 ++
.../bytes/persistence/WrapperByteSeeding.java | 7 ++++--
.../javalang/bytes/samples/WrapperByteSamples.java | 10 ++++----
.../bytes/vm/WrapperByteVm-description.adoc | 6 +++--
.../dom/types/javalang/bytes/vm/WrapperByteVm.java | 13 +++++-----
.../javalang/bytes/vm/WrapperByteVm.layout.xml | 2 ++
.../javalang/shorts/WrapperShorts-common.adoc | 7 ++++--
.../javalang/shorts/WrapperShorts-description.adoc | 10 ++++----
.../dom/types/javalang/shorts/WrapperShorts.java | 15 ++++++++----
.../types/javalang/shorts/WrapperShorts.layout.xml | 2 ++
.../javalang/shorts/holder/WrapperShortHolder.java | 17 ++++++-------
.../shorts/holder/WrapperShortHolder2.java | 11 +++++----
.../holder/WrapperShortHolder_actionReturning.java | 4 ++--
...apperShortHolder_actionReturningCollection.java | 10 ++++----
.../holder/WrapperShortHolder_mixinProperty.java | 4 ++--
...ShortHolder_updateReadOnlyOptionalProperty.java | 5 ++--
.../WrapperShortHolder_updateReadOnlyProperty.java | 5 ++--
...rtHolder_updateReadOnlyPropertyWithChoices.java | 13 +++++-----
.../shorts/jdo/WrapperShortJdo-description.adoc | 6 +++--
.../types/javalang/shorts/jdo/WrapperShortJdo.java | 13 +++++-----
.../shorts/jdo/WrapperShortJdoEntities.java | 5 ++--
.../shorts/jpa/WrapperShortJpa-description.adoc | 15 +++++-------
.../types/javalang/shorts/jpa/WrapperShortJpa.java | 15 ++++++------
.../shorts/jpa/WrapperShortJpaEntities.java | 5 ++--
.../shorts/persistence/WrapperShortEntity.java | 5 ++--
.../persistence/WrapperShortEntity.layout.xml | 2 ++
.../shorts/persistence/WrapperShortSeeding.java | 7 ++++--
.../shorts/samples/WrapperShortSamples.java | 10 ++++----
.../shorts/vm/WrapperShortVm-description.adoc | 6 +++--
.../types/javalang/shorts/vm/WrapperShortVm.java | 13 +++++-----
.../javalang/shorts/vm/WrapperShortVm.layout.xml | 2 ++
.../value/ValueTypeGenTemplateTest.java | 28 ++++++++++++++++++++++
51 files changed, 269 insertions(+), 175 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-common.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-common.adoc
index d15e8852a7..4f74660e3e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-common.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-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 `WrapperByteHolder`
interface, demonstrate the use of `Byte` as a parameter and as a return type.
+A number of mixin actions contribute through the `WrapperByteHolder`
interface, demonstrate the use of `java.lang.Byte` as a parameter and as a
return type.
For example:
* the `updateReadOnlyProperty` action is:
@@ -48,7 +50,7 @@
include::holder/WrapperByteHolder_mixinProperty.java[tags=class]
== @PropertyLayout(labelPosition=...)
-There is also an extended interface, `WrapperByteHolder2`, 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 `WrapperByteHolder2` interface:
[source,java]
----
@@ -63,3 +65,4 @@ include::holder/WrapperByteHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label compleely.
+
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-description.adoc
index 705a2f7d8e..a9be842400 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes-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 `Byte`.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+The framework has built-in support for the `java.lang.Byte` data type.
From here you can:
-* navigate to an entity that uses the `Byte` datatype
-* open a view model that uses the `Byte` datatype
+* navigate to an entity that uses the `java.lang.Byte` datatype
+* open a view model that uses the `java.lang.Byte` datatype
Some properties on these domain objects are mandatory, some optional.
@@ -26,4 +28,4 @@ include::holder/WrapperByteHolder.java[tags=class]
The `WrapperByteHolder2` 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/bytes/WrapperBytes.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
index ec8eafca87..144d30c384 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.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.bytes.persistence.WrapperByteEntity;
import demoapp.dom.types.javalang.bytes.vm.WrapperByteVm;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@@ -53,17 +55,16 @@ import demoapp.dom.types.javalang.bytes.vm.WrapperByteVm;
public class WrapperBytes implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "Byte (wrapper) data type";
+ return "java.lang.Byte data type";
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public WrapperByteVm openViewModel(final Byte initialValue) {
+ public WrapperByteVm openViewModel(final java.lang.Byte initialValue) {
return new WrapperByteVm(initialValue);
}
-
- @MemberSupport public Byte default0OpenViewModel() {
- return (byte)123;
+ @MemberSupport public java.lang.Byte default0OpenViewModel() {
+ return samples.single();
}
@Collection
@@ -73,6 +74,10 @@ public class WrapperBytes implements HasAsciiDocDescription {
@Inject
@XmlTransient
- ValueHolderRepository<Byte, ? extends WrapperByteEntity> entities;
+ ValueHolderRepository<java.lang.Byte, ? extends WrapperByteEntity>
entities;
+
+ @Inject
+ @XmlTransient
+ Samples<java.lang.Byte> samples;
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml
index 74e0160a87..247ed17506 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.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/bytes/holder/WrapperByteHolder.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
index e742108e61..bcca44841b 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder.java
@@ -20,21 +20,22 @@ package demoapp.dom.types.javalang.bytes.holder;
import javax.inject.Named;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperByteHolder")
//tag::class[]
public interface WrapperByteHolder {
- Byte getReadOnlyProperty();
- void setReadOnlyProperty(Byte c);
+ java.lang.Byte getReadOnlyProperty();
+ void setReadOnlyProperty(java.lang.Byte c);
- Byte getReadWriteProperty();
- void setReadWriteProperty(Byte c);
+ java.lang.Byte getReadWriteProperty();
+ void setReadWriteProperty(java.lang.Byte c);
- Byte getReadOnlyOptionalProperty();
- void setReadOnlyOptionalProperty(Byte c);
+ java.lang.Byte getReadOnlyOptionalProperty();
+ void setReadOnlyOptionalProperty(java.lang.Byte c);
- Byte getReadWriteOptionalProperty();
- void setReadWriteOptionalProperty(Byte c);
+ java.lang.Byte getReadWriteOptionalProperty();
+ void setReadWriteOptionalProperty(java.lang.Byte c);
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
index f08b2164ca..56a7a82279 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.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 WrapperByteHolder2 extends WrapperByteHolder {
@@ -32,8 +33,8 @@ public interface WrapperByteHolder2 extends WrapperByteHolder
{
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions", sequence = "1") // <.>
- default Byte getReadOnlyPropertyDerivedLabelPositionLeft() {
+ fieldSetId = "label-positions", sequence = "1") // <.>
+ default java.lang.Byte getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +45,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder
{
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "2")
- default Byte getReadOnlyPropertyDerivedLabelPositionTop() {
+ default java.lang.Byte getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +56,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder
{
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "3")
- default Byte getReadOnlyPropertyDerivedLabelPositionRight() {
+ default java.lang.Byte getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +67,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder
{
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "4")
- default Byte getReadOnlyPropertyDerivedLabelPositionNone() {
+ default java.lang.Byte getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturning.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturning.java
index 543ef25be0..72be7ca53a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturning.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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 WrapperByteHolder_actionReturning {
private final WrapperByteHolder holder;
- public Byte act() {
+ public java.lang.Byte act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
index c6d8fafca3..2372924e10 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_actionReturningCollection.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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 WrapperByteHolder_actionReturningCollection {
private final WrapperByteHolder holder;
- public Collection<Byte> act() {
+ public Collection<java.lang.Byte> act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Byte> samples;
+ Samples<java.lang.Byte> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
index d7ee0a37ce..35b95c4810 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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 WrapperByteHolder_mixinProperty {
private final WrapperByteHolder holder;
- public Byte prop() {
+ public java.lang.Byte prop() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalProperty.java
index 7232a690ba..5ff2bc65e0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyOptionalProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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
WrapperByteHolder_updateReadOnlyOptionalProperty {
@MemberSupport public WrapperByteHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
- final Byte newValue
+ final java.lang.Byte newValue
) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public Byte default0Act() {
+ @MemberSupport public java.lang.Byte default0Act() {
return holder.getReadOnlyOptionalProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyProperty.java
index 21cc96301e..a25765ef9d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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 WrapperByteHolder_updateReadOnlyProperty {
private final WrapperByteHolder holder;
- @MemberSupport public WrapperByteHolder act(final Byte newValue) {
+ @MemberSupport public WrapperByteHolder act(final java.lang.Byte newValue)
{
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Byte default0Act() {
+ @MemberSupport public java.lang.Byte default0Act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
index a9d4fe5506..7c79d03117 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_updateReadOnlyPropertyWithChoices.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_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
WrapperByteHolder_updateReadOnlyPropertyWithChoices {
private final WrapperByteHolder holder;
- @MemberSupport public WrapperByteHolder act(final Byte newValue) {
+ @MemberSupport public WrapperByteHolder act(final java.lang.Byte newValue)
{
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Byte default0Act() {
+ @MemberSupport public java.lang.Byte default0Act() {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<Byte> choices0Act() {
+ @MemberSupport public List<java.lang.Byte> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Byte> samples;
+ Samples<java.lang.Byte> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
index d3ef3a5427..f74b3f48d9 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-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 `Byte`
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.Byte` 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::../WrapperBytes-common.adoc[]
\ No newline at end of file
+include::../WrapperBytes-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
index 30de7c3827..3abc3e2011 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
+/* 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 WrapperByteJdo
// <.>
extends WrapperByteEntity {
//end::class[]
- public WrapperByteJdo(final Byte initialValue) {
+ public WrapperByteJdo(final java.lang.Byte initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Byte (wrapper) JDO entity: ")
+ @Title(prepend = "java.lang.Byte JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false")
// <.>
@Getter @Setter
- private Byte readOnlyProperty;
+ private java.lang.Byte readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
- private Byte readWriteProperty;
+ private java.lang.Byte readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true")
// <.>
@Getter @Setter
- private Byte readOnlyOptionalProperty;
+ private java.lang.Byte readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
- private Byte readWriteOptionalProperty;
+ private java.lang.Byte readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdoEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdoEntities.java
index d70f3020f6..6aebb64b68 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdoEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdoEntities.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 WrapperByteJdoEntities
-extends ValueHolderRepository<Byte, WrapperByteJdo> {
+extends ValueHolderRepository<java.lang.Byte, WrapperByteJdo> {
protected WrapperByteJdoEntities() {
super(WrapperByteJdo.class);
}
@Override
- protected WrapperByteJdo newDetachedEntity(Byte value) {
+ protected WrapperByteJdo newDetachedEntity(java.lang.Byte value) {
return new WrapperByteJdo(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
index bd120c267c..3f72a5f93d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-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 `Byte`
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.Byte` 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::WrapperByteJpa.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::../WrapperBytes-common.adoc[]
\ No newline at end of file
+include::../WrapperBytes-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
index 8f703e5e76..e18c5651d3 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
@@ -42,6 +42,7 @@ import lombok.Setter;
import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
+/* 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.bytes.persistence.WrapperByteEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.WrapperByteEntity")
@DomainObject
-@NoArgsConstructor
+@NoArgsConstructor
// <.>
public class WrapperByteJpa
extends WrapperByteEntity {
//end::class[]
- public WrapperByteJpa(final Byte initialValue) {
+ public WrapperByteJpa(final java.lang.Byte initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
@@ -67,29 +68,29 @@ public class WrapperByteJpa
@GeneratedValue
private Long id;
- @Title(prepend = "Byte (wrapper) JPA entity: ")
+ @Title(prepend = "java.lang.Byte JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(nullable = false)
// <.>
@Getter @Setter
- private Byte readOnlyProperty;
+ private java.lang.Byte readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(nullable = false)
@Getter @Setter
- private Byte readWriteProperty;
+ private java.lang.Byte readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(nullable = true)
// <.>
@Getter @Setter
- private Byte readOnlyOptionalProperty;
+ private java.lang.Byte readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(nullable = true)
@Getter @Setter
- private Byte readWriteOptionalProperty;
+ private java.lang.Byte readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpaEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpaEntities.java
index a26ab9d55c..2da4dc54f6 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpaEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpaEntities.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 WrapperByteJpaEntities
-extends ValueHolderRepository<Byte, WrapperByteJpa> {
+extends ValueHolderRepository<java.lang.Byte, WrapperByteJpa> {
protected WrapperByteJpaEntities() {
super(WrapperByteJpa.class);
}
@Override
- protected WrapperByteJpa newDetachedEntity(Byte value) {
+ protected WrapperByteJpa newDetachedEntity(java.lang.Byte value) {
return new WrapperByteJpa(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
index 99be9f0b37..7eb536d003 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.java
@@ -26,16 +26,17 @@ import
demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.javalang.bytes.holder.WrapperByteHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperByteEntity") // shared permissions with concrete sub class
@DomainObject
public abstract class WrapperByteEntity
implements
HasAsciiDocDescription,
WrapperByteHolder2,
- ValueHolder<Byte> {
+ ValueHolder<java.lang.Byte> {
@Override
- public Byte value() {
+ public java.lang.Byte value() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.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/bytes/persistence/WrapperByteSeeding.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java
index 34837848ce..ac854f4057 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteSeeding.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 WrapperByteSeeding extends SeedServiceAbstract {
+public class WrapperByteSeeding
+extends SeedServiceAbstract {
@Inject
- public WrapperByteSeeding(ValueHolderRepository<Byte, ? extends
WrapperByteEntity> entities) {
+ public WrapperByteSeeding(ValueHolderRepository<java.lang.Byte, ? extends
WrapperByteEntity> entities) {
super(entities);
}
+
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/samples/WrapperByteSamples.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/samples/WrapperByteSamples.java
index 62294a1c1c..94c54c50a4 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/samples/WrapperByteSamples.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/samples/WrapperByteSamples.java
@@ -24,13 +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 WrapperByteSamples implements Samples<Byte> {
+public class WrapperByteSamples implements Samples<java.lang.Byte> {
@Override
- public Stream<Byte> stream() {
- return Stream.of(1, 2, 3)
- .map(Integer::byteValue);
+ public Stream<java.lang.Byte> stream() {
+ return new
org.apache.isis.core.metamodel.valuesemantics.ByteValueSemantics()
+ .getExamples()
+ .stream();
}
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
index 132bce65a1..6bdad8f1c6 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-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 `Byte`
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.Byte` 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::WrapperByteVm.java[tags=class]
This is the default for JAXB so no additional annotation required.
-include::../WrapperBytes-common.adoc[]
\ No newline at end of file
+include::../WrapperBytes-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
index ea2671f600..c3da662ac4 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javalang.bytes.holder.WrapperByteHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -51,33 +52,33 @@ public class WrapperByteVm
implements HasAsciiDocDescription, WrapperByteHolder2 {
//end::class[]
- public WrapperByteVm(final Byte initialValue) {
+ public WrapperByteVm(final java.lang.Byte initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Byte (wrapper) view model: ")
+ @Title(prepend = "java.lang.Byte view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true)
// <.>
@Getter @Setter
- private Byte readOnlyProperty;
+ private java.lang.Byte readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
- private Byte readWriteProperty;
+ private java.lang.Byte readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
- private Byte readOnlyOptionalProperty;
+ private java.lang.Byte readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
- private Byte readWriteOptionalProperty;
+ private java.lang.Byte readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.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/shorts/WrapperShorts-common.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-common.adoc
index 0f75a9af3f..1e85e3c551 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-common.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-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 `WrapperShortHolder`
interface, demonstrate the use of `Short` as a parameter and as a return type.
+A number of mixin actions contribute through the `WrapperShortHolder`
interface, demonstrate the use of `java.lang.Short` as a parameter and as a
return type.
For example:
* the `updateReadOnlyProperty` action is:
@@ -48,7 +50,7 @@
include::holder/WrapperShortHolder_mixinProperty.java[tags=class]
== @PropertyLayout(labelPosition=...)
-There is also an extended interface, `WrapperShortHolder2`, 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 `WrapperShortHolder2` interface:
[source,java]
----
@@ -63,3 +65,4 @@ include::holder/WrapperShortHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label compleely.
+
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-description.adoc
index 3417092ced..ed93d2071a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts-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 `Short`.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+The framework has built-in support for the `java.lang.Short` data type.
From here you can:
-* navigate to an entity that uses the `Short` datatype
-* open a view model that uses the `Short` datatype
+* navigate to an entity that uses the `java.lang.Short` datatype
+* open a view model that uses the `java.lang.Short` datatype
Some properties on these domain objects are mandatory, some optional.
@@ -26,4 +28,4 @@ include::holder/WrapperShortHolder.java[tags=class]
The `WrapperShortHolder2` 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/shorts/WrapperShorts.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java
index f9893f9f4b..2f7a441d43 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.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.shorts.persistence.WrapperShortEntity;
import demoapp.dom.types.javalang.shorts.vm.WrapperShortVm;
+/* 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.shorts.vm.WrapperShortVm;
public class WrapperShorts implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "Short (wrapper) data type";
+ return "java.lang.Short data type";
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public WrapperShortVm openViewModel(final Short initialValue) {
+ public WrapperShortVm openViewModel(final java.lang.Short initialValue) {
return new WrapperShortVm(initialValue);
}
- @MemberSupport public Short default0OpenViewModel() {
- return (short)12345;
+ @MemberSupport public java.lang.Short default0OpenViewModel() {
+ return samples.single();
}
@Collection
@@ -72,7 +74,10 @@ public class WrapperShorts implements HasAsciiDocDescription
{
@Inject
@XmlTransient
- ValueHolderRepository<Short, ? extends WrapperShortEntity> entities;
+ ValueHolderRepository<java.lang.Short, ? extends WrapperShortEntity>
entities;
+ @Inject
+ @XmlTransient
+ Samples<java.lang.Short> samples;
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml
index 74e0160a87..247ed17506 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.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/shorts/holder/WrapperShortHolder.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
index 793454d4e9..dd897ae828 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder.java
@@ -20,21 +20,22 @@ package demoapp.dom.types.javalang.shorts.holder;
import javax.inject.Named;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperShortHolder")
//tag::class[]
public interface WrapperShortHolder {
- Short getReadOnlyProperty();
- void setReadOnlyProperty(Short c);
+ java.lang.Short getReadOnlyProperty();
+ void setReadOnlyProperty(java.lang.Short c);
- Short getReadWriteProperty();
- void setReadWriteProperty(Short c);
+ java.lang.Short getReadWriteProperty();
+ void setReadWriteProperty(java.lang.Short c);
- Short getReadOnlyOptionalProperty();
- void setReadOnlyOptionalProperty(Short c);
+ java.lang.Short getReadOnlyOptionalProperty();
+ void setReadOnlyOptionalProperty(java.lang.Short c);
- Short getReadWriteOptionalProperty();
- void setReadWriteOptionalProperty(Short c);
+ java.lang.Short getReadWriteOptionalProperty();
+ void setReadWriteOptionalProperty(java.lang.Short c);
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
index fa5b42374f..9b8d0a8b30 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.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 WrapperShortHolder2 extends WrapperShortHolder {
@@ -32,8 +33,8 @@ public interface WrapperShortHolder2 extends
WrapperShortHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions", sequence = "1") // <.>
- default Short getReadOnlyPropertyDerivedLabelPositionLeft() {
+ fieldSetId = "label-positions", sequence = "1") // <.>
+ default java.lang.Short getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +45,7 @@ public interface WrapperShortHolder2 extends
WrapperShortHolder {
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "2")
- default Short getReadOnlyPropertyDerivedLabelPositionTop() {
+ default java.lang.Short getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +56,7 @@ public interface WrapperShortHolder2 extends
WrapperShortHolder {
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "3")
- default Short getReadOnlyPropertyDerivedLabelPositionRight() {
+ default java.lang.Short getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +67,7 @@ public interface WrapperShortHolder2 extends
WrapperShortHolder {
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "4")
- default Short getReadOnlyPropertyDerivedLabelPositionNone() {
+ default java.lang.Short getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturning.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturning.java
index 5a79c6abfb..19890024d1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturning.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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 WrapperShortHolder_actionReturning {
private final WrapperShortHolder holder;
- public Short act() {
+ public java.lang.Short act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
index 8ce294f1d2..f3f3fa4b15 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_actionReturningCollection.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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 WrapperShortHolder_actionReturningCollection {
private final WrapperShortHolder holder;
- public Collection<Short> act() {
+ public Collection<java.lang.Short> act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Short> samples;
+ Samples<java.lang.Short> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
index 6079071f3b..0fcd5acf87 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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 WrapperShortHolder_mixinProperty {
private final WrapperShortHolder holder;
- public Short prop() {
+ public java.lang.Short prop() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalProperty.java
index 95a4852124..11647d698b 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyOptionalProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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
WrapperShortHolder_updateReadOnlyOptionalProperty {
@MemberSupport public WrapperShortHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
- final Short newValue
+ final java.lang.Short newValue
) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public Short default0Act() {
+ @MemberSupport public java.lang.Short default0Act() {
return holder.getReadOnlyOptionalProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyProperty.java
index 82dbe82ffd..31a6e5a106 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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 WrapperShortHolder_updateReadOnlyProperty {
private final WrapperShortHolder holder;
- @MemberSupport public WrapperShortHolder act(final Short newValue) {
+ @MemberSupport public WrapperShortHolder act(final java.lang.Short
newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Short default0Act() {
+ @MemberSupport public java.lang.Short default0Act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
index c51d2282f9..89a62cf9d0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_updateReadOnlyPropertyWithChoices.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_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
WrapperShortHolder_updateReadOnlyPropertyWithChoices {
private final WrapperShortHolder holder;
- @MemberSupport public WrapperShortHolder act(final Short newValue) {
+ @MemberSupport public WrapperShortHolder act(final java.lang.Short
newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Short default0Act() {
+ @MemberSupport public java.lang.Short default0Act() {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<Short> choices0Act() {
+ @MemberSupport public List<java.lang.Short> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Short> samples;
+ Samples<java.lang.Short> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
index 24153bcbdc..96a17bd1ab 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-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 `Short`
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.Short` 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::../WrapperShorts-common.adoc[]
\ No newline at end of file
+include::../WrapperShorts-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
index eb5863428c..acf8185677 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
+/* 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 WrapperShortJdo
// <.>
extends WrapperShortEntity {
//end::class[]
- public WrapperShortJdo(final Short initialValue) {
+ public WrapperShortJdo(final java.lang.Short initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Short (wrapper) JDO entity: ")
+ @Title(prepend = "java.lang.Short JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false")
// <.>
@Getter @Setter
- private Short readOnlyProperty;
+ private java.lang.Short readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
- private Short readWriteProperty;
+ private java.lang.Short readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true")
// <.>
@Getter @Setter
- private Short readOnlyOptionalProperty;
+ private java.lang.Short readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
- private Short readWriteOptionalProperty;
+ private java.lang.Short readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdoEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdoEntities.java
index 0c671d4725..1897f3acd8 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdoEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdoEntities.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 WrapperShortJdoEntities
-extends ValueHolderRepository<Short, WrapperShortJdo> {
+extends ValueHolderRepository<java.lang.Short, WrapperShortJdo> {
protected WrapperShortJdoEntities() {
super(WrapperShortJdo.class);
}
@Override
- protected WrapperShortJdo newDetachedEntity(Short value) {
+ protected WrapperShortJdo newDetachedEntity(java.lang.Short value) {
return new WrapperShortJdo(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
index bcb893ddae..7882b250ba 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-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 `Short`
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.Short` 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::WrapperShortJpa.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::../WrapperShorts-common.adoc[]
\ No newline at end of file
+include::../WrapperShorts-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
index 966bd0bcbf..499e9c7380 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
@@ -42,6 +42,7 @@ import lombok.Setter;
import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
+/* 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.shorts.persistence.WrapperShortEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.WrapperShortEntity")
@DomainObject
-@NoArgsConstructor
+@NoArgsConstructor
// <.>
public class WrapperShortJpa
extends WrapperShortEntity {
//end::class[]
- public WrapperShortJpa(final Short initialValue) {
+ public WrapperShortJpa(final java.lang.Short initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
@@ -67,29 +68,29 @@ public class WrapperShortJpa
@GeneratedValue
private Long id;
- @Title(prepend = "Short (wrapper) JPA entity: ")
+ @Title(prepend = "java.lang.Short JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(nullable = false)
// <.>
@Getter @Setter
- private Short readOnlyProperty;
+ private java.lang.Short readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(nullable = false)
@Getter @Setter
- private Short readWriteProperty;
+ private java.lang.Short readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(nullable = true)
// <.>
@Getter @Setter
- private Short readOnlyOptionalProperty;
+ private java.lang.Short readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(nullable = true)
@Getter @Setter
- private Short readWriteOptionalProperty;
+ private java.lang.Short readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpaEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpaEntities.java
index ba684c722b..fb4c4698b4 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpaEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpaEntities.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 WrapperShortJpaEntities
-extends ValueHolderRepository<Short, WrapperShortJpa> {
+extends ValueHolderRepository<java.lang.Short, WrapperShortJpa> {
protected WrapperShortJpaEntities() {
super(WrapperShortJpa.class);
}
@Override
- protected WrapperShortJpa newDetachedEntity(Short value) {
+ protected WrapperShortJpa newDetachedEntity(java.lang.Short value) {
return new WrapperShortJpa(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.java
index 8a1b513449..55d53aa5b1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.java
@@ -26,16 +26,17 @@ import
demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.javalang.shorts.holder.WrapperShortHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.WrapperShortEntity") // shared permissions with concrete sub class
@DomainObject
public abstract class WrapperShortEntity
implements
HasAsciiDocDescription,
WrapperShortHolder2,
- ValueHolder<Short> {
+ ValueHolder<java.lang.Short> {
@Override
- public Short value() {
+ public java.lang.Short value() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.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/shorts/persistence/WrapperShortSeeding.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortSeeding.java
index 60fedfba6f..c06fa76bac 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortSeeding.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortSeeding.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 WrapperShortSeeding extends SeedServiceAbstract {
+public class WrapperShortSeeding
+extends SeedServiceAbstract {
@Inject
- public WrapperShortSeeding(ValueHolderRepository<Short, ? extends
WrapperShortEntity> entities) {
+ public WrapperShortSeeding(ValueHolderRepository<java.lang.Short, ?
extends WrapperShortEntity> entities) {
super(entities);
}
+
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/samples/WrapperShortSamples.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/samples/WrapperShortSamples.java
index 6f1e669694..c1d46ce697 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/samples/WrapperShortSamples.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/samples/WrapperShortSamples.java
@@ -24,13 +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 WrapperShortSamples implements Samples<Short> {
+public class WrapperShortSamples implements Samples<java.lang.Short> {
@Override
- public Stream<Short> stream() {
- return Stream.of(123, -123, 3000, 400)
- .map(Integer::shortValue);
+ public Stream<java.lang.Short> stream() {
+ return new
org.apache.isis.core.metamodel.valuesemantics.ShortValueSemantics()
+ .getExamples()
+ .stream();
}
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
index 2b522583ea..0a340ea158 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-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 `Short`
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.Short` 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::WrapperShortVm.java[tags=class]
This is the default for JAXB so no additional annotation required.
-include::../WrapperShorts-common.adoc[]
\ No newline at end of file
+include::../WrapperShorts-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
index 321b64308f..1ca49fb3d2 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javalang.shorts.holder.WrapperShortHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -51,33 +52,33 @@ public class WrapperShortVm
implements HasAsciiDocDescription, WrapperShortHolder2 {
//end::class[]
- public WrapperShortVm(final Short initialValue) {
+ public WrapperShortVm(final java.lang.Short initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @Title(prepend = "Short (wrapper) view model: ")
+ @Title(prepend = "java.lang.Short view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true)
// <.>
@Getter @Setter
- private Short readOnlyProperty;
+ private java.lang.Short readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
- private Short readWriteProperty;
+ private java.lang.Short readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
- private Short readOnlyOptionalProperty;
+ private java.lang.Short readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
- private Short readWriteOptionalProperty;
+ private java.lang.Short readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.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/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
b/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
index a39d96329c..d4a85da7b0 100644
---
a/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
+++
b/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
@@ -71,6 +71,34 @@ class ValueTypeGenTemplateTest {
testShowcase(config);
}
+ @Test
+ void testWShort() throws IOException {
+
+ val config = fundamentalTypeSupportNotice()
+ .outputRootDir(outputDir("wshort"))
+ .showcaseName("WrapperShort")
+ .javaPackage("demoapp.dom.types.javalang.shorts")
+ .showcaseValueType("java.lang.Short")
+
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.ShortValueSemantics")
+ .build();
+
+ testShowcase(config);
+ }
+
+ @Test
+ void testWByte() throws IOException {
+
+ val config = fundamentalTypeSupportNotice()
+ .outputRootDir(outputDir("wbyte"))
+ .showcaseName("WrapperByte")
+ .javaPackage("demoapp.dom.types.javalang.bytes")
+ .showcaseValueType("java.lang.Byte")
+
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.ByteValueSemantics")
+ .build();
+
+ testShowcase(config);
+ }
+
// -- HELPER
private ConfigBuilder fundamentalTypeSupportNotice() {
