Fix tests (#167)

* Resolve warnings * Use raw string literal * Drop redundant body * Add Microsoft.AspNetCore.App * Use QueryString * Update HttpRequestFactoryTests * Disable format
aviationexam · Nov 18, 2024 · 3919ab4 · 3919ab4
1 parent 3e5c267
commit 3919ab4
Show file tree

Hide file tree

Showing 57 changed files with 301 additions and 426 deletions.
diff --git a/src/Daktela.HttpClient/Api/CustomFields/ICustomFields.cs b/src/Daktela.HttpClient/Api/CustomFields/ICustomFields.cs
@@ -2,6 +2,4 @@
 
 namespace Daktela.HttpClient.Api.CustomFields;
 
-public interface ICustomFields : IReadOnlyDictionary<string, IReadOnlyCollection<string>>
-{
-}
+public interface ICustomFields : IReadOnlyDictionary<string, IReadOnlyCollection<string>>;
diff --git a/src/Daktela.HttpClient/Api/Requests/FilterGroup.cs b/src/Daktela.HttpClient/Api/Requests/FilterGroup.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace Daktela.HttpClient.Api.Requests;
 

diff --git a/src/Daktela.HttpClient/Api/Requests/IFilter.cs b/src/Daktela.HttpClient/Api/Requests/IFilter.cs
@@ -3,6 +3,4 @@ namespace Daktela.HttpClient.Api.Requests;
 /// <summary>
 /// A marking interface, a library user is not supposed to implement it by themself
 /// </summary>
-public interface IFilter
-{
-}
+public interface IFilter;
diff --git a/src/Daktela.HttpClient/Api/Responses/Errors/IErrorForm.cs b/src/Daktela.HttpClient/Api/Responses/Errors/IErrorForm.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Responses.Errors;
 
-public interface IErrorForm
-{
-}
+public interface IErrorForm;
diff --git a/src/Daktela.HttpClient/Api/Responses/Errors/IErrorResponse.cs b/src/Daktela.HttpClient/Api/Responses/Errors/IErrorResponse.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Responses.Errors;
 
-public interface IErrorResponse
-{
-}
+public interface IErrorResponse;
diff --git a/src/Daktela.HttpClient/Api/Responses/Errors/PlainErrorResponse.cs b/src/Daktela.HttpClient/Api/Responses/Errors/PlainErrorResponse.cs
@@ -2,6 +2,4 @@
 
 namespace Daktela.HttpClient.Api.Responses.Errors;
 
-public class PlainErrorResponse : Collection<string>, IErrorResponse
-{
-}
+public class PlainErrorResponse : Collection<string>, IErrorResponse;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/CallActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/CallActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class CallActivity
-{
-}
+public class CallActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/CommentActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/CommentActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class CommentActivity
-{
-}
+public class CommentActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/CustomActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/CustomActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class CustomActivity
-{
-}
+public class CustomActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/FacebookCommentActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/FacebookCommentActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class FacebookCommentActivity
-{
-}
+public class FacebookCommentActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/FacebookMessengerActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/FacebookMessengerActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class FacebookMessengerActivity
-{
-}
+public class FacebookMessengerActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/InstagramDirectMessageActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/InstagramDirectMessageActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class InstagramDirectMessageActivity
-{
-}
+public class InstagramDirectMessageActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/SmsActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/SmsActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class SmsActivity
-{
-}
+public class SmsActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/ViberActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/ViberActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class ViberActivity
-{
-}
+public class ViberActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/WebChatActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/WebChatActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class WebChatActivity
-{
-}
+public class WebChatActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/Activities/WhatsAppActivity.cs b/src/Daktela.HttpClient/Api/Tickets/Activities/WhatsAppActivity.cs
@@ -1,5 +1,3 @@
 namespace Daktela.HttpClient.Api.Tickets.Activities;
 
-public class WhatsAppActivity
-{
-}
+public class WhatsAppActivity;
diff --git a/src/Daktela.HttpClient/Api/Tickets/ReadTicket.cs b/src/Daktela.HttpClient/Api/Tickets/ReadTicket.cs
@@ -4,7 +4,6 @@
 using Daktela.HttpClient.Api.Users;
 using Daktela.HttpClient.Attributes;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;

diff --git a/src/Daktela.HttpClient/Daktela.HttpClient.csproj b/src/Daktela.HttpClient/Daktela.HttpClient.csproj
@@ -39,6 +39,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Aviationexam.GeneratedJsonConverters.SourceGenerator" Version="0.2.0" PrivateAssets="all" />
   </ItemGroup>
 

diff --git a/src/Daktela.HttpClient/Implementations/Endpoints/ActivityEndpoint.cs b/src/Daktela.HttpClient/Implementations/Endpoints/ActivityEndpoint.cs
@@ -16,35 +16,22 @@
 
 namespace Daktela.HttpClient.Implementations.Endpoints;
 
-public class ActivityEndpoint : IActivityEndpoint
+public class ActivityEndpoint(
+    IDaktelaHttpClient daktelaHttpClient,
+    IHttpRequestSerializer httpRequestSerializer,
+    IHttpResponseParser httpResponseParser,
+    IPagedResponseProcessor<IActivityEndpoint> pagedResponseProcessor
+) : IActivityEndpoint
 {
-    private readonly IDaktelaHttpClient _daktelaHttpClient;
-    private readonly IHttpRequestSerializer _httpRequestSerializer;
-    private readonly IHttpResponseParser _httpResponseParser;
-    private readonly IPagedResponseProcessor<IActivityEndpoint> _pagedResponseProcessor;
-
-    public ActivityEndpoint(
-        IDaktelaHttpClient daktelaHttpClient,
-        IHttpRequestSerializer httpRequestSerializer,
-        IHttpResponseParser httpResponseParser,
-        IPagedResponseProcessor<IActivityEndpoint> pagedResponseProcessor
-    )
-    {
-        _daktelaHttpClient = daktelaHttpClient;
-        _httpRequestSerializer = httpRequestSerializer;
-        _httpResponseParser = httpResponseParser;
-        _pagedResponseProcessor = pagedResponseProcessor;
-    }
-
     public async Task<ReadActivity> GetActivityAsync(
         string name,
         CancellationToken cancellationToken
     )
     {
         var encodedName = HttpUtility.UrlEncode(name);
 
-        var contact = await _daktelaHttpClient.GetAsync(
-            _httpResponseParser,
+        var contact = await daktelaHttpClient.GetAsync(
+            httpResponseParser,
             $"{IActivityEndpoint.UriPrefix}/{encodedName}{IActivityEndpoint.UriPostfix}",
             DaktelaJsonSerializerContext.Default.SingleResponseReadActivity,
             cancellationToken
@@ -69,9 +56,9 @@ CancellationToken cancellationToken
 
     public async Task<ReadActivity> CreateActivityAsync(
         CreateActivity activity, CancellationToken cancellationToken
-    ) => await _daktelaHttpClient.PostAsync(
-        _httpRequestSerializer,
-        _httpResponseParser,
+    ) => await daktelaHttpClient.PostAsync(
+        httpRequestSerializer,
+        httpResponseParser,
         $"{IActivityEndpoint.UriPrefix}{IActivityEndpoint.UriPostfix}",
         activity,
         DaktelaJsonSerializerContext.Default.CreateActivity,
@@ -87,9 +74,9 @@ CancellationToken cancellationToken
     {
         var encodedName = HttpUtility.UrlEncode(name);
 
-        return await _daktelaHttpClient.PutAsync(
-            _httpRequestSerializer,
-            _httpResponseParser,
+        return await daktelaHttpClient.PutAsync(
+            httpRequestSerializer,
+            httpResponseParser,
             $"{IActivityEndpoint.UriPrefix}/{encodedName}{IActivityEndpoint.UriPostfix}",
             contact,
             DaktelaJsonSerializerContext.Default.UpdateActivity,
@@ -106,14 +93,14 @@ public IAsyncEnumerable<TResult> GetActivitiesFieldsAsync<TRequest, TResult>(
         CancellationToken cancellationToken
     )
         where TRequest : IRequest, IFieldsQuery
-        where TResult : class, IFieldResult => _pagedResponseProcessor.InvokeAsync(
+        where TResult : class, IFieldResult => pagedResponseProcessor.InvokeAsync(
         request,
         requestOption,
         responseBehaviour,
         new
         {
-            daktelaHttpClient = _daktelaHttpClient,
-            httpResponseParser = _httpResponseParser,
+            daktelaHttpClient,
+            httpResponseParser,
             jsonTypeInfoForResponseType,
         },
         async static (
@@ -140,14 +127,14 @@ public IAsyncEnumerable<ReadActivityAttachment> GetActivityAttachmentsAsync(
         IRequestOption requestOption,
         IResponseBehaviour responseBehaviour,
         CancellationToken cancellationToken
-    ) => _pagedResponseProcessor.InvokeAsync(
+    ) => pagedResponseProcessor.InvokeAsync(
         request,
         requestOption,
         responseBehaviour,
         new
         {
-            daktelaHttpClient = _daktelaHttpClient,
-            httpResponseParser = _httpResponseParser,
+            daktelaHttpClient,
+            httpResponseParser,
             name,
         },
         async static (
@@ -317,14 +304,14 @@ private IAsyncEnumerable<T> GetListAsync<T>(
         IRequestOption requestOption,
         IResponseBehaviour responseBehaviour,
         CancellationToken cancellationToken
-    ) where T : class => _pagedResponseProcessor.InvokeAsync(
+    ) where T : class => pagedResponseProcessor.InvokeAsync(
         request,
         requestOption,
         responseBehaviour,
         new
         {
-            daktelaHttpClient = _daktelaHttpClient,
-            httpResponseParser = _httpResponseParser,
+            daktelaHttpClient,
+            httpResponseParser,
             targetUri,
             jsonTypeInfo,
         },

diff --git a/src/Daktela.HttpClient/Implementations/Endpoints/ContactEndpoint.cs b/src/Daktela.HttpClient/Implementations/Endpoints/ContactEndpoint.cs
@@ -15,34 +15,21 @@
 
 namespace Daktela.HttpClient.Implementations.Endpoints;
 
-public class ContactEndpoint : IContactEndpoint
+public class ContactEndpoint(
+    IDaktelaHttpClient daktelaHttpClient,
+    IHttpRequestSerializer httpRequestSerializer,
+    IHttpResponseParser httpResponseParser,
+    IPagedResponseProcessor<IContactEndpoint> pagedResponseProcessor
+) : IContactEndpoint
 {
-    private readonly IDaktelaHttpClient _daktelaHttpClient;
-    private readonly IHttpRequestSerializer _httpRequestSerializer;
-    private readonly IHttpResponseParser _httpResponseParser;
-    private readonly IPagedResponseProcessor<IContactEndpoint> _pagedResponseProcessor;
-
-    public ContactEndpoint(
-        IDaktelaHttpClient daktelaHttpClient,
-        IHttpRequestSerializer httpRequestSerializer,
-        IHttpResponseParser httpResponseParser,
-        IPagedResponseProcessor<IContactEndpoint> pagedResponseProcessor
-    )
-    {
-        _daktelaHttpClient = daktelaHttpClient;
-        _httpRequestSerializer = httpRequestSerializer;
-        _httpResponseParser = httpResponseParser;
-        _pagedResponseProcessor = pagedResponseProcessor;
-    }
-
     public async Task<ReadContact> GetContactAsync(
         string name, CancellationToken cancellationToken
     )
     {
         var encodedName = HttpUtility.UrlEncode(name);
 
-        var contact = await _daktelaHttpClient.GetAsync(
-            _httpResponseParser,
+        var contact = await daktelaHttpClient.GetAsync(
+            httpResponseParser,
             $"{IContactEndpoint.UriPrefix}/{encodedName}{IContactEndpoint.UriPostfix}",
             DaktelaJsonSerializerContext.Default.SingleResponseReadContact,
             cancellationToken
@@ -56,14 +43,14 @@ public IAsyncEnumerable<ReadContact> GetContactsAsync(
         IRequestOption requestOption,
         IResponseBehaviour responseBehaviour,
         CancellationToken cancellationToken
-    ) => _pagedResponseProcessor.InvokeAsync(
+    ) => pagedResponseProcessor.InvokeAsync(
         request,
         requestOption,
         responseBehaviour,
         new
         {
-            daktelaHttpClient = _daktelaHttpClient,
-            httpResponseParser = _httpResponseParser
+            daktelaHttpClient,
+            httpResponseParser,
         },
         async static (
             request,
@@ -83,9 +70,9 @@ async static (
 
     public async Task CreateContactAsync(
         CreateContact contact, CancellationToken cancellationToken
-    ) => await _daktelaHttpClient.PostAsync(
-        _httpRequestSerializer,
-        _httpResponseParser,
+    ) => await daktelaHttpClient.PostAsync(
+        httpRequestSerializer,
+        httpResponseParser,
         $"{IContactEndpoint.UriPrefix}{IContactEndpoint.UriPostfix}",
         contact,
         DaktelaJsonSerializerContext.Default.CreateContact,
@@ -101,9 +88,9 @@ CancellationToken cancellationToken
     {
         var encodedName = HttpUtility.UrlEncode(name);
 
-        return await _daktelaHttpClient.PutAsync(
-            _httpRequestSerializer,
-            _httpResponseParser,
+        return await daktelaHttpClient.PutAsync(
+            httpRequestSerializer,
+            httpResponseParser,
             $"{IContactEndpoint.UriPrefix}/{encodedName}{IContactEndpoint.UriPostfix}",
             contact,
             DaktelaJsonSerializerContext.Default.UpdateContact,
@@ -118,7 +105,7 @@ public async Task DeleteContactAsync(
     {
         var encodedName = HttpUtility.UrlEncode(name);
 
-        await _daktelaHttpClient.DeleteAsync(
+        await daktelaHttpClient.DeleteAsync(
             $"{IContactEndpoint.UriPrefix}/{encodedName}{IContactEndpoint.UriPostfix}",
             cancellationToken
         ).ConfigureAwait(false);
@@ -132,14 +119,14 @@ public IAsyncEnumerable<TResult> GetContactsFieldsAsync<TRequest, TResult>(
         CancellationToken cancellationToken
     )
         where TRequest : IRequest, IFieldsQuery
-        where TResult : class, IFieldResult => _pagedResponseProcessor.InvokeAsync(
+        where TResult : class, IFieldResult => pagedResponseProcessor.InvokeAsync(
         request,
         requestOption,
         responseBehaviour,
         new
         {
-            daktelaHttpClient = _daktelaHttpClient,
-            httpResponseParser = _httpResponseParser,
+            daktelaHttpClient,
+            httpResponseParser,
             jsonTypeInfoForResponseType,
         },
         async static (