Merge pull request #303 from klee-contrib/data-flows-hooks

[Jpa] dataflows on y est presque
klee-contrib · Sep 20, 2023 · 0fc0f1e · 0fc0f1e
2 parents 72b5840 + d3f3a42
commit 0fc0f1e
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 162 deletions.
diff --git a/TopModel.Core/Loaders/DataFlowLoader.cs b/TopModel.Core/Loaders/DataFlowLoader.cs
@@ -46,11 +46,11 @@ public DataFlow Load(Parser parser)
                         FlowHook? hook = null;
                         switch (value)
                         {
-                            case "beforeFLow": hook = FlowHook.BeforeFlow; break;
+                            case "beforeFlow": hook = FlowHook.BeforeFlow; break;
                             case "afterSource": hook = FlowHook.AfterSource; break;
                             case "map": hook = FlowHook.Map; break;
                             case "beforeTarget": hook = FlowHook.BeforeTarget; break;
-                            case "afterFLow": hook = FlowHook.AfterFlow; break;
+                            case "afterFlow": hook = FlowHook.AfterFlow; break;
                         }
 
                         if (hook != null)

diff --git a/TopModel.Generator.Jpa/JpaConfig.cs b/TopModel.Generator.Jpa/JpaConfig.cs
@@ -107,7 +107,7 @@ public class JpaConfig : GeneratorConfigBase
     /// <summary>
     /// Listeners à ajouter aux dataflows
     /// </summary>
-    public List<string> DataFlowsListeners { get; set; } = new ();
+    public List<string> DataFlowsListeners { get; set; } = new();
 
     public override string[] PropertiesWithLangVariableSupport => new[]
     {
@@ -172,6 +172,14 @@ public string GetDataFlowFilePath(DataFlow df, string tag)
             $"{df.Name.ToPascalCase()}Flow.java");
     }
 
+    public string GetDataFlowPartialFilePath(DataFlow df, string tag)
+    {
+        return Path.Combine(
+            OutputDirectory,
+            ResolveVariables(DataFlowsPath!, tag: tag, module: df.ModelFile.Namespace.ModulePath).ToFilePath(),
+            $"{df.Name.ToPascalCase()}PartialFlow.java");
+    }
+
     public string GetEnumFileName(Class classe, string tag)
     {
         return Path.Combine(

diff --git a/TopModel.Generator.Jpa/JpaModelGenerator.cs b/TopModel.Generator.Jpa/JpaModelGenerator.cs
@@ -202,24 +202,13 @@ private void WriteAnnotations(JavaWriter fw, Class classe, string tag)
         {
             if (Config.UseJdbc)
             {
-                var table = @$"@Table(name = ""{classe.SqlName}""";
-                if (Config.ResolveVariables(Config.DbSchema!, tag: tag) != null)
-                {
-                    table += @$", schema = ""{Config.ResolveVariables(Config.DbSchema!, tag: tag)}""";
-                }
-
-                table += ")";
+                var table = @$"@Table(name = ""{classe.SqlName.ToLower()}"")";
                 fw.AddImport($"org.springframework.data.relational.core.mapping.Table");
                 fw.WriteLine(table);
             }
             else
             {
                 var table = @$"@Table(name = ""{classe.SqlName}""";
-                if (Config.DbSchema != null && Config.ResolveVariables(Config.DbSchema, tag: tag) != null)
-                {
-                    table += @$", schema = ""{Config.ResolveVariables(Config.DbSchema, tag: tag)}""";
-                }
-
                 fw.AddImport($"{javaOrJakarta}.persistence.Table");
                 if (classe.UniqueKeys.Any())
                 {

diff --git a/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs b/TopModel.Generator.Jpa/JpaModelPropertyGenerator.cs
@@ -264,7 +264,7 @@ private void WriteProperty(JavaWriter fw, Class classe, IFieldProperty property,
             fw.WriteLine(1, "@Id");
         }
 
-        if (classe.IsPersistent && !_config.GetImplementation(property.Domain)!.Annotations
+        if ((classe.IsPersistent || _config.UseJdbc) && !_config.GetImplementation(property.Domain)!.Annotations
         .Where(i =>
                 classe.IsPersistent && (Target.Persisted & i.Target) > 0
             || !classe.IsPersistent && (Target.Dto & i.Target) > 0)
@@ -298,12 +298,13 @@ private void WriteProperty(JavaWriter fw, Class classe, IFieldProperty property,
             else
             {
                 fw.AddImport("org.springframework.data.relational.core.mapping.Column");
-                column = $@"@Column(""{property.SqlName}"")";
+                column = $@"@Column(""{property.SqlName.ToLower()}"")";
             }
 
             fw.WriteLine(1, column);
         }
-        else if (property.Required && !property.PrimaryKey && !classe.IsPersistent)
+
+        if (property.Required && !property.PrimaryKey && (!classe.IsPersistent || _config.UseJdbc))
         {
             fw.WriteLine(1, @$"@NotNull");
             fw.AddImport($"{javaOrJakarta}.validation.constraints.NotNull");

diff --git a/TopModel.Generator.Jpa/SpringClientApiGenerator.cs b/TopModel.Generator.Jpa/SpringClientApiGenerator.cs
@@ -279,7 +279,16 @@ private void WriteUriBuilderMethod(JavaWriter fw, Endpoint endpoint)
                 indentLevel++;
             }
 
-            fw.WriteLine(indentLevel, @$"uriBuilder.queryParam(""{p.GetParamName()}"", {p.GetParamName()});");
+            if (Config.GetType(p).StartsWith("List"))
+            {
+                fw.AddImport("java.util.stream.Collectors");
+                fw.WriteLine(indentLevel, @$"uriBuilder.queryParam(""{p.GetParamName()}"", {p.GetParamName()}.stream().collect(Collectors.joining("","")));");
+            }
+            else
+            {
+                fw.WriteLine(indentLevel, @$"uriBuilder.queryParam(""{p.GetParamName()}"", {p.GetParamName()});");
+            }
+
             if (!isRequired)
             {
                 fw.WriteLine(2, @$"}}");