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 86efa160a5 ISIS-3123: template fixes
86efa160a5 is described below
commit 86efa160a5522c6ebbb694bf2fa492dffd90e7a3
Author: andi-huber <[email protected]>
AuthorDate: Wed Aug 17 07:39:14 2022 +0200
ISIS-3123: template fixes
---
.../tooling/metaprog/demoshowcases/value/ValueTypeGenTemplate.java | 2 +-
tooling/metaprog/src/main/resources/$Templates.java | 4 ++--
tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java | 2 +-
tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java | 2 +-
tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java | 2 +-
tooling/metaprog/src/main/resources/samples/$TemplateSamples.java | 2 +-
tooling/metaprog/src/main/resources/vm/$TemplateVm.java | 2 +-
.../metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java | 5 +----
8 files changed, 9 insertions(+), 12 deletions(-)
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 2c32416a36..024e7b4767 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
@@ -46,7 +46,6 @@ public class ValueTypeGenTemplate {
final String showcaseValueType;
final String showcaseValueSemantics;
final String javaPackage;
- final boolean suppressGeneratedFileNotice;
@Builder.Default
final String fileNamePlaceholderForShowcaseName = "$Template";
@Builder.Default
@@ -169,6 +168,7 @@ public class ValueTypeGenTemplate {
templateVars.put("java-package", source.javaPackage(config));
templateVars.put("showcase-name", config.showcaseName);
templateVars.put("showcase-type", config.showcaseValueType);
+ templateVars.put("showcase-java-package", config.javaPackage);
templateVars.put("showcase-value-semantics-provider",
config.showcaseValueSemantics);
templateVars.put("generated-file-notice",
source.generator.formatAsComment(config.generatedFileNotice));
diff --git a/tooling/metaprog/src/main/resources/$Templates.java
b/tooling/metaprog/src/main/resources/$Templates.java
index e043eea985..6deee437a4 100644
--- a/tooling/metaprog/src/main/resources/$Templates.java
+++ b/tooling/metaprog/src/main/resources/$Templates.java
@@ -42,8 +42,8 @@ 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.javautil.uuids.persistence./*${showcase-name}*/Entity;
-import demoapp.dom.types.javautil.uuids.vm./*${showcase-name}*/Vm;
+import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
+import /*${showcase-java-package}*/.vm./*${showcase-name}*/Vm;
/*${generated-file-notice}*/
@XmlRootElement(name = "Demo")
diff --git a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
index 15950562d0..b358fa6a12 100644
--- a/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
+++ b/tooling/metaprog/src/main/resources/jdo/$TemplateJdo.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.javautil.uuids.persistence./*${showcase-name}*/Entity;
+import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
/*${generated-file-notice}*/
@Profile("demo-jdo")
diff --git a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
index 2aff57f771..9662565540 100644
--- a/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
+++ b/tooling/metaprog/src/main/resources/jpa/$TemplateJpa.java
@@ -40,7 +40,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.javautil.uuids.persistence./*${showcase-name}*/Entity;
+import /*${showcase-java-package}*/.persistence./*${showcase-name}*/Entity;
/*${generated-file-notice}*/
@Profile("demo-jpa")
diff --git
a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
index 7544b38320..fe10031c76 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.javautil.uuids.holder./*${showcase-name}*/Holder2;
+import /*${showcase-java-package}*/.holder./*${showcase-name}*/Holder2;
/*${generated-file-notice}*/
@Named("demo./*${showcase-name}*/Entity") // shared permissions with concrete
sub class
diff --git a/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
b/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
index 6241b4771e..464e59f423 100644
--- a/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
+++ b/tooling/metaprog/src/main/resources/samples/$TemplateSamples.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.javautil.uuids.samples;
+package /*${java-package}*/;
import java.util.stream.Stream;
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
index 8c427792e2..04334e2838 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.java
@@ -37,7 +37,7 @@ import lombok.Getter;
import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javautil.uuids.holder./*${showcase-name}*/Holder2;
+import /*${showcase-java-package}*/.holder./*${showcase-name}*/Holder2;
/*${generated-file-notice}*/
//tag::class[]
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 3f349bf248..cbe5f33048 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
@@ -9,7 +9,6 @@ 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;
@@ -38,13 +37,12 @@ class ValueTypeGenTemplateTest {
.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")
+ @Test //@Disabled("WIP")
void testLong() throws IOException {
val config = Config.builder()
@@ -53,7 +51,6 @@ class ValueTypeGenTemplateTest {
.javaPackage("demoapp.dom.types.javalang.longs")
.showcaseValueType("java.lang.Long")
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.LongValueSemantics")
- .suppressGeneratedFileNotice(true)
.build();
testShowcase(config);
