You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/08/17 05:14:10 UTC
[isis] branch master updated: ISIS-3123: replace UUID showcase with generated files
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 b4daac7bc2 ISIS-3123: replace UUID showcase with generated files
b4daac7bc2 is described below
commit b4daac7bc25a3f9114664dc403b4fdf5e46b3a39
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Aug 17 07:14:01 2022 +0200
ISIS-3123: replace UUID showcase with generated files
---
.../types/javautil/uuids/JavaUtilUuids-common.adoc | 2 +
.../javautil/uuids/JavaUtilUuids-description.adoc | 4 +-
.../dom/types/javautil/uuids/JavaUtilUuids.java | 1 +
.../types/javautil/uuids/JavaUtilUuids.layout.xml | 2 +
.../javautil/uuids/holder/JavaUtilUuidHolder.java | 1 +
.../javautil/uuids/holder/JavaUtilUuidHolder2.java | 1 +
.../holder/JavaUtilUuidHolder_actionReturning.java | 2 +-
...vaUtilUuidHolder_actionReturningCollection.java | 2 +-
.../holder/JavaUtilUuidHolder_mixinProperty.java | 2 +-
...lUuidHolder_updateReadOnlyOptionalProperty.java | 1 +
.../JavaUtilUuidHolder_updateReadOnlyProperty.java | 1 +
...idHolder_updateReadOnlyPropertyWithChoices.java | 1 +
.../uuids/jdo/JavaUtilUuidJdo-description.adoc | 4 +-
.../types/javautil/uuids/jdo/JavaUtilUuidJdo.java | 1 +
.../uuids/jdo/JavaUtilUuidJdoEntities.java | 3 +-
.../uuids/jpa/JavaUtilUuidJpa-description.adoc | 4 +-
.../types/javautil/uuids/jpa/JavaUtilUuidJpa.java | 1 +
.../uuids/jpa/JavaUtilUuidJpaEntities.java | 3 +-
.../uuids/persistence/JavaUtilUuidEntity.java | 1 +
.../persistence/JavaUtilUuidEntity.layout.xml | 2 +
.../uuids/persistence/JavaUtilUuidSeeding.java | 1 +
.../uuids/samples/JavaUtilUuidSamples.java | 1 +
.../uuids/vm/JavaUtilUuidVm-description.adoc | 4 +-
.../types/javautil/uuids/vm/JavaUtilUuidVm.java | 1 +
.../javautil/uuids/vm/JavaUtilUuidVm.layout.xml | 2 +
.../demoshowcases/value/ValueTypeGenTemplate.java | 13 ++--
.../src/main/resources/$Templates-common.adoc | 2 +
.../src/main/resources/$Templates-description.adoc | 2 +
.../metaprog/src/main/resources/$Templates.java | 2 +-
.../src/main/resources/$Templates.layout.xml | 2 +
.../src/main/resources/holder/$TemplateHolder.java | 2 +-
.../main/resources/holder/$TemplateHolder2.java | 2 +-
.../holder/$TemplateHolder_actionReturning.java | 2 +-
.../$TemplateHolder_actionReturningCollection.java | 2 +-
.../holder/$TemplateHolder_mixinProperty.java | 2 +-
...plateHolder_updateReadOnlyOptionalProperty.java | 2 +-
.../$TemplateHolder_updateReadOnlyProperty.java | 2 +-
...teHolder_updateReadOnlyPropertyWithChoices.java | 2 +-
.../resources/jdo/$TemplateJdo-description.adoc | 2 +
.../src/main/resources/jdo/$TemplateJdo.java | 2 +-
.../main/resources/jdo/$TemplateJdoEntities.java | 2 +-
.../resources/jpa/$TemplateJpa-description.adoc | 2 +
.../src/main/resources/jpa/$TemplateJpa.java | 2 +-
.../main/resources/jpa/$TemplateJpaEntities.java | 2 +-
.../resources/persistence/$TemplateEntity.java | 2 +-
.../persistence/$TemplateEntity.layout.xml | 2 +
.../resources/persistence/$TemplateSeeding.java | 2 +-
.../main/resources/samples/$TemplateSamples.java | 2 +-
.../main/resources/vm/$TemplateVm-description.adoc | 2 +
.../src/main/resources/vm/$TemplateVm.java | 2 +-
.../src/main/resources/vm/$TemplateVm.layout.xml | 2 +
.../value/ValueTypeGenTemplateTest.java | 84 ++++++++++++++++------
52 files changed, 140 insertions(+), 55 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-common.adoc
index d249090d37..2aa125f646 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-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 `JavaUtilUuidHolder` interface, demonstrate the use of `java.util.UUID` as a parameter and as a return type.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-description.adoc
index 5444fb2369..7bef39cb38 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids-description.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!
+
The framework has built-in support for the `java.util.UUID` data type.
From here you can:
@@ -26,4 +28,4 @@ include::holder/JavaUtilUuidHolder.java[tags=class]
The `JavaUtilUuidHolder2` 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/javautil/uuids/JavaUtilUuids.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
index ffb0f42e2a..86bda00655 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
@@ -45,6 +45,7 @@ import demoapp.dom.types.Samples;
import demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidEntity;
import demoapp.dom.types.javautil.uuids.vm.JavaUtilUuidVm;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml
index 74e0160a87..247ed17506 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.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/javautil/uuids/holder/JavaUtilUuidHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder.java
index 50e2c9a04a..ca4ed7bb7d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder.java
@@ -20,6 +20,7 @@ package demoapp.dom.types.javautil.uuids.holder;
import javax.inject.Named;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.JavaUtilUuidHolder")
//tag::class[]
public interface JavaUtilUuidHolder {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
index cb72e2dcd5..c4df7494f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.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 JavaUtilUuidHolder2 extends JavaUtilUuidHolder {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturning.java
index 5520db5a3a..c382eb9e1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_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/javautil/uuids/holder/JavaUtilUuidHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturningCollection.java
index 34b31d7243..1c6cf94cf5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_actionReturningCollection.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
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
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java
index 4ae1b46a67..2588fee582 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_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/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyOptionalProperty.java
index 6e6a9df3a3..ce79103b06 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_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
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyProperty.java
index 5c3eaf2ad8..59da5249ce 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_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/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyPropertyWithChoices.java
index efec5d7c9f..2d6ceb2fe4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_updateReadOnlyPropertyWithChoices.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
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
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc
index d4840f05e7..bdce913a97 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.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!
+
JDO supports `java.util.UUID` out-of-the-box, so no special annotations are required.
[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::../JavaUtilUuids-common.adoc[]
\ No newline at end of file
+include::../JavaUtilUuids-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
index a471ff8481..1c4c5e19e7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdoEntities.java
index 7016edae0b..9f1f72c91f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdoEntities.java
@@ -23,6 +23,7 @@ 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 JavaUtilUuidJdoEntities
@@ -37,4 +38,4 @@ extends ValueHolderRepository<java.util.UUID, JavaUtilUuidJdo> {
return new JavaUtilUuidJdo(value);
}
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc
index 98812cef37..b644f2d411 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.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!
+
[WARNING]
====
TODO this yet is just a copy from JDO
@@ -20,4 +22,4 @@ Apache Isis assumes properties are mandatory, so no additional annotation is req
<.> optional property as defined to JDO/DataNucleus
-include::../JavaUtilUuids-common.adoc[]
\ No newline at end of file
+include::../JavaUtilUuids-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
index 4a6a9324a4..1a7c8194d9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
@@ -42,6 +42,7 @@ import lombok.Setter;
import demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpaEntities.java
index a126d7ca6c..67c37036f1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpaEntities.java
@@ -23,6 +23,7 @@ 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 JavaUtilUuidJpaEntities
@@ -37,4 +38,4 @@ extends ValueHolderRepository<java.util.UUID, JavaUtilUuidJpa> {
return new JavaUtilUuidJpa(value);
}
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.java
index 445e9754f1..5bb605e73f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.java
@@ -26,6 +26,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.javautil.uuids.holder.JavaUtilUuidHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.JavaUtilUuidEntity") // shared permissions with concrete sub class
@DomainObject
public abstract class JavaUtilUuidEntity
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml
index fe9ce77481..c58ffa61a0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.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/javautil/uuids/persistence/JavaUtilUuidSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidSeeding.java
index 1712bbcb94..ed361507c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidSeeding.java
@@ -25,6 +25,7 @@ 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 JavaUtilUuidSeeding
extends SeedServiceAbstract {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
index 9911653876..fb49439525 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
@@ -24,6 +24,7 @@ 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 JavaUtilUuidSamples implements Samples<java.util.UUID> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc
index 36e0749ced..b1bc7a598b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.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!
+
JAXB supports `java.util.UUID` out-of-the-box, so no special annotations are required.
[source,java]
@@ -14,4 +16,4 @@ include::JavaUtilUuidVm.java[tags=class]
This is the default for JAXB so no additional annotation required.
-include::../JavaUtilUuids-common.adoc[]
\ No newline at end of file
+include::../JavaUtilUuids-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
index 91f93d8e1f..8ec9967146 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
@@ -39,6 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javautil.uuids.holder.JavaUtilUuidHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml
index fe9ce77481..c58ffa61a0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
index 3eb011c7f9..2c32416a36 100644
--- a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
+++ b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java
@@ -50,7 +50,7 @@ public class ValueTypeGenTemplate {
@Builder.Default
final String fileNamePlaceholderForShowcaseName = "$Template";
@Builder.Default
- final String generatedFileNotice = "This file was generated by the showcase generator (tooling). Do NOT edit!";
+ final String generatedFileNotice = "This file was GENERATED by the showcase generator (tooling). Do NOT edit!";
@Singular
final Map<String, String> templateVariables = new HashMap<>();
}
@@ -59,7 +59,7 @@ public class ValueTypeGenTemplate {
enum Generator {
DOC(".adoc"){
@Override String formatAsComment(final String text) {
- return "//// " + text + " ////"; }
+ return " // " + text; }
@Override String formatAsTemplateVar(final String key) {
return "#{" + key + "}"; } // ADOC pass through var syntax
},
@@ -170,13 +170,10 @@ public class ValueTypeGenTemplate {
templateVars.put("showcase-name", config.showcaseName);
templateVars.put("showcase-type", config.showcaseValueType);
templateVars.put("showcase-value-semantics-provider", config.showcaseValueSemantics);
+ templateVars.put("generated-file-notice", source.generator.formatAsComment(config.generatedFileNotice));
- if(source.generator.isJava()) {
- templateVars.put("before-class-declaration", config.suppressGeneratedFileNotice
- ? ""
- : source.generator.formatAsComment(config.generatedFileNotice));
- }
-
+ // allow for ADOC IDE tools, to properly resolve include statements,
+ // that is referenced (template) files should exist
if(source.generator.isDoc()) {
templateVars.putRaw("$Template", config.showcaseName);
}
diff --git a/tooling/metaprog/src/main/resources/$Templates-common.adoc b/tooling/metaprog/src/main/resources/$Templates-common.adoc
index a23ce7a9d6..16088f3ffe 100644
--- a/tooling/metaprog/src/main/resources/$Templates-common.adoc
+++ b/tooling/metaprog/src/main/resources/$Templates-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 [...]
+//#{generated-file-notice}
+
== Mixin actions
A number of mixin actions contribute through the `#{showcase-name}Holder` interface, demonstrate the use of `#{showcase-type}` as a parameter and as a return type.
diff --git a/tooling/metaprog/src/main/resources/$Templates-description.adoc b/tooling/metaprog/src/main/resources/$Templates-description.adoc
index 3fe6fa17f8..023202dea7 100644
--- a/tooling/metaprog/src/main/resources/$Templates-description.adoc
+++ b/tooling/metaprog/src/main/resources/$Templates-description.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 [...]
+//#{generated-file-notice}
+
The framework has built-in support for the `#{showcase-type}` data type.
From here you can:
diff --git a/tooling/metaprog/src/main/resources/$Templates.java b/tooling/metaprog/src/main/resources/$Templates.java
index aaeb33773f..e043eea985 100644
--- a/tooling/metaprog/src/main/resources/$Templates.java
+++ b/tooling/metaprog/src/main/resources/$Templates.java
@@ -45,7 +45,7 @@ import demoapp.dom.types.Samples;
import demoapp.dom.types.javautil.uuids.persistence./*${showcase-name}*/Entity;
import demoapp.dom.types.javautil.uuids.vm./*${showcase-name}*/Vm;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/tooling/metaprog/src/main/resources/$Templates.layout.xml b/tooling/metaprog/src/main/resources/$Templates.layout.xml
index 74e0160a87..f8293ec232 100644
--- a/tooling/metaprog/src/main/resources/$Templates.layout.xml
+++ b/tooling/metaprog/src/main/resources/$Templates.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!--${generated-file-notice}-->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java
index 5f6ab82f77..e24e96240e 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder.java
@@ -20,7 +20,7 @@ package /*${java-package}*/;
import javax.inject.Named;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Named("demo./*${showcase-name}*/Holder")
//tag::class[]
public interface /*${showcase-name}*/Holder {
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder2.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder2.java
index 78c2a51d22..87ae9cccf0 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder2.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder2.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
public interface /*${showcase-name}*/Holder2 extends /*${showcase-name}*/Holder {
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturning.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturning.java
index a40291a31e..3bd37396ea 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturning.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturning.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Action(semantics = SemanticsOf.SAFE)
@RequiredArgsConstructor
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
index ae37fe1bc8..88a5fb6f1f 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_actionReturningCollection.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import demoapp.dom.types.Samples;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Action(semantics = SemanticsOf.SAFE)
@RequiredArgsConstructor
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_mixinProperty.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_mixinProperty.java
index 20a177e73a..0d5d9ed497 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_mixinProperty.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_mixinProperty.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Where;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Property()
@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalProperty.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalProperty.java
index 5040ccb107..254c1b20fa 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalProperty.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyOptionalProperty.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyProperty.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyProperty.java
index 4854912adb..ef40127235 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyProperty.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyProperty.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
diff --git a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
index ca12731a4d..3dde506730 100644
--- a/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
+++ b/tooling/metaprog/src/main/resources/holder/$TemplateHolder_updateReadOnlyPropertyWithChoices.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import demoapp.dom.types.Samples;
import lombok.RequiredArgsConstructor;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc
index 4719cfcc7a..42351b3e24 100644
--- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.adoc
+++ b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo-description.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 [...]
+//#{generated-file-notice}
+
JDO supports `#{showcase-type}` out-of-the-box, so no special annotations are required.
[source,java]
diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
index 8e7787ad76..15950562d0 100644
--- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
+++ b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
@@ -39,7 +39,7 @@ import lombok.Setter;
import demoapp.dom.types.javautil.uuids.persistence./*${showcase-name}*/Entity;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdoEntities.java b/tooling/metaprog/src/main/resources/jdo/$TemplateJdoEntities.java
index 08d19471e3..5224c693d6 100644
--- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdoEntities.java
+++ b/tooling/metaprog/src/main/resources/jdo/$TemplateJdoEntities.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
import demoapp.dom._infra.values.ValueHolderRepository;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Profile("demo-jdo")
@Service
public class /*${showcase-name}*/JdoEntities
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc
index 14bddbaa25..0d4ce9d167 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.adoc
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa-description.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 [...]
+//#{generated-file-notice}
+
[WARNING]
====
TODO this yet is just a copy from JDO
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
index c87fc4d86b..2aff57f771 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
@@ -42,7 +42,7 @@ import lombok.Setter;
import demoapp.dom.types.javautil.uuids.persistence./*${showcase-name}*/Entity;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Profile("demo-jpa")
//tag::class[]
@Entity
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpaEntities.java b/tooling/metaprog/src/main/resources/jpa/$TemplateJpaEntities.java
index db90e059a8..c6ea53ca3d 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpaEntities.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpaEntities.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
import demoapp.dom._infra.values.ValueHolderRepository;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Profile("demo-jpa")
@Service
public class /*${showcase-name}*/JpaEntities
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
index c7b05ae8c4..7544b38320 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
@@ -26,7 +26,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.javautil.uuids.holder./*${showcase-name}*/Holder2;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Named("demo./*${showcase-name}*/Entity") // shared permissions with concrete sub class
@DomainObject
public abstract class /*${showcase-name}*/Entity
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
index fe9ce77481..fb7f017a0c 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!--${generated-file-notice}-->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java b/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java
index 2f7d123c3e..a2347caa49 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateSeeding.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import demoapp.dom._infra.seed.SeedServiceAbstract;
import demoapp.dom._infra.values.ValueHolderRepository;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Service
public class /*${showcase-name}*/Seeding
extends SeedServiceAbstract {
diff --git a/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java b/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
index d97f99905d..6241b4771e 100644
--- a/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
+++ b/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Service;
import demoapp.dom.types.Samples;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
@Service
public class /*${showcase-name}*/Samples implements Samples</*${showcase-type}*/> {
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc b/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc
index bc8bef6e80..56a77909b8 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.adoc
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm-description.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 [...]
+//#{generated-file-notice}
+
JAXB supports `#{showcase-type}` out-of-the-box, so no special annotations are required.
[source,java]
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm.java b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
index 681aff5424..8c427792e2 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
@@ -39,7 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.javautil.uuids.holder./*${showcase-name}*/Holder2;
-/*${before-class-declaration}*/
+/*${generated-file-notice}*/
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
index fe9ce77481..fb7f017a0c 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <!--${generated-file-notice}-->
+
<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 f62c28363e..3f349bf248 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
@@ -8,6 +8,8 @@ import java.util.Comparator;
import java.util.Objects;
import java.util.Set;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.isis.commons.collections.Can;
@@ -20,6 +22,7 @@ import org.apache.isis.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import lombok.SneakyThrows;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -27,41 +30,74 @@ import lombok.extern.log4j.Log4j2;
class ValueTypeGenTemplateTest {
@Test
- void test() throws IOException {
+ void testUuid() throws IOException {
+
+ val config = Config.builder()
+ .outputRootDir(outputDir("uuid"))
+ .showcaseName("JavaUtilUuid")
+ .javaPackage("demoapp.dom.types.javautil.uuids")
+ .showcaseValueType("java.util.UUID")
+ .showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.UUIDValueSemantics")
+ //.suppressGeneratedFileNotice(true)
+ .build();
+
+ testShowcase(config);
+ }
+
+ @Test @Disabled("WIP")
+ void testLong() throws IOException {
+
+ val config = Config.builder()
+ .outputRootDir(outputDir("wlong"))
+ .showcaseName("WrapperLong")
+ .javaPackage("demoapp.dom.types.javalang.longs")
+ .showcaseValueType("java.lang.Long")
+ .showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.LongValueSemantics")
+ .suppressGeneratedFileNotice(true)
+ .build();
+
+ testShowcase(config);
+ }
+
+
+ // -- HELPER
+
+ @SneakyThrows
+ void testShowcase(final ValueTypeGenTemplate.Config config) {
val frameWorkRoot = new File(".").getAbsoluteFile().getParentFile().getParentFile().getParentFile();
val demoDomainRoot = new File(frameWorkRoot, "examples/demo/domain/src/main/java");
- val uuidDemoDomain = new File(demoDomainRoot, "demoapp/dom/types/javautil/uuids");
+ val demoDomainShowCase = new File(demoDomainRoot, config.getJavaPackage().replace('.', '/'));
- // list UUID source files
- val uuidShowcaseFiles = _Files.searchFiles(uuidDemoDomain, _Predicates.alwaysTrue(), file->
+ // list reference source files
+ val refShowcaseFiles = _Files.searchFiles(demoDomainShowCase, _Predicates.alwaysTrue(), file->
file.getName().endsWith(".java")
|| file.getName().endsWith(".xml")
|| file.getName().endsWith(".adoc")
);
- val outputRootDir = _Files.tempDir("isis-tooling-showcases");
- //new File("D:/tmp/uuid");
- log.info("tmp dir created in {}", outputRootDir);
-
- val generator = new ValueTypeGenTemplate(Config.builder()
- .outputRootDir(outputRootDir)
- .showcaseName("JavaUtilUuid")
- .javaPackage("demoapp.dom.types.javautil.uuids")
- .showcaseValueType("java.util.UUID")
- .showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.UUIDValueSemantics")
- .suppressGeneratedFileNotice(true)
- .build());
+ val generator = new ValueTypeGenTemplate(config);
val generatedFiles = _Sets.<File>newLinkedHashSet();
generator.generate(generatedFiles::add);
- assertFileSetEquals(uuidShowcaseFiles, uuidDemoDomain, generatedFiles, outputRootDir);
- assertFileContentEquals(uuidShowcaseFiles, generatedFiles);
+ assertFileSetEquals(refShowcaseFiles, demoDomainShowCase, generatedFiles, config.getOutputRootDir());
+ assertFileContentEquals(refShowcaseFiles, generatedFiles);
}
- // -- HELPER
+ static File outputRootDir;
+
+ @BeforeAll
+ static void setup() {
+ outputRootDir = _Files.tempDir("isis-tooling-showcases");
+ //new File("D:/tmp");
+ log.info("tmp dir created in {}", outputRootDir);
+ }
+
+ private File outputDir(final String subfolder) {
+ return new File(outputRootDir, subfolder);
+ }
private void assertFileSetEquals(
final Set<File> setA, final File rootA,
@@ -85,9 +121,11 @@ class ValueTypeGenTemplateTest {
.zipMap(sortedB, (a, b)->{
var linesA = _Text.normalize(
- _Text.readLinesFromFile(a, StandardCharsets.UTF_8));
+ _Text.readLinesFromFile(a, StandardCharsets.UTF_8))
+ .map(this::normalizeForComparision);
var linesB = _Text.normalize(
- _Text.readLinesFromFile(b, StandardCharsets.UTF_8));
+ _Text.readLinesFromFile(b, StandardCharsets.UTF_8))
+ .map(this::normalizeForComparision);
return Objects.equals(linesA, linesB)
? null
@@ -103,6 +141,10 @@ class ValueTypeGenTemplateTest {
}
}
+ private String normalizeForComparision(final String line) {
+ return line.replace("java.lang.Long", "Long");
+ }
+
private String firstLineNotEqual(final Can<String> linesA, final Can<String> linesB) {
int lineIndex = 0;
for(val lineA : linesA) {