Restructured classes for consistency

src/CloudFlare.NET/CloudFlare.NET.csproj

@@ -72,30 +72,32 @@
     <Compile Include="CloudFlareResponseBase.cs" />
     <Compile Include="CloudFlareResultInfo.cs" />
     <Compile Include="DnsRecord.cs" />
+    <Compile Include="DnsRecordClient.Implementation.cs" />
+    <Compile Include="DnsRecordClient.Interface.cs" />
     <Compile Include="DnsRecordClientExtensions.cs" />
+    <Compile Include="DnsRecordGetParameters.cs" />
+    <Compile Include="DnsRecordHttpClientExtensions.cs" />
+    <Compile Include="DnsRecordOrderTypes.cs" />
     <Compile Include="DnsRecordType.cs" />
-    <Compile Include="HttpClientDnsRecordExtensions.cs" />
     <Compile Include="HttpClientExtensions.cs" />
-    <Compile Include="HttpClientZoneExtensions.cs" />
     <Compile Include="ICloudFlareClient.cs" />
     <Compile Include="IdentifierTag.cs" />
     <Compile Include="IdentifierTag.IEquatable.cs" />
-    <Compile Include="IDnsRecordClient.cs" />
     <Compile Include="IIdentifier.cs" />
     <Compile Include="IModified.cs" />
-    <Compile Include="IZoneClient.cs" />
-    <Compile Include="PagedDnsRecordOrderFieldTypes.cs" />
-    <Compile Include="PagedDnsRecordParameters.cs" />
     <Compile Include="PagedParameters.cs" />
     <Compile Include="PagedParametersExtensions.cs" />
     <Compile Include="PagedParametersMatchType.cs" />
     <Compile Include="PagedParametersOrderType.cs" />
-    <Compile Include="PagedZoneOrderFieldTypes.cs" />
-    <Compile Include="PagedZoneParameters.cs" />
     <Compile Include="Serialization\IsoDateTimeOffsetConverter.cs" />
     <Compile Include="Serialization\ToStringJsonConverter.cs" />
     <Compile Include="Zone.cs" />
+    <Compile Include="ZoneClient.Implementation.cs" />
+    <Compile Include="ZoneClient.Interface.cs" />
     <Compile Include="ZoneClientExtensions.cs" />
+    <Compile Include="ZoneGetParameters.cs" />
+    <Compile Include="ZoneHttpClientExtensions.cs" />
+    <Compile Include="ZoneOrderTypes.cs" />
     <Compile Include="ZoneStatusType.cs" />
     <None Include="app.config" />
     <None Include="CloudFlare.NET.nuspec" />

src/CloudFlare.NET/CloudFlareClient.cs

@@ -13,7 +13,7 @@
 
     /// <inheritdoc/>
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    public class CloudFlareClient : ICloudFlareClient
+    public partial class CloudFlareClient : ICloudFlareClient
     {
         private static readonly Lazy<HttpClient> LazyClient = new Lazy<HttpClient>(
             () => CreateDefaultHttpClient(),
@@ -141,66 +141,6 @@ public static HttpClientHandler CreateDefaultHttpClientHandler()
             return handler;
         }
 
-        /// <inheritdoc/>
-        public Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
-            CancellationToken cancellationToken,
-            PagedZoneParameters parameters = null,
-            CloudFlareAuth auth = null)
-        {
-            return _client.GetZonesAsync(cancellationToken, auth ?? _auth, parameters);
-        }
-
-        /// <inheritdoc/>
-        public Task<IEnumerable<Zone>> GetAllZonesAsync(
-            CancellationToken cancellationToken,
-            PagedZoneParameters parameters = null,
-            CloudFlareAuth auth = null)
-        {
-            return GetAllPagedResultsAsync<Zone, PagedZoneParameters, PagedZoneOrderFieldTypes>(
-                _client.GetZonesAsync,
-                cancellationToken,
-                auth ?? _auth,
-                50,
-                parameters);
-        }
-
-        /// <inheritdoc/>
-        public Task<Zone> GetZoneAsync(
-            IdentifierTag zoneId,
-            CancellationToken cancellationToken,
-            CloudFlareAuth auth = null)
-        {
-            return _client.GetZoneAsync(zoneId, cancellationToken, auth ?? _auth);
-        }
-
-        /// <inheritdoc/>
-        public Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAsync(
-            IdentifierTag zoneId,
-            CancellationToken cancellationToken,
-            PagedDnsRecordParameters parameters = null,
-            CloudFlareAuth auth = null)
-        {
-            return _client.GetDnsRecordsAsync(zoneId, cancellationToken, auth ?? _auth, parameters);
-        }
-
-        /// <inheritdoc/>
-        public Task<IEnumerable<DnsRecord>> GetAllDnsRecordsAsync(
-            IdentifierTag zoneId,
-            CancellationToken cancellationToken,
-            PagedDnsRecordParameters parameters = null,
-            CloudFlareAuth auth = null)
-        {
-            if (zoneId == null)
-                throw new ArgumentNullException(nameof(zoneId));
-
-            return GetAllPagedResultsAsync<DnsRecord, PagedDnsRecordParameters, PagedDnsRecordOrderFieldTypes>(
-                (ct, a, p) => _client.GetDnsRecordsAsync(zoneId, ct, a, p),
-                cancellationToken,
-                auth ?? _auth,
-                100,
-                parameters);
-        }
-
         private static async Task<IEnumerable<TResult>> GetAllPagedResultsAsync<TResult, TParams, TOrder>(
             Func<CancellationToken, CloudFlareAuth, TParams, Task<CloudFlareResponse<IReadOnlyList<TResult>>>> request,
             CancellationToken cancellationToken,

src/CloudFlare.NET/DnsRecordClient.Implementation.cs

@@ -0,0 +1,40 @@
+namespace CloudFlare.NET
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <inheritdoc/>
+    public partial class CloudFlareClient : IDnsRecordClient
+    {
+        /// <inheritdoc/>
+        public Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAsync(
+            IdentifierTag zoneId,
+            CancellationToken cancellationToken,
+            DnsRecordGetParameters parameters = null,
+            CloudFlareAuth auth = null)
+        {
+            return _client.GetDnsRecordsAsync(zoneId, cancellationToken, auth ?? _auth, parameters);
+        }
+
+        /// <inheritdoc/>
+        public Task<IEnumerable<DnsRecord>> GetAllDnsRecordsAsync(
+            IdentifierTag zoneId,
+            CancellationToken cancellationToken,
+            DnsRecordGetParameters parameters = null,
+            CloudFlareAuth auth = null)
+        {
+            if (zoneId == null)
+                throw new ArgumentNullException(nameof(zoneId));
+
+            return GetAllPagedResultsAsync<DnsRecord, DnsRecordGetParameters, DnsRecordOrderTypes>(
+                (ct, a, p) => _client.GetDnsRecordsAsync(zoneId, ct, a, p),
+                cancellationToken,
+                auth ?? _auth,
+                100,
+                parameters);
+        }
+    }
+}

src/CloudFlare.NET/IDnsRecordClient.cs → src/CloudFlare.NET/DnsRecordClient.Interface.cs

@@ -19,7 +19,7 @@ public interface IDnsRecordClient
         Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAsync(
             IdentifierTag zoneId,
             CancellationToken cancellationToken,
-            PagedDnsRecordParameters parameters = null,
+            DnsRecordGetParameters parameters = null,
             CloudFlareAuth auth = null);
 
         /// <summary>
@@ -30,7 +30,7 @@ Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAsync(
         Task<IEnumerable<DnsRecord>> GetAllDnsRecordsAsync(
             IdentifierTag zoneId,
             CancellationToken cancellationToken,
-            PagedDnsRecordParameters parameters = null,
+            DnsRecordGetParameters parameters = null,
             CloudFlareAuth auth = null);
     }
 }

src/CloudFlare.NET/DnsRecordClientExtensions.cs

@@ -18,7 +18,7 @@ public static class DnsRecordClientExtensions
         public static Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAsync(
             this IDnsRecordClient client,
             IdentifierTag zoneId,
-            PagedDnsRecordParameters parameters = null)
+            DnsRecordGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -36,7 +36,7 @@ public static Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAs
             this IDnsRecordClient client,
             IdentifierTag zoneId,
             CloudFlareAuth auth,
-            PagedDnsRecordParameters parameters = null)
+            DnsRecordGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -55,7 +55,7 @@ public static Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAs
         public static Task<IEnumerable<DnsRecord>> GetAllDnsRecordsAsync(
             this IDnsRecordClient client,
             IdentifierTag zoneId,
-            PagedDnsRecordParameters parameters = null)
+            DnsRecordGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -73,7 +73,7 @@ public static Task<IEnumerable<DnsRecord>> GetAllDnsRecordsAsync(
             this IDnsRecordClient client,
             IdentifierTag zoneId,
             CloudFlareAuth auth,
-            PagedDnsRecordParameters parameters = null)
+            DnsRecordGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));

src/CloudFlare.NET/PagedDnsRecordParameters.cs → src/CloudFlare.NET/DnsRecordGetParameters.cs

@@ -10,18 +10,18 @@
     /// Specifies the parameters of the <see cref="IDnsRecordClient.GetDnsRecordsAsync"/> request.
     /// </summary>
     /// <seealso href="https://api.cloudflare.com/#dns-records-for-a-zone-list-dns-records"/>
-    public class PagedDnsRecordParameters : PagedParameters<PagedDnsRecordOrderFieldTypes>
+    public class DnsRecordGetParameters : PagedParameters<DnsRecordOrderTypes>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="PagedDnsRecordParameters"/> class.
+        /// Initializes a new instance of the <see cref="DnsRecordGetParameters"/> class.
         /// </summary>
-        public PagedDnsRecordParameters(
+        public DnsRecordGetParameters(
             DnsRecordType? type = null,
             string name = null,
             string content = null,
             int page = 0,
             int perPage = 0,
-            PagedDnsRecordOrderFieldTypes order = default(PagedDnsRecordOrderFieldTypes),
+            DnsRecordOrderTypes order = default(DnsRecordOrderTypes),
             PagedParametersOrderType direction = default(PagedParametersOrderType),
             PagedParametersMatchType match = default(PagedParametersMatchType))
             : base(page, perPage, order, direction, match)
@@ -50,15 +50,15 @@ public PagedDnsRecordParameters(
         public string Content { get; }
 
         /// <summary>
-        /// Creates a <see cref="PagedZoneParameters"/> from the <paramref name="data"/> copying any matching
+        /// Creates a <see cref="DnsRecordGetParameters"/> from the <paramref name="data"/> copying any matching
         /// properties.
         /// </summary>
-        public static PagedDnsRecordParameters Create(object data)
+        public static DnsRecordGetParameters Create(object data)
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data));
 
-            return JObject.FromObject(data).ToObject<PagedDnsRecordParameters>();
+            return JObject.FromObject(data).ToObject<DnsRecordGetParameters>();
         }
     }
 }

src/CloudFlare.NET/HttpClientDnsRecordExtensions.cs → src/CloudFlare.NET/DnsRecordHttpClientExtensions.cs

@@ -11,7 +11,7 @@
     /// Extension methods on <see cref="HttpClient"/> to wrap the Zone APIs
     /// </summary>
     /// <seealso href="https://api.cloudflare.com/#dns-records-for-a-zone"/>
-    public static class HttpClientDnsRecordExtensions
+    public static class DnsRecordHttpClientExtensions
     {
         /// <summary>
         /// Gets the zones for the account specified by the <paramref name="auth"/> details.
@@ -22,7 +22,7 @@ public static Task<CloudFlareResponse<IReadOnlyList<DnsRecord>>> GetDnsRecordsAs
             IdentifierTag zoneId,
             CancellationToken cancellationToken,
             CloudFlareAuth auth,
-            PagedDnsRecordParameters parameters = null)
+            DnsRecordGetParameters parameters = null)
         {
             if (zoneId == null)
                 throw new ArgumentNullException(nameof(zoneId));

src/CloudFlare.NET/PagedDnsRecordOrderFieldTypes.cs → src/CloudFlare.NET/DnsRecordOrderTypes.cs

@@ -15,7 +15,7 @@
     [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1303:ConstFieldNamesMustBeginWithUpperCaseLetter",
         Justification = "Named to match serialized values.")]
     [JsonConverter(typeof(StringEnumConverter))]
-    public enum PagedDnsRecordOrderFieldTypes
+    public enum DnsRecordOrderTypes
     {
         none,
         type,

src/CloudFlare.NET/ZoneClient.Implementation.cs

@@ -0,0 +1,44 @@
+namespace CloudFlare.NET
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <inheritdoc/>
+    public partial class CloudFlareClient : IZoneClient
+    {
+        /// <inheritdoc/>
+        public Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
+            CancellationToken cancellationToken,
+            ZoneGetParameters parameters = null,
+            CloudFlareAuth auth = null)
+        {
+            return _client.GetZonesAsync(cancellationToken, auth ?? _auth, parameters);
+        }
+
+        /// <inheritdoc/>
+        public Task<IEnumerable<Zone>> GetAllZonesAsync(
+            CancellationToken cancellationToken,
+            ZoneGetParameters parameters = null,
+            CloudFlareAuth auth = null)
+        {
+            return GetAllPagedResultsAsync<Zone, ZoneGetParameters, ZoneOrderTypes>(
+                _client.GetZonesAsync,
+                cancellationToken,
+                auth ?? _auth,
+                50,
+                parameters);
+        }
+
+        /// <inheritdoc/>
+        public Task<Zone> GetZoneAsync(
+            IdentifierTag zoneId,
+            CancellationToken cancellationToken,
+            CloudFlareAuth auth = null)
+        {
+            return _client.GetZoneAsync(zoneId, cancellationToken, auth ?? _auth);
+        }
+    }
+}

src/CloudFlare.NET/IZoneClient.cs → src/CloudFlare.NET/ZoneClient.Interface.cs

@@ -18,7 +18,7 @@ public interface IZoneClient
         /// <seealso href="https://api.cloudflare.com/#zone-list-zones"/>
         Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
             CancellationToken cancellationToken,
-            PagedZoneParameters parameters = null,
+            ZoneGetParameters parameters = null,
             CloudFlareAuth auth = null);
 
         /// <summary>
@@ -27,7 +27,7 @@ Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
         /// <seealso href="https://api.cloudflare.com/#zone-list-zones"/>
         Task<IEnumerable<Zone>> GetAllZonesAsync(
             CancellationToken cancellationToken,
-            PagedZoneParameters parameters = null,
+            ZoneGetParameters parameters = null,
             CloudFlareAuth auth = null);
 
         /// <summary>

src/CloudFlare.NET/ZoneClientExtensions.cs

@@ -17,7 +17,7 @@ public static class ZoneClientExtensions
         /// <seealso href="https://api.cloudflare.com/#zone-list-zones"/>
         public static Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
             this IZoneClient client,
-            PagedZoneParameters parameters = null)
+            ZoneGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -32,7 +32,7 @@ public static Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
         public static Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
             this IZoneClient client,
             CloudFlareAuth auth,
-            PagedZoneParameters parameters = null)
+            ZoneGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -48,7 +48,7 @@ public static Task<CloudFlareResponse<IReadOnlyList<Zone>>> GetZonesAsync(
         /// <seealso href="https://api.cloudflare.com/#zone-list-zones"/>
         public static Task<IEnumerable<Zone>> GetAllZonesAsync(
             this IZoneClient client,
-            PagedZoneParameters parameters = null)
+            ZoneGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));
@@ -63,7 +63,7 @@ public static Task<IEnumerable<Zone>> GetAllZonesAsync(
         public static Task<IEnumerable<Zone>> GetAllZonesAsync(
             this IZoneClient client,
             CloudFlareAuth auth,
-            PagedZoneParameters parameters = null)
+            ZoneGetParameters parameters = null)
         {
             if (client == null)
                 throw new ArgumentNullException(nameof(client));