Merge pull request #29 from guibranco/develop

Develop
guibranco · Mar 29, 2020 · fdb93b8 · fdb93b8
2 parents 0da74c7 + cc5cfd7
commit fdb93b8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 30 deletions.
diff --git a/Src/ViaCEP/IViaCepClient.cs b/Src/ViaCEP/IViaCepClient.cs
@@ -9,22 +9,13 @@ namespace ViaCep
     /// </summary>
     public interface IViaCepClient
     {
-
         /// <summary>
         /// Searches the specified zip code.
         /// </summary>
         /// <param name="zipCode">The zip code.</param>
         /// <returns></returns>
         ViaCepResult Search(string zipCode);
 
-        /// <summary>
-        /// Searches the asynchronous.
-        /// </summary>
-        /// <param name="zipCode">The zip code.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns></returns>
-        Task<ViaCepResult> SearchAsync(string zipCode, CancellationToken cancellationToken);
-
         /// <summary>
         /// Searches the specified state initials.
         /// </summary>
@@ -34,6 +25,14 @@ public interface IViaCepClient
         /// <returns></returns>
         IEnumerable<ViaCepResult> Search(string stateInitials, string city, string address);
 
+        /// <summary>
+        /// Searches the asynchronous.
+        /// </summary>
+        /// <param name="zipCode">The zip code.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns></returns>
+        Task<ViaCepResult> SearchAsync(string zipCode, CancellationToken cancellationToken);
+
         /// <summary>
         /// Searches the asynchronous.
         /// </summary>
@@ -43,6 +42,5 @@ public interface IViaCepClient
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns></returns>
         Task<IEnumerable<ViaCepResult>> SearchAsync(string stateInitials, string city, string address, CancellationToken cancellationToken);
-
     }
 }
diff --git a/Src/ViaCEP/ViaCEPClient.cs b/Src/ViaCEP/ViaCEPClient.cs
@@ -59,19 +59,6 @@ public ViaCepResult Search(string zipCode)
             return SearchAsync(zipCode, CancellationToken.None).Result;
         }
 
-        /// <summary>
-        /// Searches the asynchronous.
-        /// </summary>
-        /// <param name="zipCode">The zip code.</param>
-        /// <param name="token">The token.</param>
-        /// <returns></returns>
-        public async Task<ViaCepResult> SearchAsync(string zipCode, CancellationToken token)
-        {
-            var response = await _httpClient.GetAsync($"/ws/{zipCode}/json", token).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            return await response.Content.ReadAsAsync<ViaCepResult>(token).ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Searches the specified state initials.
         /// </summary>
@@ -84,23 +71,33 @@ public IEnumerable<ViaCepResult> Search(string stateInitials, string city, strin
             return SearchAsync(stateInitials, city, address, CancellationToken.None).Result;
         }
 
+        /// <summary>
+        /// Searches the asynchronous.
+        /// </summary>
+        /// <param name="zipCode">The zip code.</param>
+        /// <param name="cancellationToken">The token.</param>
+        /// <returns></returns>
+        public async Task<ViaCepResult> SearchAsync(string zipCode, CancellationToken cancellationToken)
+        {
+            var response = await _httpClient.GetAsync($"/ws/{zipCode}/json", cancellationToken).ConfigureAwait(false);
+            response.EnsureSuccessStatusCode();
+            return await response.Content.ReadAsAsync<ViaCepResult>(cancellationToken).ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Searches the asynchronous.
         /// </summary>
         /// <param name="stateInitials">The state initials.</param>
         /// <param name="city">The city.</param>
         /// <param name="address">The address.</param>
-        /// <param name="token">The token.</param>
+        /// <param name="cancellationToken">The token.</param>
         /// <returns></returns>
         public async Task<IEnumerable<ViaCepResult>> SearchAsync(
-            string stateInitials,
-            string city,
-            string address,
-                    CancellationToken token)
+            string stateInitials, string city, string address, CancellationToken cancellationToken)
         {
-            var response = await _httpClient.GetAsync($"/ws/{stateInitials}/{city}/{address}/json", token).ConfigureAwait(false);
+            var response = await _httpClient.GetAsync($"/ws/{stateInitials}/{city}/{address}/json", cancellationToken).ConfigureAwait(false);
             response.EnsureSuccessStatusCode();
-            return await response.Content.ReadAsAsync<List<ViaCepResult>>(token).ConfigureAwait(false);
+            return await response.Content.ReadAsAsync<List<ViaCepResult>>(cancellationToken).ConfigureAwait(false);
         }
 
         #endregion