From f8683b7606295ae42a40803fe9a7efe6871772a6 Mon Sep 17 00:00:00 2001
From: Dylan Brasseur <dbrasseur@aneo.fr>
Date: Tue, 17 Oct 2023 15:17:19 +0200
Subject: [PATCH] Fix post merge issues

---
 ...rmoniK.DevelopmentKit.Client.Common.csproj |  1 +
 Client/src/Common/Properties.cs               | 16 ++++++------
 .../ArmoniK.DevelopmentKit.Common.csproj      |  1 +
 Common/src/Common/RetryAction.cs              | 26 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj
index ca1477d2..a779a4bc 100644
--- a/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj
+++ b/Client/src/Common/ArmoniK.DevelopmentKit.Client.Common.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="ArmoniK.Api.Client" Version="3.11.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
   </ItemGroup>
 
diff --git a/Client/src/Common/Properties.cs b/Client/src/Common/Properties.cs
index 5c8604e9..727eb2a5 100644
--- a/Client/src/Common/Properties.cs
+++ b/Client/src/Common/Properties.cs
@@ -127,14 +127,14 @@ public Properties(TaskOptions options,
   /// <exception cref="ArgumentException"></exception>
   public Properties(IConfiguration configuration,
                     TaskOptions    options,
-                    string?        connectionAddress = null,
-                    int            connectionPort    = 0,
-                    string?        protocol          = null,
-                    string?        clientCertFilePem = null,
-                    string?        clientKeyFilePem  = null,
-                    string?        clientP12         = null,
-                    string?        caCertPem         = null,
-                    bool?          sslValidation     = null,
+                    string?        connectionAddress      = null,
+                    int            connectionPort         = 0,
+                    string?        protocol               = null,
+                    string?        clientCertFilePem      = null,
+                    string?        clientKeyFilePem       = null,
+                    string?        clientP12              = null,
+                    string?        caCertPem              = null,
+                    bool?          sslValidation          = null,
                     TimeSpan       retryInitialBackoff    = new(),
                     double         retryBackoffMultiplier = 0,
                     TimeSpan       retryMaxBackoff        = new())
diff --git a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj
index e731ce79..f344e851 100644
--- a/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj
+++ b/Common/src/Common/ArmoniK.DevelopmentKit.Common.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="ArmoniK.Utils" Version="0.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="protobuf-net" Version="3.2.26" />
   </ItemGroup>
diff --git a/Common/src/Common/RetryAction.cs b/Common/src/Common/RetryAction.cs
index a2479cdb..26cc0bb6 100644
--- a/Common/src/Common/RetryAction.cs
+++ b/Common/src/Common/RetryAction.cs
@@ -18,8 +18,6 @@
 using System.Linq;
 using System.Threading;
 
-using JetBrains.Annotations;
-
 using Microsoft.Extensions.Logging;
 
 namespace ArmoniK.DevelopmentKit.Common;
@@ -92,12 +90,12 @@ public static void WhileException(int           retries,
   /// </param>
   /// <param name="logger">Logger to log retried exception</param>
   /// <returns>When one of the retries succeeds, return the value the operation returned. If not, an exception is thrown.</returns>
-  public static void WhileException(int                 retries,
-                                    int                 delayMs,
-                                    Action<int>         operation,
-                                    bool                allowDerivedExceptions = false,
-                                    [CanBeNull] ILogger logger                 = null,
-                                    params      Type[]  exceptionType)
+  public static void WhileException(int           retries,
+                                    int           delayMs,
+                                    Action<int>   operation,
+                                    bool          allowDerivedExceptions = false,
+                                    ILogger?      logger                 = null,
+                                    params Type[] exceptionType)
   {
     // Do all but one retries in the loop
     for (var retry = 1; retry < retries; retry++)
@@ -178,12 +176,12 @@ public static T WhileException<T>(int           retries,
   /// </param>
   /// <param name="logger">Logger to log retried exception</param>
   /// <returns>When one of the retries succeeds, return the value the operation returned. If not, an exception is thrown.</returns>
-  public static T WhileException<T>(int                 retries,
-                                    int                 delayMs,
-                                    Func<int, T>        operation,
-                                    bool                allowDerivedExceptions = false,
-                                    [CanBeNull] ILogger logger                 = null,
-                                    params      Type[]  exceptionType)
+  public static T WhileException<T>(int           retries,
+                                    int           delayMs,
+                                    Func<int, T>  operation,
+                                    bool          allowDerivedExceptions = false,
+                                    ILogger?      logger                 = null,
+                                    params Type[] exceptionType)
   {
     // Do all but one retries in the loop
     for (var retry = 1; retry < retries; retry++)