Merge pull request #731 from xlegalles/CleanUpCode3

style: use file-scope namespace and primary constructor
camunda-community-hub · Oct 25, 2024 · de44584 · de44584
2 parents f46c8de + 011abf4
commit de44584
Show file tree

Hide file tree

Showing 9 changed files with 1,059 additions and 1,098 deletions.
diff --git a/Client/IZeebeClient.cs b/Client/IZeebeClient.cs
diff --git a/Client/Impl/Misc/AccessToken.cs b/Client/Impl/Misc/AccessToken.cs
@@ -6,16 +6,10 @@ namespace Zeebe.Client.Impl.Misc;
 /// <summary>
 /// AccessToken, which consist of an token and a dueDate (expiryDate).
 /// </summary>
-public class AccessToken
+public class AccessToken(string token, long dueDate)
 {
-    public string Token { get; set; }
-    public long DueDate { get; set; }
-
-    public AccessToken(string token, long dueDate)
-    {
-        Token = token;
-        DueDate = dueDate;
-    }
+    public string Token { get; set; } = token;
+    public long DueDate { get; set; } = dueDate;
 
     public override string ToString()
     {

diff --git a/Client/Impl/Misc/PersistedAccessTokenCache.cs b/Client/Impl/Misc/PersistedAccessTokenCache.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Zeebe.Client.Api.Builder;
 
 namespace Zeebe.Client.Impl.Misc;
 

diff --git a/Client/Impl/Misc/TransientGrpcErrorRetryStrategy.cs b/Client/Impl/Misc/TransientGrpcErrorRetryStrategy.cs
@@ -4,40 +4,32 @@
 using Grpc.Core;
 using Zeebe.Client.Api.Misc;
 
-namespace Zeebe.Client.Impl.Misc
-{
-    public class TransientGrpcErrorRetryStrategy : IAsyncRetryStrategy
-    {
-        private static readonly StatusCode[] RetrieableCodes = { StatusCode.Unavailable, StatusCode.ResourceExhausted };
-
-        private readonly Func<int, TimeSpan> waitTimeProvider;
+namespace Zeebe.Client.Impl.Misc;
 
-        public TransientGrpcErrorRetryStrategy(Func<int, TimeSpan> waitTimeProvider)
-        {
-            this.waitTimeProvider = waitTimeProvider;
-        }
+public class TransientGrpcErrorRetryStrategy(Func<int, TimeSpan> waitTimeProvider) : IAsyncRetryStrategy
+{
+    private static readonly StatusCode[] RetrieableCodes = [StatusCode.Unavailable, StatusCode.ResourceExhausted];
 
-        public async Task<TResult> DoWithRetry<TResult>(Func<Task<TResult>> action)
+    public async Task<TResult> DoWithRetry<TResult>(Func<Task<TResult>> action)
+    {
+        var retries = 0;
+        while (true)
         {
-            var retries = 0;
-            while (true)
+            try
+            {
+                var result = await action.Invoke();
+                return result;
+            }
+            catch (RpcException exception)
             {
-                try
+                if (RetrieableCodes.Contains(exception.StatusCode))
                 {
-                    var result = await action.Invoke();
-                    return result;
+                    var waitTime = waitTimeProvider.Invoke(++retries);
+                    await Task.Delay(waitTime);
                 }
-                catch (RpcException exception)
+                else
                 {
-                    if (RetrieableCodes.Contains(exception.StatusCode))
-                    {
-                        var waitTime = waitTimeProvider.Invoke(++retries);
-                        await Task.Delay(waitTime);
-                    }
-                    else
-                    {
-                        throw;
-                    }
+                    throw;
                 }
             }
         }

diff --git a/Client/Impl/Worker/JobClientWrapper.cs b/Client/Impl/Worker/JobClientWrapper.cs
@@ -2,52 +2,51 @@
 using Zeebe.Client.Api.Responses;
 using Zeebe.Client.Api.Worker;
 
-namespace Zeebe.Client.Impl.Worker
+namespace Zeebe.Client.Impl.Worker;
+
+internal class JobClientWrapper : IJobClient
 {
-    internal class JobClientWrapper : IJobClient
+    public static JobClientWrapper Wrap(IJobClient client)
+    {
+        return new JobClientWrapper(client);
+    }
+
+    public bool ClientWasUsed { get; private set; }
+
+    private IJobClient Client { get; }
+
+    private JobClientWrapper(IJobClient client)
+    {
+        Client = client;
+        ClientWasUsed = false;
+    }
+
+    public ICompleteJobCommandStep1 NewCompleteJobCommand(long jobKey)
+    {
+        ClientWasUsed = true;
+        return Client.NewCompleteJobCommand(jobKey);
+    }
+
+    public IFailJobCommandStep1 NewFailCommand(long jobKey)
+    {
+        ClientWasUsed = true;
+        return Client.NewFailCommand(jobKey);
+    }
+
+    public IThrowErrorCommandStep1 NewThrowErrorCommand(long jobKey)
+    {
+        ClientWasUsed = true;
+        return Client.NewThrowErrorCommand(jobKey);
+    }
+
+    public void Reset()
+    {
+        ClientWasUsed = false;
+    }
+
+    public ICompleteJobCommandStep1 NewCompleteJobCommand(IJob activatedJob)
     {
-        public static JobClientWrapper Wrap(IJobClient client)
-        {
-            return new JobClientWrapper(client);
-        }
-
-        public bool ClientWasUsed { get; private set; }
-
-        private IJobClient Client { get; }
-
-        private JobClientWrapper(IJobClient client)
-        {
-            Client = client;
-            ClientWasUsed = false;
-        }
-
-        public ICompleteJobCommandStep1 NewCompleteJobCommand(long jobKey)
-        {
-            ClientWasUsed = true;
-            return Client.NewCompleteJobCommand(jobKey);
-        }
-
-        public IFailJobCommandStep1 NewFailCommand(long jobKey)
-        {
-            ClientWasUsed = true;
-            return Client.NewFailCommand(jobKey);
-        }
-
-        public IThrowErrorCommandStep1 NewThrowErrorCommand(long jobKey)
-        {
-            ClientWasUsed = true;
-            return Client.NewThrowErrorCommand(jobKey);
-        }
-
-        public void Reset()
-        {
-            ClientWasUsed = false;
-        }
-
-        public ICompleteJobCommandStep1 NewCompleteJobCommand(IJob activatedJob)
-        {
-            ClientWasUsed = true;
-            return Client.NewCompleteJobCommand(activatedJob);
-        }
+        ClientWasUsed = true;
+        return Client.NewCompleteJobCommand(activatedJob);
     }
 }