- Update GetUri() signature

CodeShayk · Nov 4, 2024 · 9b67e1d · 9b67e1d
1 parent 5240758
commit 9b67e1d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -100,12 +100,12 @@ public class CustomerApi : WebApi<CustomerResult>
     {
     }
 
-    protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+    protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
     {
         // Executes as root or level 1 api. parentApiResult should be null.
         var customerContext = (CustomerContext)context;
 
-        return string.Format(Endpoints.BaseAddress + Endpoints.Customer, customerContext.CustomerId);
+        return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.Customer, customerContext.CustomerId));
     }
 }
 ```
@@ -118,10 +118,10 @@ internal class CommunicationApi : WebApi<CommunicationResult>
         {
         }
 
-        protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+        protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
         {
             var customer = (CustomerResult)parentApiResult;
-            return string.Format(Endpoints.BaseAddress + Endpoints.Communication, customer.Id);
+            return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.Communication, customer.Id));
         }
     }
 ```

diff --git a/src/ApiAggregator/WebApi.cs b/src/ApiAggregator/WebApi.cs
@@ -11,8 +11,8 @@ namespace ApiAggregator.Net
     public abstract class WebApi<TResult> : IWebApi
            where TResult : IApiResult
     {
-        protected string BaseAddress;
-        protected string Url;
+        protected Uri BaseAddress;
+        protected Uri Url;
         private bool isContextResolved;
 
         protected WebApi() : this(null)
@@ -21,7 +21,8 @@ protected WebApi() : this(null)
 
         protected WebApi(string baseAddress)
         {
-            BaseAddress = baseAddress;
+            if (!string.IsNullOrEmpty(baseAddress))
+                BaseAddress = new Uri(baseAddress);
         }
 
         /// <summary>
@@ -56,7 +57,7 @@ protected virtual List<KeyValuePair<string, string>> GetHeaders()
         /// <param name="context">Request Context. Always available.</param>
         /// <param name="parentApiResult">Result from parent Api. Only available when configured as nested web api. Else will be null.</param>
         /// <returns></returns>
-        protected abstract string GetUrl(IRequestContext context, IApiResult parentApiResult = null);
+        protected abstract Uri GetUrl(IRequestContext context, IApiResult parentApiResult = null);
 
         /// <summary>
         /// Implement to resolve api parameter.
@@ -83,7 +84,7 @@ public virtual async Task<IApiResult> Run(IHttpClientFactory httpClientFactory,
 
             logger?.LogInformation($"Run api: {GetType().Name}");
 
-            if (string.IsNullOrEmpty(Url))
+            if (Url == null)
                 return null;
 
             using (var client = httpClientFactory.CreateClient())
@@ -96,8 +97,8 @@ public virtual async Task<IApiResult> Run(IHttpClientFactory httpClientFactory,
 
                     try
                     {
-                        if (!string.IsNullOrEmpty(BaseAddress))
-                            client.BaseAddress = new Uri(BaseAddress);
+                        if (BaseAddress != null)
+                            client.BaseAddress = BaseAddress;
 
                         var headers = GetHeaders();
 

diff --git a/tests/ApiAggregator.Tests/ApiAggregate/WebApis/CommunicationApi.cs b/tests/ApiAggregator.Tests/ApiAggregate/WebApis/CommunicationApi.cs
@@ -9,10 +9,10 @@ public CommunicationApi() : base(Endpoints.BaseAddress)
         {
         }
 
-        protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+        protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
         {
             var customer = (CustomerResult)parentApiResult;
-            return string.Format(Endpoints.BaseAddress + Endpoints.Communication, customer.Id);
+            return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.Communication, customer.Id), UriKind.Absolute);
         }
     }
 }
diff --git a/tests/ApiAggregator.Tests/ApiAggregate/WebApis/CustomerApi.cs b/tests/ApiAggregator.Tests/ApiAggregate/WebApis/CustomerApi.cs
@@ -9,12 +9,12 @@ public CustomerApi() : base(Endpoints.BaseAddress)
         {
         }
 
-        protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+        protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
         {
             // Executes as root or level 1 api.
             var customerContext = (CustomerContext)context;
 
-            return string.Format(Endpoints.BaseAddress + Endpoints.Customer, customerContext.CustomerId);
+            return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.Customer, customerContext.CustomerId), UriKind.Absolute);
         }
     }
 }
diff --git a/tests/ApiAggregator.Tests/ApiAggregate/WebApis/OrderItemsApi.cs b/tests/ApiAggregator.Tests/ApiAggregate/WebApis/OrderItemsApi.cs
@@ -10,13 +10,13 @@ public OrderItemsApi() : base(Endpoints.BaseAddress)
         {
         }
 
-        protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+        protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
         {
             // Execute as nested api to order parent api taking OrderResult to resolve api parameter.
             var orders = (CollectionResult<OrderResult>)parentApiResult;
             var customerContext = (CustomerContext)context;
 
-            return string.Format(Endpoints.BaseAddress + Endpoints.OrderItems, customerContext.CustomerId, orders.Select(o => o.OrderId).ToCSV());
+            return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.OrderItems, customerContext.CustomerId, orders.Select(o => o.OrderId).ToCSV()), UriKind.Absolute);
         }
     }
 }
diff --git a/tests/ApiAggregator.Tests/ApiAggregate/WebApis/OrdersApi.cs b/tests/ApiAggregator.Tests/ApiAggregate/WebApis/OrdersApi.cs
@@ -9,12 +9,12 @@ public OrdersApi() : base(Endpoints.BaseAddress)
         {
         }
 
-        protected override string GetUrl(IRequestContext context, IApiResult parentApiResult)
+        protected override Uri GetUrl(IRequestContext context, IApiResult parentApiResult)
         {
             // Execute as child to customer api.
             var customer = (CustomerResult)parentApiResult;
 
-            return string.Format(Endpoints.BaseAddress + Endpoints.Orders, customer.Id);
+            return new Uri(string.Format(Endpoints.BaseAddress + Endpoints.Orders, customer.Id), UriKind.Absolute);
         }
     }
 }