AOT app json serialization issue

fhtino · fhtino · commit 684e95d547a6 · 2024-07-24T07:26:36.000+02:00
diff --git a/DatabaseGenerator/Config.cs b/DatabaseGenerator/Config.cs
@@ -1,15 +1,25 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 
 namespace DatabaseGenerator
 {
 
+    // -----------------
+    // Required for serialization because JsonSerializerIsReflectionEnabledByDefault = false
+    [JsonSerializable(typeof(Config))]
+    internal partial class ConfigSerializerContext : JsonSerializerContext
+    {        
+    }
+    // -----------------
+
+
     public class Config
     {
 
-        // Class used for rading configuration file by json deserialization. Modify carefully.
+        // Class used for reading configuration file by json deserialization. Modify carefully.
 
         public int OrdersCount { get; set; }
         public DateTime StartDT { get; set; }
diff --git a/DatabaseGenerator/DataWriter/Parquet/DeltaSchema.cs b/DatabaseGenerator/DataWriter/Parquet/DeltaSchema.cs
@@ -1,13 +1,24 @@
-﻿using System;
+﻿using DatabaseGenerator.DataWriter.Parquet;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 
 namespace DatabaseGenerator.DataWriter.Parquet
 {
 
+    // -----------------
+    // Required for serialization because JsonSerializerIsReflectionEnabledByDefault = false
+    [JsonSerializable(typeof(DeltaSchema))]
+    internal partial class DeltaSchemaSerializerContext : JsonSerializerContext
+    {
+    }
+    // -----------------
+
+
     // ---------------------------------------
     // Delta schema json serialization classes
     // ---------------------------------------
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetCurrencyExchange.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetCurrencyExchange.cs
@@ -47,7 +47,7 @@ public static string GETDeltaSchema()
                         DeltaField.GetInstance("Exchange",     "decimal(20,5)", false),
                     }
             };
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetCustomer.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetCustomer.cs
@@ -113,7 +113,7 @@ public static string GETDeltaSchema()
                         DeltaField.GetInstance("Longitude",     "decimal(20,5)", false),
                     }
             };
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetDateExtended.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetDateExtended.cs
@@ -68,7 +68,7 @@ public static string GETDeltaSchema()
             {
                 type = "struct",
                 fields = new List<DeltaField>()
-                    {   
+                    {
                         DeltaField.GetInstance("Date",          "timestamp",       false),
                         DeltaField.GetInstance("DateKey",       "string",        true),
                         DeltaField.GetInstance("Year",           "integer",        false),
@@ -89,7 +89,7 @@ public static string GETDeltaSchema()
                     }
             };
 
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
     }
 }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetOrder.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetOrder.cs
@@ -2,6 +2,7 @@
 using Parquet.Serialization.Attributes;
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using System.Text.Json;
 
 
@@ -52,7 +53,8 @@ public static string GETDeltaSchema()
                         DeltaField.GetInstance("CurrencyCode", "string",    true),
                     }
             };
-            return JsonSerializer.Serialize(schema);
+
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetOrderRow.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetOrderRow.cs
@@ -56,7 +56,7 @@ public static string GETDeltaSchema()
                 }
             };
 
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetProduct.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetProduct.cs
@@ -32,7 +32,7 @@ public class ParquetProduct
         public string CategoryName { get; set; }
         public int SubCategoryKey { get; set; }
         public string SubCategoryName { get; set; }
-       
+
         // ---------------------------------------------------------
 
 
@@ -82,7 +82,7 @@ public static string GETDeltaSchema()
                     }
             };
 
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetSale.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetSale.cs
@@ -78,7 +78,7 @@ public static string GETDeltaSchema()
                         DeltaField.GetInstance("ExchangeRate",  "decimal(20,5)",    false),
                     }
             };
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DataWriter/Parquet/ParquetStore.cs b/DatabaseGenerator/DataWriter/Parquet/ParquetStore.cs
@@ -68,7 +68,7 @@ public static string GETDeltaSchema()
                         DeltaField.GetInstance("Status",        "string",     true),
                     }
             };
-            return JsonSerializer.Serialize(schema);
+            return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);
         }
 
     }
diff --git a/DatabaseGenerator/DatabaseGenerator.csproj b/DatabaseGenerator/DatabaseGenerator.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net8.0</TargetFramework>   
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DatabaseGenerator/Program.cs b/DatabaseGenerator/Program.cs
@@ -34,7 +34,7 @@ static async Task Main(string[] args)
             string cacheFolder = args[3];
 
             // read config
-            var config = JsonSerializer.Deserialize<Config>(File.ReadAllText(Path.Combine(configFile)));
+            var config = JsonSerializer.Deserialize<Config>(File.ReadAllText(Path.Combine(configFile)), ConfigSerializerContext.Default.Config);
             InjectConfigValuesFromCommandLine(config, args);
             config.SalesOrdersOut = new SOOutput(config.SalesOrders);
 
diff --git a/DatabaseGenerator/Properties/PublishProfiles/LinuxX64.pubxml b/DatabaseGenerator/Properties/PublishProfiles/LinuxX64.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
-    <PublishTrimmed>true</PublishTrimmed>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/DatabaseGenerator/Properties/PublishProfiles/WinX64.pubxml b/DatabaseGenerator/Properties/PublishProfiles/WinX64.pubxml
@@ -14,6 +14,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishReadyToRun>false</PublishReadyToRun>
-    <PublishTrimmed>true</PublishTrimmed>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static string GETDeltaSchema()`
`47`	`47`	`DeltaField.GetInstance("Exchange", "decimal(20,5)", false),`
`48`	`48`	`}`
`49`	`49`	`};`
`50`		`- return JsonSerializer.Serialize(schema);`
	`50`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public static string GETDeltaSchema()`
`113`	`113`	`DeltaField.GetInstance("Longitude", "decimal(20,5)", false),`
`114`	`114`	`}`
`115`	`115`	`};`
`116`		`- return JsonSerializer.Serialize(schema);`
	`116`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static string GETDeltaSchema()`
`68`	`68`	`{`
`69`	`69`	`type = "struct",`
`70`	`70`	`fields = new List<DeltaField>()`
`71`		`- {`
	`71`	`+ {`
`72`	`72`	`DeltaField.GetInstance("Date", "timestamp", false),`
`73`	`73`	`DeltaField.GetInstance("DateKey", "string", true),`
`74`	`74`	`DeltaField.GetInstance("Year", "integer", false),`
`@@ -89,7 +89,7 @@ public static string GETDeltaSchema()`
`89`	`89`	`}`
`90`	`90`	`};`
`91`	`91`
`92`		`- return JsonSerializer.Serialize(schema);`
	`92`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Parquet.Serialization.Attributes;`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+using System.Runtime.InteropServices;`
`5`	`6`	`using System.Text.Json;`
`6`	`7`
`7`	`8`
`@@ -52,7 +53,8 @@ public static string GETDeltaSchema()`
`52`	`53`	`DeltaField.GetInstance("CurrencyCode", "string", true),`
`53`	`54`	`}`
`54`	`55`	`};`
`55`		`- return JsonSerializer.Serialize(schema);`
	`56`	`+`
	`57`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static string GETDeltaSchema()`
`56`	`56`	`}`
`57`	`57`	`};`
`58`	`58`
`59`		`- return JsonSerializer.Serialize(schema);`
	`59`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class ParquetProduct`
`32`	`32`	`public string CategoryName { get; set; }`
`33`	`33`	`public int SubCategoryKey { get; set; }`
`34`	`34`	`public string SubCategoryName { get; set; }`
`35`		`-`
	`35`	`+`
`36`	`36`	`// ---------------------------------------------------------`
`37`	`37`
`38`	`38`
`@@ -82,7 +82,7 @@ public static string GETDeltaSchema()`
`82`	`82`	`}`
`83`	`83`	`};`
`84`	`84`
`85`		`- return JsonSerializer.Serialize(schema);`
	`85`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static string GETDeltaSchema()`
`78`	`78`	`DeltaField.GetInstance("ExchangeRate", "decimal(20,5)", false),`
`79`	`79`	`}`
`80`	`80`	`};`
`81`		`- return JsonSerializer.Serialize(schema);`
	`81`	`+ return JsonSerializer.Serialize(schema, DeltaSchemaSerializerContext.Default.DeltaSchema);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`}`