[Add] support for MessagePack; fixes #274

STARIONGROUP · Jul 31, 2023 · 7287212 · 7287212
1 parent 07e09d1
commit 7287212
Show file tree

Hide file tree

Showing 21 changed files with 342 additions and 177 deletions.
diff --git a/CDP4Authentication/CDP4Authentication.csproj b/CDP4Authentication/CDP4Authentication.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/CDP4Orm.Tests/CDP4Orm.Tests.csproj b/CDP4Orm.Tests/CDP4Orm.Tests.csproj
@@ -12,9 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="9.0.0" />
-    <PackageReference Include="Npgsql" Version="4.1.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit.Console" Version="3.16.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">

diff --git a/CDP4Orm/CDP4Orm.csproj b/CDP4Orm/CDP4Orm.csproj
@@ -54,7 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="9.0.0" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="23.0.0-PR-268-04" />
     <PackageReference Include="Npgsql" Version="4.1.3.1" />
   </ItemGroup>
 

diff --git a/CDP4WebServer.IIS/CDP4WebServer.IIS.csproj b/CDP4WebServer.IIS/CDP4WebServer.IIS.csproj
@@ -58,11 +58,11 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="CDP4Common, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CDP4Common-CE.9.0.0\lib\net472\CDP4Common.dll</HintPath>
+    <Reference Include="CDP4Common, Version=23.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CDP4Common-CE.23.0.0-PR-268-02\lib\net472\CDP4Common.dll</HintPath>
     </Reference>
-    <Reference Include="CDP4JsonSerializer, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CDP4JsonSerializer-CE.9.0.0\lib\net472\CDP4JsonSerializer.dll</HintPath>
+    <Reference Include="CDP4JsonSerializer, Version=23.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CDP4JsonSerializer-CE.23.0.0-PR-268-02\lib\net472\CDP4JsonSerializer.dll</HintPath>
     </Reference>
     <Reference Include="DotNetZip, Version=1.14.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.14.0\lib\net40\DotNetZip.dll</HintPath>
@@ -108,10 +108,10 @@
       <HintPath>..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.2.0\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Npgsql, Version=4.1.3.1, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
       <HintPath>..\packages\Npgsql.4.1.3.1\lib\net461\Npgsql.dll</HintPath>

diff --git a/CDP4WebServer.IIS/packages.config b/CDP4WebServer.IIS/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net472" />
-  <package id="CDP4Common-CE" version="9.0.0" targetFramework="net472" />
-  <package id="CDP4JsonSerializer-CE" version="9.0.0" targetFramework="net472" />
-  <package id="DotNetZip" version="1.14.0" targetFramework="net472" />
+  <package id="CDP4Common-CE" version="23.0.0-PR-268-04" targetFramework="net472" />
+  <package id="CDP4JsonSerializer-CE" version="23.0.0-PR-268-04" targetFramework="net472" />
+  <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
   <package id="Hangfire" version="1.7.19" targetFramework="net472" />
   <package id="Hangfire.Autofac" version="2.3.1" targetFramework="net472" />
   <package id="Hangfire.Core" version="1.7.19" targetFramework="net472" />

diff --git a/CDP4WebServer/CDP4WebServer.csproj b/CDP4WebServer/CDP4WebServer.csproj
@@ -14,9 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nancy.Bootstrappers.Autofac" Version="1.4.1" />
     <PackageReference Include="Nancy.Owin" Version="1.4.1" />
-    <PackageReference Include="Hangfire" Version="1.7.19" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Microsoft.Owin.Diagnostics" Version="4.0.1" />

diff --git a/CDP4WebService.Authentication/CDP4WebService.Authentication.csproj b/CDP4WebService.Authentication/CDP4WebService.Authentication.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Nancy" Version="1.4.5" />
-    <PackageReference Include="NLog" Version="4.7.10" />
+    <PackageReference Include="NLog" Version="5.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CDP4WebServices.API.Tests/CDP4WebServices.API.Tests.csproj b/CDP4WebServices.API.Tests/CDP4WebServices.API.Tests.csproj
@@ -12,11 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="9.0.0" />
-    <PackageReference Include="DotNetZip" Version="1.14.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="Nancy" Version="1.4.5" />
-    <PackageReference Include="Nancy.Bootstrappers.Autofac" Version="1.4.1" />
     <PackageReference Include="Nancy.Testing" Version="1.4.1" />
     <PackageReference Include="Npgsql" Version="4.1.3.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
@@ -25,7 +21,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CDP4WebServices.API/CDP4WebServices.API.csproj b/CDP4WebServices.API/CDP4WebServices.API.csproj
@@ -21,8 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="9.0.0" />
-    <PackageReference Include="DotNetZip" Version="1.14.0" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="23.0.0-PR-268-04" />
+    <PackageReference Include="CDP4MessagePackSerializer-CE" Version="23.0.0-PR-268-04" />
+    <PackageReference Include="DotNetZip" Version="1.16.0" />
     <PackageReference Include="Hangfire" Version="1.7.19" />
     <PackageReference Include="HangFire.Autofac" Version="2.3.1" />
     <PackageReference Include="Nancy.Bootstrappers.Autofac" Version="1.4.1" />

diff --git a/CDP4WebServices.API/Cdp4Bootstrapper.cs b/CDP4WebServices.API/Cdp4Bootstrapper.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="Cdp4Bootstrapper.cs" company="RHEA System S.A.">
-//    Copyright (c) 2015-2021 RHEA System S.A.
+//    Copyright (c) 2015-2023 RHEA System S.A.
 //
 //    Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou, Alexander van Delft, Nathanael Smiechowski
 //
@@ -37,6 +37,8 @@ namespace CDP4WebServices.API
 
     using CDP4JsonSerializer;
 
+    using CDP4MessagePackSerializer;
+
     using CDP4Orm.Dao;
     using CDP4Orm.Dao.Authentication;
     using CDP4Orm.Dao.Cache;
@@ -219,6 +221,9 @@ protected override void ConfigureRequestContainer(ILifetimeScope container, Nanc
                     // wireup class cdp4JsonSerializer
                     builder.RegisterTypeAsPropertyInjectedSingleton<Cdp4JsonSerializer, ICdp4JsonSerializer>();
 
+                    // wireup class cdp4JsonSerializer
+                    builder.RegisterTypeAsPropertyInjectedSingleton<MessagePackSerializer, IMessagePackSerializer>();
+
                     // wireup AccessRightKind service
                     builder.RegisterTypeAsPropertyInjectedSingleton<AccessRightKindService, IAccessRightKindService>();
 
@@ -326,7 +331,7 @@ protected override void ApplicationStartup(ILifetimeScope container, IPipelines
                 Logger.Fatal(ex, LoggerUtils.GetLogMessage(subject, ctx.Request.UserHostAddress, false, requestMessage));
 
                 var errorResponse = new JsonResponse($"exception:{ex.Message}", new DefaultJsonSerializer());
-                headerInforProvider.RegisterResponseHeaders(errorResponse);
+                headerInforProvider.RegisterResponseHeaders(errorResponse,ContentTypeKind.JSON);
                 return errorResponse.WithStatusCode(HttpStatusCode.InternalServerError);
             };
 

diff --git a/CDP4WebServices.API/MigrationEngine/MigrationEngine.cs b/CDP4WebServices.API/MigrationEngine/MigrationEngine.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MigrationEngine.cs" company="RHEA System S.A.">
-//    Copyright (c) 2015-2021 RHEA System S.A.
+//    Copyright (c) 2015-2023 RHEA System S.A.
 //
 //    Author: Sam Gerené, Merlin Bieze, Alex Vorobiev, Naron Phou, Alexander van Delft, Nathanael Smiechowski
 //
@@ -72,7 +72,7 @@ public static void MigrateAllAtStartUp()
                     {
                         connection.Open();
                     }
-                    catch (PostgresException e)
+                    catch (NpgsqlException e)
                     {
                         Logger.Warn("Could not connect to the database for migration, the database might not exist yet. Skipping migration. Error message: {0}", e.Message);
                         return;