Fix directly Serialize to string/jsonb when needed

STARIONGROUP · Nov 6, 2024 · f44b6e0 · f44b6e0
1 parent 05836dc
commit f44b6e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/CDP4Orm/CDP4Orm.csproj b/CDP4Orm/CDP4Orm.csproj
@@ -75,7 +75,7 @@
     <EmbeddedResource Include="MigrationScript\SiteDirectory_20210108_6_3_0_0_Model_Updates.sql" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CDP4DalJsonSerializer-CE" Version="28.0.0-rc11" />
+    <PackageReference Include="CDP4DalJsonSerializer-CE" Version="28.0.0-rc20" />
     <PackageReference Include="Npgsql" Version="8.0.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
   </ItemGroup>

diff --git a/CDP4Orm/Dao/Cache/CacheDao.cs b/CDP4Orm/Dao/Cache/CacheDao.cs
@@ -68,11 +68,6 @@ public class CacheDao : ICacheDao
         /// </summary>
         private const string IidKey = "Iid";
 
-        /// <summary>
-        /// Gets or sets the injected <see cref="ICdp4JsonSerializer" />
-        /// </summary>
-        public ICdp4JsonSerializer JsonSerializer { get; set; }
-
         /// <summary>
         /// Gets or sets the file dao.
         /// </summary>
@@ -101,7 +96,7 @@ public void Write(NpgsqlTransaction transaction, string partition, Thing thing)
 
             command.Parameters.Add("iid", NpgsqlDbType.Uuid).Value = thing.Iid;
             command.Parameters.Add("revisionnumber", NpgsqlDbType.Integer).Value = thing.RevisionNumber;
-            command.Parameters.Add("jsonb", NpgsqlDbType.Jsonb).Value = this.JsonSerializer.SerializeToString(thing);
+            command.Parameters.Add("jsonb", NpgsqlDbType.Jsonb).Value = thing.ToJsonString();
 
             // log the sql command 
             command.ExecuteNonQuery();
@@ -134,7 +129,7 @@ public void BulkWrite(NpgsqlTransaction transaction, string partition, IReadOnly
                     var revisionParam = new NpgsqlParameter($"revision_{index}", NpgsqlDbType.Integer) { Value = thing.RevisionNumber };
                     var jsonbParam = new NpgsqlParameter($"jsonb_{index}", NpgsqlDbType.Jsonb);
 
-                    var serializedJson = this.JsonSerializer.SerializeToString(thing);
+                    var serializedJson = thing.ToJsonString();
 
                     if (string.IsNullOrWhiteSpace(serializedJson))
                     {

diff --git a/CDP4Orm/Dao/Revision/RevisionDao.cs b/CDP4Orm/Dao/Revision/RevisionDao.cs
@@ -190,7 +190,7 @@ public void WriteRevision(NpgsqlTransaction transaction, string partition, Thing
             command.Parameters.Add("iid", NpgsqlDbType.Uuid).Value = thing.Iid;
             command.Parameters.Add("revisionnumber", NpgsqlDbType.Integer).Value = thing.RevisionNumber;
             command.Parameters.Add("actor", NpgsqlDbType.Uuid).Value = actor;
-            command.Parameters.Add("jsonb", NpgsqlDbType.Jsonb).Value = JsonSerializer.Serialize(thing);
+            command.Parameters.Add("jsonb", NpgsqlDbType.Jsonb).Value = thing.ToJsonString();
 
             command.ExecuteNonQuery();
         }
@@ -224,7 +224,7 @@ public void BulkWriteRevision(NpgsqlTransaction transaction, string partition, I
                     var iidParam = new NpgsqlParameter($"iid_{index}", NpgsqlDbType.Uuid) { Value = thing.Iid };
                     var revisionParam = new NpgsqlParameter($"revisionnumber_{index}", NpgsqlDbType.Integer) { Value = thing.RevisionNumber };
                     var actorParam = new NpgsqlParameter($"actor_{index}", NpgsqlDbType.Uuid) { Value = actor };
-                    var jsonbParam = new NpgsqlParameter($"jsonb_{index}", NpgsqlDbType.Jsonb) { Value = JsonSerializer.Serialize(thing) };
+                    var jsonbParam = new NpgsqlParameter($"jsonb_{index}", NpgsqlDbType.Jsonb) { Value = thing.ToJsonString() };
 
                     parameters.Add(iidParam);
                     parameters.Add(revisionParam);

diff --git a/CometServer/CometServer.csproj b/CometServer/CometServer.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Company>Starion Group S.A.</Company>
     <Title>CometServer-CE</Title>
-    <Version>8.0.2</Version>
+    <Version>8.1.0</Version>
     <Description>CDP4-COMET Services API</Description>
     <Copyright>Copyright © Starion Group S.A.</Copyright>
     <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
@@ -19,9 +19,9 @@
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="Carter" Version="8.2.1" />
-    <PackageReference Include="CDP4MessagePackSerializer-CE" Version="28.0.0-rc11" />
-    <PackageReference Include="CDP4DalJsonSerializer-CE" Version="28.0.0-rc11" />
-    <PackageReference Include="CDP4ServicesMessaging-CE" Version="28.0.0-rc11" />
+    <PackageReference Include="CDP4MessagePackSerializer-CE" Version="28.0.0-rc20" />
+    <PackageReference Include="CDP4DalJsonSerializer-CE" Version="28.0.0-rc20" />
+    <PackageReference Include="CDP4ServicesMessaging-CE" Version="28.0.0-rc20" />
     <PackageReference Include="FluentValidation" Version="11.10.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />