Returning responses directly in service to prevent extra allocation

biegehydra · Oct 22, 2023 · c04fce1 · c04fce1
1 parent fcdcc77
commit c04fce1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/LibPostalApi/Controllers/LibPostalController.cs b/LibPostalApi/Controllers/LibPostalController.cs
@@ -32,13 +32,13 @@ public IActionResult ExpandAddresses([FromBody] ExpandAddressesRequest? request)
                 return BadRequest($"Too many addresses. Request had {request.Addresses.Count} addresses. Only 1000 addresses are allowed per request.");
             }
 
-            var results = _libPostal.ExpandAddress(request.Addresses, request.ExpandOptions);
-            if (results.Results == null)
+            var response = _libPostal.ExpandAddress(request.Addresses, request.ExpandOptions);
+            if (response?.ExpandResults == null)
             {
                 return StatusCode((int)HttpStatusCode.InternalServerError, "An internal server error occurred.");
             }
 
-            return Ok(new ExpandAddressesResponse(results.Results, request.Addresses.Count, results.Successes, results.Failures));
+            return Ok(response);
         }
 
         [HttpPost]
@@ -57,13 +57,13 @@ public IActionResult ParseAddresses([FromBody] ParseAddressesRequest? request)
                 return BadRequest($"Too many addresses. Request had {request.Addresses.Count} addresses. Only 1000 addresses are allowed per request.");
             }
 
-            var results = _libPostal.ParseAddress(request.Addresses, request.ParseOptions);
-            if (results.Results == null)
+            var response = _libPostal.ParseAddress(request.Addresses, request.ParseOptions);
+            if (response?.ParseResults == null)
             {
                 return StatusCode((int)HttpStatusCode.InternalServerError, "An internal server error occurred.");
             }
 
-            return Ok(new ParseAddressesResponse(results.Results, request.Addresses.Count, results.Successes, results.Failures));
+            return Ok(response);
         }
     }
 }
diff --git a/LibPostalApi/Interfaces/ILibPostalService.cs b/LibPostalApi/Interfaces/ILibPostalService.cs
@@ -5,6 +5,6 @@ namespace LibPostalApi.Interfaces;
 
 public interface ILibPostalService
 {
-    (AddressParserResponse[]? Results, int Successes, int Failures) ParseAddress(List<string> addresses, ParseOptions? dtoOptions = null);
-    (AddressExpansionResponse[]? Results, int Successes, int Failures) ExpandAddress(List<string> addresses, ExpandOptions? dtoOptions = null);
+    ParseAddressesResponse? ParseAddress(List<string> addresses, ParseOptions? dtoOptions = null);
+    ExpandAddressesResponse? ExpandAddress(List<string> addresses, ExpandOptions? dtoOptions = null);
 }
diff --git a/LibPostalApi/Program.cs b/LibPostalApi/Program.cs
@@ -39,7 +39,7 @@
         var libPostal = app.Services.GetRequiredService<ILibPostalService>();
         var testParse = libPostal.ParseAddress(TestData.TestAddress);
         var testExpand = libPostal.ParseAddress(TestData.TestAddress);
-        if (testParse.Results == null || testExpand.Results == null)
+        if (testParse?.ParseResults == null || testExpand?.ParseResults == null)
         {
             context.Response.StatusCode = 500;
             await context.Response.WriteAsync("LibPostalApi is not healthy");
@@ -49,7 +49,6 @@
         Console.WriteLine($"Health check endpoint called at {DateTime.UtcNow}");
     }
 
-    // Call the next middleware in the pipeline
     await next.Invoke();
 });
 

diff --git a/LibPostalApi/Services/LibPostalService.cs b/LibPostalApi/Services/LibPostalService.cs
@@ -16,7 +16,7 @@ public LibPostalService(IConfiguration config)
         var currentDir = Directory.GetCurrentDirectory();
         Console.WriteLine($"CurrentDir: {currentDir}");
         dataDir = Path.Combine(Directory.GetParent(currentDir)!.FullName, dataDir!);
-        Console.WriteLine($"Combine: {dataDir}");     
+        Console.WriteLine($"CombinedDir: {dataDir}");     
 
         _libPostal = LibPostal.GetInstance(dataDir);
         _libPostal.LoadParser();
@@ -25,15 +25,15 @@ public LibPostalService(IConfiguration config)
         Initialized = true;
     }
 
-    public (AddressParserResponse[]? Results, int Successes, int Failures) ParseAddress(List<string> addresses, ParseOptions? dtoOptions)
+    public ParseAddressesResponse? ParseAddress(List<string> addresses, ParseOptions? dtoOptions)
     {
         try
         {
             var domainOptions = _libPostal.GetAddressParserDefaultOptions();
 
             dtoOptions?.MapValuesTo(domainOptions);
 
-            var results = new AddressParserResponse[addresses.Count];
+            AddressParserResponse[] results = new AddressParserResponse[addresses.Count];
 
             var successes = 0;
             var failures = 0;
@@ -59,7 +59,7 @@ public LibPostalService(IConfiguration config)
                     Console.WriteLine($"Error Inside Parse. Input: {addresses} : {ex}");
                 }
             }
-            return (results, successes, failures);
+            return new (results, results.Length, successes, failures);
         }
         catch (Exception ex)
         {
@@ -68,15 +68,15 @@ public LibPostalService(IConfiguration config)
         }
     }
 
-    public (AddressExpansionResponse[]? Results, int Successes, int Failures) ExpandAddress(List<string> addresses, ExpandOptions? dtoOptions)
+    public ExpandAddressesResponse? ExpandAddress(List<string> addresses, ExpandOptions? dtoOptions)
     {
         try
         {
             var domainOptions = _libPostal.GetAddressExpansionDefaultOptions();
 
             dtoOptions?.MapValuesTo(domainOptions);
 
-            var results = new AddressExpansionResponse[addresses.Count];
+            AddressExpansionResponse[] results = new AddressExpansionResponse[addresses.Count];
 
             var successes = 0;
             var failures = 0;
@@ -103,7 +103,7 @@ public LibPostalService(IConfiguration config)
                     Console.WriteLine($"Error Inside Expand. Input: {addresses} : {ex}");
                 }
             }
-            return (results, successes, failures);
+            return new (results, results.Length, successes, failures);
         }
         catch (Exception ex)
         {