update to latest versions

DominoKit · Jun 13, 2021 · 93436ef · 93436ef
1 parent 1205cff
commit 93436ef
Show file tree

Hide file tree

Showing 72 changed files with 2,882 additions and 138 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'maven'
 apply plugin: "com.install4j.gradle"
 
 group = 'org.dominokit'
-version = '1.0.0-RC1'
+version = '1.0.0-RC4'
 
 description = "Domino CLI"
 
@@ -36,8 +36,8 @@ dependencies {
     // https://mvnrepository.com/artifact/org.apache.velocity/velocity-tools
     compile group: 'org.apache.velocity', name: 'velocity-tools', version: '2.0'
 
-    implementation group: 'org.dominokit', name: 'domino-jackson', version: '1.0.0-RC2'
-    annotationProcessor group: 'org.dominokit', name: 'domino-jackson-processor', version: '1.0.0-RC2'
+    implementation group: 'org.dominokit', name: 'domino-jackson', version: '1.0.0-RC3'
+    annotationProcessor group: 'org.dominokit', name: 'domino-jackson-processor', version: '1.0.0-RC3'
 
     // https://mvnrepository.com/artifact/org.apache.maven/maven-model-builder
     compile group: 'org.apache.maven', name: 'maven-model-builder', version: '3.6.1'

diff --git a/domino-cli.install4j b/domino-cli.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="8.0.1" transformSequenceNumber="8">
   <directoryPresets config="build/libs/domino-cli-fat.jar" />
-  <application name="dominokit-cli" applicationId="0518-2014-5243-3779" mediaDir="build/install4j" shortName="dominokit-cli" publisher="Dominokit" publisherWeb="www.dominokit.org" version="1.0.0-RC1" macVolumeId="6cb917d1c585346b" javaMinVersion="1.8.0" jdkMode="jdk" jdkName="JDK 1.8" />
+  <application name="dominokit-cli" applicationId="0518-2014-5243-3779" mediaDir="build/install4j" shortName="dominokit-cli" publisher="Dominokit" publisherWeb="www.dominokit.org" version="1.0.0-RC4" macVolumeId="6cb917d1c585346b" javaMinVersion="1.8.0" jdkMode="jdk" jdkName="JDK 1.8" />
   <files>
     <mountPoints>
       <mountPoint id="60" />

diff --git a/src/main/generated/org/dominokit/cli/model/ProjectBeanJsonDeserializerImpl.java b/src/main/generated/org/dominokit/cli/model/ProjectBeanJsonDeserializerImpl.java
@@ -6,24 +6,30 @@
 import java.lang.Override;
 import java.lang.String;
 import java.util.Map;
-import org.dominokit.jacksonapt.JacksonContextProvider;
-import org.dominokit.jacksonapt.JsonDeserializationContext;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonDeserializerParameters;
-import org.dominokit.jacksonapt.deser.BooleanJsonDeserializer;
-import org.dominokit.jacksonapt.deser.StringJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.AbstractBeanJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.BeanPropertyDeserializer;
-import org.dominokit.jacksonapt.deser.bean.HasDeserializerAndParameters;
-import org.dominokit.jacksonapt.deser.bean.Instance;
-import org.dominokit.jacksonapt.deser.bean.InstanceBuilder;
-import org.dominokit.jacksonapt.deser.bean.MapLike;
-import org.dominokit.jacksonapt.stream.JsonReader;
+import org.dominokit.jackson.JacksonContextProvider;
+import org.dominokit.jackson.JsonDeserializationContext;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonDeserializerParameters;
+import org.dominokit.jackson.deser.BooleanJsonDeserializer;
+import org.dominokit.jackson.deser.StringJsonDeserializer;
+import org.dominokit.jackson.deser.bean.AbstractBeanJsonDeserializer;
+import org.dominokit.jackson.deser.bean.BeanPropertyDeserializer;
+import org.dominokit.jackson.deser.bean.HasDeserializerAndParameters;
+import org.dominokit.jackson.deser.bean.Instance;
+import org.dominokit.jackson.deser.bean.InstanceBuilder;
+import org.dominokit.jackson.deser.bean.MapLike;
+import org.dominokit.jackson.stream.JsonReader;
 
 public final class ProjectBeanJsonDeserializerImpl extends AbstractBeanJsonDeserializer<Project> {
+  private static final ProjectBeanJsonDeserializerImpl INSTANCE = new ProjectBeanJsonDeserializerImpl();
+
   public ProjectBeanJsonDeserializerImpl() {
   }
 
+  public static ProjectBeanJsonDeserializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getDeserializedType() {
     return Project.class;

diff --git a/src/main/generated/org/dominokit/cli/model/ProjectBeanJsonSerializerImpl.java b/src/main/generated/org/dominokit/cli/model/ProjectBeanJsonSerializerImpl.java
@@ -4,17 +4,23 @@
 import java.lang.Class;
 import java.lang.Override;
 import java.lang.String;
-import org.dominokit.jacksonapt.JsonSerializationContext;
-import org.dominokit.jacksonapt.JsonSerializer;
-import org.dominokit.jacksonapt.ser.BooleanJsonSerializer;
-import org.dominokit.jacksonapt.ser.StringJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.AbstractBeanJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.BeanPropertySerializer;
+import org.dominokit.jackson.JsonSerializationContext;
+import org.dominokit.jackson.JsonSerializer;
+import org.dominokit.jackson.ser.BooleanJsonSerializer;
+import org.dominokit.jackson.ser.StringJsonSerializer;
+import org.dominokit.jackson.ser.bean.AbstractBeanJsonSerializer;
+import org.dominokit.jackson.ser.bean.BeanPropertySerializer;
 
 public final class ProjectBeanJsonSerializerImpl extends AbstractBeanJsonSerializer<Project> {
+  private static final ProjectBeanJsonSerializerImpl INSTANCE = new ProjectBeanJsonSerializerImpl();
+
   public ProjectBeanJsonSerializerImpl() {
   }
 
+  public static ProjectBeanJsonSerializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getSerializedType() {
     return Project.class;

diff --git a/src/main/generated/org/dominokit/cli/model/Project_MapperImpl.java b/src/main/generated/org/dominokit/cli/model/Project_MapperImpl.java
@@ -1,9 +1,9 @@
 package org.dominokit.cli.model;
 
 import java.lang.Override;
-import org.dominokit.jacksonapt.AbstractObjectMapper;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonSerializer;
+import org.dominokit.jackson.AbstractObjectMapper;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonSerializer;
 
 public final class Project_MapperImpl extends AbstractObjectMapper<Project> {
   public static final Project_MapperImpl INSTANCE = new Project_MapperImpl();
@@ -14,11 +14,11 @@ public Project_MapperImpl() {
 
   @Override
   protected JsonDeserializer<Project> newDeserializer() {
-    return new ProjectBeanJsonDeserializerImpl();
+    return ProjectBeanJsonDeserializerImpl.getInstance();
   }
 
   @Override
   protected JsonSerializer<?> newSerializer() {
-    return new ProjectBeanJsonSerializerImpl();
+    return ProjectBeanJsonSerializerImpl.getInstance();
   }
 }
diff --git a/...ain/generated/org/dominokit/cli/structure/files/TemplateFileBeanJsonDeserializerImpl.java b/...ain/generated/org/dominokit/cli/structure/files/TemplateFileBeanJsonDeserializerImpl.java
@@ -5,24 +5,30 @@
 import java.lang.Override;
 import java.lang.String;
 import java.util.Map;
-import org.dominokit.jacksonapt.JacksonContextProvider;
-import org.dominokit.jacksonapt.JsonDeserializationContext;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonDeserializerParameters;
-import org.dominokit.jacksonapt.deser.EnumJsonDeserializer;
-import org.dominokit.jacksonapt.deser.StringJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.AbstractBeanJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.BeanPropertyDeserializer;
-import org.dominokit.jacksonapt.deser.bean.HasDeserializerAndParameters;
-import org.dominokit.jacksonapt.deser.bean.Instance;
-import org.dominokit.jacksonapt.deser.bean.InstanceBuilder;
-import org.dominokit.jacksonapt.deser.bean.MapLike;
-import org.dominokit.jacksonapt.stream.JsonReader;
+import org.dominokit.jackson.JacksonContextProvider;
+import org.dominokit.jackson.JsonDeserializationContext;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonDeserializerParameters;
+import org.dominokit.jackson.deser.EnumJsonDeserializer;
+import org.dominokit.jackson.deser.StringJsonDeserializer;
+import org.dominokit.jackson.deser.bean.AbstractBeanJsonDeserializer;
+import org.dominokit.jackson.deser.bean.BeanPropertyDeserializer;
+import org.dominokit.jackson.deser.bean.HasDeserializerAndParameters;
+import org.dominokit.jackson.deser.bean.Instance;
+import org.dominokit.jackson.deser.bean.InstanceBuilder;
+import org.dominokit.jackson.deser.bean.MapLike;
+import org.dominokit.jackson.stream.JsonReader;
 
 public final class TemplateFileBeanJsonDeserializerImpl extends AbstractBeanJsonDeserializer<TemplateFile> {
+  private static final TemplateFileBeanJsonDeserializerImpl INSTANCE = new TemplateFileBeanJsonDeserializerImpl();
+
   public TemplateFileBeanJsonDeserializerImpl() {
   }
 
+  public static TemplateFileBeanJsonDeserializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getDeserializedType() {
     return TemplateFile.class;

diff --git a/src/main/generated/org/dominokit/cli/structure/files/TemplateFileBeanJsonSerializerImpl.java b/src/main/generated/org/dominokit/cli/structure/files/TemplateFileBeanJsonSerializerImpl.java
@@ -3,17 +3,23 @@
 import java.lang.Class;
 import java.lang.Override;
 import java.lang.String;
-import org.dominokit.jacksonapt.JsonSerializationContext;
-import org.dominokit.jacksonapt.JsonSerializer;
-import org.dominokit.jacksonapt.ser.EnumJsonSerializer;
-import org.dominokit.jacksonapt.ser.StringJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.AbstractBeanJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.BeanPropertySerializer;
+import org.dominokit.jackson.JsonSerializationContext;
+import org.dominokit.jackson.JsonSerializer;
+import org.dominokit.jackson.ser.EnumJsonSerializer;
+import org.dominokit.jackson.ser.StringJsonSerializer;
+import org.dominokit.jackson.ser.bean.AbstractBeanJsonSerializer;
+import org.dominokit.jackson.ser.bean.BeanPropertySerializer;
 
 public final class TemplateFileBeanJsonSerializerImpl extends AbstractBeanJsonSerializer<TemplateFile> {
+  private static final TemplateFileBeanJsonSerializerImpl INSTANCE = new TemplateFileBeanJsonSerializerImpl();
+
   public TemplateFileBeanJsonSerializerImpl() {
   }
 
+  public static TemplateFileBeanJsonSerializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getSerializedType() {
     return TemplateFile.class;

diff --git a/src/main/generated/org/dominokit/cli/structure/files/TemplateFile_MapperImpl.java b/src/main/generated/org/dominokit/cli/structure/files/TemplateFile_MapperImpl.java
@@ -1,9 +1,9 @@
 package org.dominokit.cli.structure.files;
 
 import java.lang.Override;
-import org.dominokit.jacksonapt.AbstractObjectMapper;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonSerializer;
+import org.dominokit.jackson.AbstractObjectMapper;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonSerializer;
 
 public final class TemplateFile_MapperImpl extends AbstractObjectMapper<TemplateFile> {
   public static final TemplateFile_MapperImpl INSTANCE = new TemplateFile_MapperImpl();
@@ -14,11 +14,11 @@ public TemplateFile_MapperImpl() {
 
   @Override
   protected JsonDeserializer<TemplateFile> newDeserializer() {
-    return new TemplateFileBeanJsonDeserializerImpl();
+    return TemplateFileBeanJsonDeserializerImpl.getInstance();
   }
 
   @Override
   protected JsonSerializer<?> newSerializer() {
-    return new TemplateFileBeanJsonSerializerImpl();
+    return TemplateFileBeanJsonSerializerImpl.getInstance();
   }
 }
diff --git a/src/main/generated/org/dominokit/cli/structure/folders/FolderBeanJsonDeserializerImpl.java b/src/main/generated/org/dominokit/cli/structure/folders/FolderBeanJsonDeserializerImpl.java
@@ -8,24 +8,30 @@
 import java.util.Map;
 import org.dominokit.cli.structure.files.TemplateFile;
 import org.dominokit.cli.structure.files.TemplateFileBeanJsonDeserializerImpl;
-import org.dominokit.jacksonapt.JacksonContextProvider;
-import org.dominokit.jacksonapt.JsonDeserializationContext;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonDeserializerParameters;
-import org.dominokit.jacksonapt.deser.StringJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.AbstractBeanJsonDeserializer;
-import org.dominokit.jacksonapt.deser.bean.BeanPropertyDeserializer;
-import org.dominokit.jacksonapt.deser.bean.HasDeserializerAndParameters;
-import org.dominokit.jacksonapt.deser.bean.Instance;
-import org.dominokit.jacksonapt.deser.bean.InstanceBuilder;
-import org.dominokit.jacksonapt.deser.bean.MapLike;
-import org.dominokit.jacksonapt.deser.collection.ListJsonDeserializer;
-import org.dominokit.jacksonapt.stream.JsonReader;
+import org.dominokit.jackson.JacksonContextProvider;
+import org.dominokit.jackson.JsonDeserializationContext;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonDeserializerParameters;
+import org.dominokit.jackson.deser.StringJsonDeserializer;
+import org.dominokit.jackson.deser.bean.AbstractBeanJsonDeserializer;
+import org.dominokit.jackson.deser.bean.BeanPropertyDeserializer;
+import org.dominokit.jackson.deser.bean.HasDeserializerAndParameters;
+import org.dominokit.jackson.deser.bean.Instance;
+import org.dominokit.jackson.deser.bean.InstanceBuilder;
+import org.dominokit.jackson.deser.bean.MapLike;
+import org.dominokit.jackson.deser.collection.ListJsonDeserializer;
+import org.dominokit.jackson.stream.JsonReader;
 
 public final class FolderBeanJsonDeserializerImpl extends AbstractBeanJsonDeserializer<Folder> {
+  private static final FolderBeanJsonDeserializerImpl INSTANCE = new FolderBeanJsonDeserializerImpl();
+
   public FolderBeanJsonDeserializerImpl() {
   }
 
+  public static FolderBeanJsonDeserializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getDeserializedType() {
     return Folder.class;

diff --git a/src/main/generated/org/dominokit/cli/structure/folders/FolderBeanJsonSerializerImpl.java b/src/main/generated/org/dominokit/cli/structure/folders/FolderBeanJsonSerializerImpl.java
@@ -6,17 +6,23 @@
 import java.util.List;
 import org.dominokit.cli.structure.files.TemplateFile;
 import org.dominokit.cli.structure.files.TemplateFileBeanJsonSerializerImpl;
-import org.dominokit.jacksonapt.JsonSerializationContext;
-import org.dominokit.jacksonapt.JsonSerializer;
-import org.dominokit.jacksonapt.ser.CollectionJsonSerializer;
-import org.dominokit.jacksonapt.ser.StringJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.AbstractBeanJsonSerializer;
-import org.dominokit.jacksonapt.ser.bean.BeanPropertySerializer;
+import org.dominokit.jackson.JsonSerializationContext;
+import org.dominokit.jackson.JsonSerializer;
+import org.dominokit.jackson.ser.CollectionJsonSerializer;
+import org.dominokit.jackson.ser.StringJsonSerializer;
+import org.dominokit.jackson.ser.bean.AbstractBeanJsonSerializer;
+import org.dominokit.jackson.ser.bean.BeanPropertySerializer;
 
 public final class FolderBeanJsonSerializerImpl extends AbstractBeanJsonSerializer<Folder> {
+  private static final FolderBeanJsonSerializerImpl INSTANCE = new FolderBeanJsonSerializerImpl();
+
   public FolderBeanJsonSerializerImpl() {
   }
 
+  public static FolderBeanJsonSerializerImpl getInstance() {
+    return INSTANCE;
+  }
+
   @Override
   public Class getSerializedType() {
     return Folder.class;

diff --git a/src/main/generated/org/dominokit/cli/structure/folders/Folder_MapperImpl.java b/src/main/generated/org/dominokit/cli/structure/folders/Folder_MapperImpl.java
@@ -1,9 +1,9 @@
 package org.dominokit.cli.structure.folders;
 
 import java.lang.Override;
-import org.dominokit.jacksonapt.AbstractObjectMapper;
-import org.dominokit.jacksonapt.JsonDeserializer;
-import org.dominokit.jacksonapt.JsonSerializer;
+import org.dominokit.jackson.AbstractObjectMapper;
+import org.dominokit.jackson.JsonDeserializer;
+import org.dominokit.jackson.JsonSerializer;
 
 public final class Folder_MapperImpl extends AbstractObjectMapper<Folder> {
   public static final Folder_MapperImpl INSTANCE = new Folder_MapperImpl();
@@ -14,11 +14,11 @@ public Folder_MapperImpl() {
 
   @Override
   protected JsonDeserializer<Folder> newDeserializer() {
-    return new FolderBeanJsonDeserializerImpl();
+    return FolderBeanJsonDeserializerImpl.getInstance();
   }
 
   @Override
   protected JsonSerializer<?> newSerializer() {
-    return new FolderBeanJsonSerializerImpl();
+    return FolderBeanJsonSerializerImpl.getInstance();
   }
 }
diff --git a/src/main/java/org/dominokit/cli/commands/CLIConfig.java b/src/main/java/org/dominokit/cli/commands/CLIConfig.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 public class CLIConfig {
-
-    public static final List<String> RESOURCE_EXTENSIONS = Arrays.asList("ico", "png", "jpg");
+    public static final List<String> RESOURCE_EXTENSIONS = Arrays.asList("ico", "png", "jpg", "jar");
+    public static final List<String> RESOURCE_NAMES = Arrays.asList("mvnw");
+    public static final List<String> EXECUTABLE_NAMES = Arrays.asList("run");
 }
diff --git a/src/main/java/org/dominokit/cli/commands/GenerateAppCommand.java b/src/main/java/org/dominokit/cli/commands/GenerateAppCommand.java
@@ -5,6 +5,7 @@
 import org.dominokit.cli.PomUtil;
 import org.dominokit.cli.model.Project;
 import org.dominokit.cli.structure.files.VelocityContentProcessor;
+import org.dominokit.cli.structure.files.VelocityStringContentProcessor;
 import org.dominokit.cli.structure.folders.Folder;
 import org.dominokit.cli.structure.folders.Folder_MapperImpl;
 
@@ -100,7 +101,7 @@ public void run() {
 
         try {
 
-            String projectTemplateConfig = new VelocityContentProcessor(getTemplateByType(j2cl, type), project)
+            String projectTemplateConfig = new VelocityStringContentProcessor(getTemplateByType(j2cl, type), project)
                     .processedContent();
             Folder folder = Folder_MapperImpl.INSTANCE
                     .read(projectTemplateConfig);

diff --git a/src/main/java/org/dominokit/cli/commands/TemplateConfig.java b/src/main/java/org/dominokit/cli/commands/TemplateConfig.java
@@ -11,10 +11,12 @@ public class TemplateConfig {
     private Path templateRoot;
     private Path resourcesRoot = Paths.get("src/main/resources");
     private final List<String> resourcesExtensions;
+    private final List<String> resourcesNames;
     private Map<String, String> conditions = new HashMap<>();
 
     public TemplateConfig(String name, Path templateRoot) throws IOException {
         resourcesExtensions = CLIConfig.RESOURCE_EXTENSIONS;
+        resourcesNames = CLIConfig.RESOURCE_NAMES;
         this.templateRoot = templateRoot;
         this.name = name;
     }
@@ -39,6 +41,10 @@ public List<String> getResourcesExtensions() {
         return resourcesExtensions;
     }
 
+    public List<String> getResourcesNames() {
+        return resourcesNames;
+    }
+
     public Map<String, String> getConditions() {
         return conditions;
     }