Use the new helpers as real extension methods

Root cause: the previous revision kept the split helper classes but still invoked them like static utilities, which did not match the requested extension-method style or the naming implied by the new Geocoding.Extensions surface.

Author: niemyjski

src/Geocoding.Core/Extensions/CollectionExtensions.cs

@@ -13,7 +13,7 @@ public static class CollectionExtensions
     /// <typeparam name="T">The collection item type.</typeparam>
     /// <param name="collection">The collection to test.</param>
     /// <returns><c>true</c> when the collection is null or empty.</returns>
-    public static bool IsNullOrEmpty<T>([NotNullWhen(false)] ICollection<T>? collection)
+    public static bool IsNullOrEmpty<T>([NotNullWhen(false)] this ICollection<T>? collection)
     {
         return collection is null || collection.Count == 0;
     }

src/Geocoding.Core/Extensions/EnumerableExtensions.cs

@@ -11,7 +11,7 @@ public static class EnumerableExtensions
     /// <typeparam name="T">The enumerable item type.</typeparam>
     /// <param name="source">The source enumerable.</param>
     /// <param name="actor">The action to execute for each item.</param>
-    public static void ForEach<T>(IEnumerable<T>? source, Action<T> actor)
+    public static void ForEach<T>(this IEnumerable<T>? source, Action<T> actor)
     {
         if (actor is null)
             throw new ArgumentNullException(nameof(actor));

src/Geocoding.Core/Extensions/JsonExtensions.cs

@@ -21,7 +21,7 @@ public static class JsonExtensions
     /// </summary>
     /// <param name="value">The object to serialize.</param>
     /// <returns>The JSON payload, or an empty string when the input is null.</returns>
-    public static string ToJson(object? value)
+    public static string ToJson(this object? value)
     {
         if (value is null)
             return String.Empty;
@@ -35,7 +35,7 @@ public static string ToJson(object? value)
     /// <typeparam name="T">The destination type.</typeparam>
     /// <param name="json">The JSON payload.</param>
     /// <returns>A deserialized instance, or default value for blank input.</returns>
-    public static T? FromJson<T>(string? json)
+    public static T? FromJson<T>(this string? json)
     {
         if (String.IsNullOrWhiteSpace(json))
             return default;

src/Geocoding.MapQuest/BaseRequest.cs

@@ -135,7 +135,7 @@ public virtual string RequestBody
     {
         get
         {
-            return JsonExtensions.ToJson(this);
+            return this.ToJson();
         }
     }
 

src/Geocoding.MapQuest/BatchGeocodeRequest.cs

@@ -16,7 +16,7 @@ public class BatchGeocodeRequest : BaseRequest
     public BatchGeocodeRequest(string key, ICollection<string> addresses)
         : base(key)
     {
-        if (CollectionExtensions.IsNullOrEmpty(addresses))
+        if (addresses.IsNullOrEmpty())
             throw new ArgumentException("addresses can not be null or empty");
 
         Locations = (from l in addresses select new LocationRequest(l)).ToArray();
@@ -34,15 +34,13 @@ public ICollection<LocationRequest> Locations
         get { return _locations; }
         set
         {
-            if (CollectionExtensions.IsNullOrEmpty(value))
+            if (value.IsNullOrEmpty())
                 throw new ArgumentNullException("Locations can not be null or empty!");
 
             _locations.Clear();
-            EnumerableExtensions.ForEach(
-                from v in value
-                where v is not null
-                select v,
-                v => _locations.Add(v));
+            (from v in value
+             where v is not null
+             select v).ForEach(v => _locations.Add(v));
 
             if (_locations.Count == 0)
                 throw new InvalidOperationException("At least one valid Location is required");

src/Geocoding.MapQuest/MapQuestGeocoder.cs

@@ -50,7 +50,7 @@ public MapQuestGeocoder(string key)
 
     private IEnumerable<Address> HandleSingleResponse(MapQuestResponse res)
     {
-        return res is not null && !CollectionExtensions.IsNullOrEmpty(res.Results)
+        return res is not null && !res.Results.IsNullOrEmpty()
             ? HandleSingleResponse(from r in res.Results.OfType<MapQuestResult>()
                                    from l in r.Locations?.OfType<MapQuestLocation>() ?? Enumerable.Empty<MapQuestLocation>()
                                    select l)
@@ -139,7 +139,7 @@ where l.Quality < Quality.COUNTRY
         using var client = BuildClient();
         using var request = CreateRequest(f);
         MapQuestResponse r = await Parse(client, request, cancellationToken).ConfigureAwait(false);
-        if (r is not null && !CollectionExtensions.IsNullOrEmpty(r.Results))
+        if (r is not null && !r.Results.IsNullOrEmpty())
         {
             foreach (MapQuestResult o in r.Results)
             {
@@ -226,7 +226,7 @@ private async Task<MapQuestResponse> Parse(HttpClient client, HttpRequestMessage
             if (String.IsNullOrWhiteSpace(json))
                 throw new Exception("Remote system response with blank: " + requestInfo);
 
-            MapQuestResponse? o = JsonExtensions.FromJson<MapQuestResponse>(json);
+            MapQuestResponse? o = json.FromJson<MapQuestResponse>();
             if (o is null)
                 throw new Exception("Unable to deserialize remote response: " + requestInfo);
 
@@ -260,7 +260,7 @@ private static string BuildResponsePreview(string? body)
                         where !String.IsNullOrWhiteSpace(a)
                         group a by a into ag
                         select ag.Key).ToArray();
-        if (CollectionExtensions.IsNullOrEmpty(adr))
+        if (adr.IsNullOrEmpty())
             throw new ArgumentException("Atleast one none blank item is required in addresses");
 
         var f = new BatchGeocodeRequest(_key, adr) { UseOSM = UseOSM };
@@ -270,7 +270,7 @@ group a by a into ag
 
     private ICollection<ResultItem> HandleBatchResponse(MapQuestResponse res)
     {
-        if (res is not null && !CollectionExtensions.IsNullOrEmpty(res.Results))
+        if (res is not null && !res.Results.IsNullOrEmpty())
         {
             return (from r in res.Results.OfType<MapQuestResult>()
                     let locations = r.Locations?.OfType<MapQuestLocation>().ToArray() ?? Array.Empty<MapQuestLocation>()

src/Geocoding.Microsoft/BingMapsGeocoder.cs

@@ -242,7 +242,7 @@ protected virtual IEnumerable<BingAddress> ParseResponse(Json.Response response)
     {
         var list = new List<BingAddress>();
 
-        if (CollectionExtensions.IsNullOrEmpty(response.ResourceSets))
+        if (response.ResourceSets.IsNullOrEmpty())
             return list;
 
         foreach (var resourceSet in response.ResourceSets)

test/Geocoding.Tests/TolerantStringEnumConverterTest.cs

@@ -12,7 +12,7 @@ public void FromJson_UnknownStringForEnumWithUnknownMember_ReturnsUnknown()
         const string json = "{\"value\":\"something-new\"}";
 
         // Act
-        var model = JsonExtensions.FromJson<EnumWithUnknownModel>(json);
+        var model = json.FromJson<EnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -26,7 +26,7 @@ public void FromJson_UnknownNumberForEnumWithUnknownMember_ReturnsUnknown()
         const string json = "{\"value\":999}";
 
         // Act
-        var model = JsonExtensions.FromJson<EnumWithUnknownModel>(json);
+        var model = json.FromJson<EnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -40,7 +40,7 @@ public void FromJson_NullableEnumWithNullValue_ReturnsNull()
         const string json = "{\"value\":null}";
 
         // Act
-        var model = JsonExtensions.FromJson<NullableEnumWithUnknownModel>(json);
+        var model = json.FromJson<NullableEnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -54,7 +54,7 @@ public void FromJson_UnknownStringWithoutUnknownMember_ReturnsDefaultValue()
         const string json = "{\"value\":\"something-new\"}";
 
         // Act
-        var model = JsonExtensions.FromJson<EnumWithoutUnknownModel>(json);
+        var model = json.FromJson<EnumWithoutUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -68,7 +68,7 @@ public void FromJson_NumericStringForEnumWithUnknownMember_ReturnsUnknown()
         const string json = "{\"value\":\"999\"}";
 
         // Act
-        var model = JsonExtensions.FromJson<EnumWithUnknownModel>(json);
+        var model = json.FromJson<EnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -82,7 +82,7 @@ public void FromJson_NumericValueForByteEnum_ReturnsKnownValue()
         const string json = "{\"value\":1}";
 
         // Act
-        var model = JsonExtensions.FromJson<ByteEnumWithUnknownModel>(json);
+        var model = json.FromJson<ByteEnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);
@@ -96,7 +96,7 @@ public void FromJson_UnknownNumericValueForByteEnum_ReturnsUnknown()
         const string json = "{\"value\":99}";
 
         // Act
-        var model = JsonExtensions.FromJson<ByteEnumWithUnknownModel>(json);
+        var model = json.FromJson<ByteEnumWithUnknownModel>();
 
         // Assert
         Assert.NotNull(model);