modgen v1.52.2

klee-contrib · Aug 29, 2024 · e640c25 · e640c25
1 parent e47edb3
commit e640c25
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # TopModel.Generator (`modgen`)
 
+## 1.52.2
+
+- HotFix sur [`#382`](https://github.com/klee-contrib/topmodel/issue/382)
+
 ## 1.52.1
 
 - [`#381`](https://github.com/klee-contrib/topmodel/issue/381) - [JAVA] SonarQube règles java:S2057 and java:S2162

diff --git a/TopModel.Core/TopModel.Core.csproj b/TopModel.Core/TopModel.Core.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.52.1</Version>
+    <Version>1.52.2</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Librairie de modélisation TopModel.</Description>

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.52.1</Version>
+    <Version>1.52.2</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Librarie de base pour écrire un générateur TopModel.</Description>

diff --git a/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs b/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs
@@ -83,7 +83,7 @@ public void WriteCompositePrimaryKeyClass(JavaWriter fw, Class classe, string ta
         fw.WriteLine();
         fw.WriteLine(2, "@Override");
         fw.WriteLine(2, "public int hashCode() {");
-        fw.WriteLine(3, $"return Objects.hash({string.Join(", ", classe.PrimaryKey.Select(pk => $"{pk.NameByClassCamel}{GetterToCompareCompositePkPk(pk)}"))});");
+        fw.WriteLine(3, $"return Objects.hash({string.Join(", ", classe.PrimaryKey.Select(pk => $"{(pk is AssociationProperty || pk is AliasProperty ap && ap.Property is AssociationProperty ? $"{pk.NameByClassCamel}== null ? null : " : string.Empty)} {pk.NameByClassCamel}{GetterToCompareCompositePkPk(pk)}"))});");
         fw.AddImport("java.util.Objects");
         fw.WriteLine(2, "}");
         fw.WriteLine(1, "}");

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.52.1</Version>
+    <Version>1.52.2</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Générateur de modèle TopModel.</Description>

diff --git a/TopModel.Utils/TopModel.Utils.csproj b/TopModel.Utils/TopModel.Utils.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.52.1</Version>
+    <Version>1.52.2</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Utilitaires TopModel.</Description>

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

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.52.1
+version: 1.52.2
 generatedFiles:
   - ../generators/angular/src/appgenerated/api/securite/profil/profil.service.ts
   - ../generators/angular/src/appgenerated/api/securite/utilisateur/utilisateur.service.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.52.1
+version: 1.52.2
 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.52.1
+version: 1.52.2
 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.52.1
+version: 1.52.2
 generatedFiles:
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/profil/ProfilClient.java
   - ../generators/jpa/src/main/javagen/topmodel/jpa/sample/demo/api/client/securite/utilisateur/UtilisateurClient.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.52.1
+version: 1.52.2
 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.52.1
+version: 1.52.2
 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.52.1
+version: 1.52.2
 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.52.1
+version: 1.52.2
 generatedFiles:
   - ../generators/translation/i18n/de_DE/out/common_de_DE.properties
   - ../generators/translation/i18n/de_DE/out/securite_de_DE.properties