modgen v1.38.3

klee-contrib · Oct 23, 2023 · 7c432db · 7c432db
1 parent edfdc21
commit 7c432db
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # TopModel.Generator (`modgen`)
 
+## 1.38.3
+
+- [`edfdc21`](https://github.com/klee-contrib/topmodel/commit/edfdc211d0f714a866a2a2f172552ef73ebfab9b) - [JPA] Correction champs nulls nullables dans les mappers, associations réciproques mal générées
+- [`267f3e23`](https://github.com/klee-contrib/topmodel/commit/267f3e23b20ee41e02239ffae5d62235ac9a800c) - [JPA] Améliorations syntaxiques sur le code généré
+
 ## 1.38.2
 
 - [`405e85105`](https://github.com/klee-contrib/topmodel/commit/405e851054882d805d9100184a8e0688ab6801c8) - [JPA] datflows: récupérer les propriétés du parent dans le mapping

diff --git a/TopModel.Core/TopModel.Core.csproj b/TopModel.Core/TopModel.Core.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.38.2</Version>
+    <Version>1.38.3</Version>
     <Authors>JabX;gideruette</Authors>
     <Description>Librairie de modélisation TopModel.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/TopModel.Generator.Core/TopModel.Generator.Core.csproj b/TopModel.Generator.Core/TopModel.Generator.Core.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.38.2</Version>
+    <Version>1.38.3</Version>
     <Authors>JabX;gideruette</Authors>
     <Description>Librarie de base pour écrire un générateur TopModel.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/TopModel.Generator.Jpa/JpaMapperGenerator.cs b/TopModel.Generator.Jpa/JpaMapperGenerator.cs
@@ -356,6 +356,7 @@ private void WriteFromMapper(Class classe, FromMapper mapper, JavaWriter fw, str
 
     private void WriteToMapper(Class classe, ClassMappings mapper, JavaWriter fw, string tag)
     {
+        fw.WriteLine();
         fw.WriteDocStart(1, $"Mappe '{classe}' vers '{mapper.Class.NamePascal}'");
         if (mapper.Comment != null)
         {

diff --git a/TopModel.Generator/TopModel.Generator.csproj b/TopModel.Generator/TopModel.Generator.csproj
@@ -13,7 +13,7 @@
     <PackAsTool>true</PackAsTool>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
     <ToolCommandName>modgen</ToolCommandName>
-    <Version>1.38.2</Version>
+    <Version>1.38.3</Version>
     <Authors>JabX;gideruette</Authors>
     <Description>Générateur de modèle TopModel.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/TopModel.Utils/TopModel.Utils.csproj b/TopModel.Utils/TopModel.Utils.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.38.2</Version>
+    <Version>1.38.3</Version>
     <Authors>JabX;gideruette</Authors>
     <Description>Utilitaires TopModel.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -1,6 +1,6 @@
 ![logo](./media/IconDark.svg)
 
-# TopModel <small>1.38.2</small>
+# TopModel <small>1.38.3</small>
 
 > Modélisez en toute simplicité.
 

diff --git a/...main/javagen/topmodel/jpa/sample/demo/entities/securite/profil/SecuriteProfilMappers.java b/...main/javagen/topmodel/jpa/sample/demo/entities/securite/profil/SecuriteProfilMappers.java
@@ -34,6 +34,7 @@ public static ProfilRead createProfilRead(Profil profil, ProfilRead target) {
 		if (profil == null) {
 			throw new IllegalArgumentException("profil cannot be null");
 		}
+
 		target.setId(profil.getId());
 		target.setLibelle(profil.getLibelle());
 		if (profil.getDroits() != null) {

diff --git a/...en/topmodel/jpa/sample/demo/entities/securite/utilisateur/SecuriteUtilisateurMappers.java b/...en/topmodel/jpa/sample/demo/entities/securite/utilisateur/SecuriteUtilisateurMappers.java
@@ -31,6 +31,7 @@ public static UtilisateurRead createUtilisateurRead(Utilisateur utilisateur, Uti
 		if (utilisateur == null) {
 			throw new IllegalArgumentException("utilisateur cannot be null");
 		}
+
 		target.setId(utilisateur.getId());
 		target.setNom(utilisateur.getNom());
 		target.setPrenom(utilisateur.getPrenom());

diff --git a/samples/model/angular.topmodel.lock b/samples/model/angular.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.2
+version: 1.38.3
 generatedFiles:
   - ../generators/angular/src/appgenerated/api/securite/profil/profil.ts
   - ../generators/angular/src/appgenerated/api/securite/utilisateur/utilisateur.ts

diff --git a/samples/model/csharp.topmodel.lock b/samples/model/csharp.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.2
+version: 1.38.3
 generatedFiles:
   - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.comments.cs
   - ../generators/csharp/src/Clients/CSharp.Clients.Db/generated/CSharpDbContext.cs

diff --git a/samples/model/focus.topmodel.lock b/samples/model/focus.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.2
+version: 1.38.3
 generatedFiles:
   - ../generators/focus/src/locale/common.ts
   - ../generators/focus/src/locale/securite.ts

diff --git a/samples/model/jpa.topmodel.lock b/samples/model/jpa.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.2
+version: 1.38.3
 generatedFiles:
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/profil/AbstractProfilClient.java
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/utilisateur/AbstractUtilisateurClient.java

diff --git a/samples/model/pg.topmodel.lock b/samples/model/pg.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.2
+version: 1.38.3
 generatedFiles:
   - ../generators/pg/src/01_tables.sql
   - ../generators/pg/src/02_fk_indexes.sql

diff --git a/samples/model/php.topmodel.lock b/samples/model/php.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.0
+version: 1.38.3
 generatedFiles:
   - ../generators/php/src/Entity/Securite/Profil/Droit.php
   - ../generators/php/src/Entity/Securite/Profil/Profil.php

diff --git a/samples/model/ssdt.topmodel.lock b/samples/model/ssdt.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.0
+version: 1.38.3
 generatedFiles:
   - ../generators/ssdt/src/init/DROIT.insert.sql
   - ../generators/ssdt/src/init/main.sql

diff --git a/samples/model/translation.topmodel.lock b/samples/model/translation.topmodel.lock
@@ -2,7 +2,7 @@
 # ATTENTION CE FICHIER EST GENERE AUTOMATIQUEMENT !
 #
 
-version: 1.38.0
+version: 1.38.3
 generatedFiles:
   - ../generators/translation/i18n/de_DE/out/common_de_DE.properties
   - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties