Merge pull request #231 from Mangopay/feature/update-restsharp-dep-v112

Upgrades RestSharp from v107.3.0 to v112.1.0
Mangopay · Nov 11, 2024 · 1e4ed39 · 1e4ed39
2 parents c01359d + 75afc92
commit 1e4ed39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/MangoPay.SDK.Tests/MangoPay.SDK.Tests.csproj b/MangoPay.SDK.Tests/MangoPay.SDK.Tests.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Common.Logging" Version="3.4.1" />
     <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
-    <PackageReference Include="RestSharp" Version="107.3.0" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/MangoPay.SDK/Core/MangoPayJsonSerializer.cs b/MangoPay.SDK/Core/MangoPayJsonSerializer.cs
@@ -1,11 +1,12 @@
 using Newtonsoft.Json;
+using RestSharp;
 using RestSharp.Serializers;
 
 namespace MangoPay.SDK.Core
 {
     public sealed class MangoPayJsonSerializer : ISerializer
     {
-        public string ContentType { get; set; }
+        public ContentType ContentType { get; set; }
 
         public string Serialize(object obj)
         {

diff --git a/MangoPay.SDK/Core/RestTool.cs b/MangoPay.SDK/Core/RestTool.cs
@@ -1,11 +1,11 @@
-using Common.Logging;
-using MangoPay.SDK.Entities;
-using RestSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+using Common.Logging;
+using MangoPay.SDK.Entities;
+using RestSharp;
 
 namespace MangoPay.SDK.Core
 {
@@ -19,16 +19,16 @@ public class RestSharpDto
 
         public RestClient Client { get; }
 
+        // options need timout in milliseconds
         private RestSharpDto(string url, int timeout)
         {
             _options = new RestClientOptions(url)
             {
                 ThrowOnAnyError = false,
-                Timeout = timeout
+                Timeout = new TimeSpan(timeout * 1000L) 
             };
 
-            Client = new RestClient(_options);
-            Client.UseSerializer<MangoPaySerializer>();
+            Client = new RestClient(_options, configureSerialization: s => s.UseSerializer(() => new MangoPaySerializer()));
         }
 
         public static RestSharpDto GetInstance(string url, int timeout)
@@ -140,7 +140,7 @@ private void CheckResponseCode(RestResponse restResponse)
             if (restResponse.ResponseStatus == ResponseStatus.TimedOut)
                 throw new TimeoutException(restResponse.ErrorMessage);
 
-            if (restResponse.ErrorException is System.Net.ProtocolViolationException)
+            if (restResponse.ErrorException is ProtocolViolationException)
                 throw restResponse.ErrorException;
 
             throw new ResponseException(restResponse.Content, responseCode);

diff --git a/MangoPay.SDK/MangoPay.SDK.csproj b/MangoPay.SDK/MangoPay.SDK.csproj
@@ -21,7 +21,7 @@
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
       <PackageReference Include="Common.Logging" Version="3.4.1" />
       <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
-      <PackageReference Include="RestSharp" Version="107.3.0" />
+      <PackageReference Include="RestSharp" Version="112.1.0" />
     </ItemGroup>
 </Project>