diff --git a/DigitalOcean.API.Tests/Clients/DropletsClientTest.cs b/DigitalOcean.API.Tests/Clients/DropletsClientTest.cs index 7cebf2e..7cb18e9 100644 --- a/DigitalOcean.API.Tests/Clients/DropletsClientTest.cs +++ b/DigitalOcean.API.Tests/Clients/DropletsClientTest.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using DigitalOcean.API.Clients; using DigitalOcean.API.Http; @@ -5,6 +6,7 @@ using NSubstitute; using RestSharp; using Xunit; +using Action = DigitalOcean.API.Models.Responses.Action; namespace DigitalOcean.API.Tests.Clients { public class DropletsClientTest { @@ -140,6 +142,7 @@ public void CorrectRequestForDeleteByTag() { } [Fact] + [Obsolete] public void CorrectRequestForListDropletNeighbors() { var factory = Substitute.For(); var client = new DropletsClient(factory); diff --git a/DigitalOcean.API/DigitalOcean.API.csproj b/DigitalOcean.API/DigitalOcean.API.csproj index 7e19cd5..f6c6371 100644 --- a/DigitalOcean.API/DigitalOcean.API.csproj +++ b/DigitalOcean.API/DigitalOcean.API.csproj @@ -19,7 +19,7 @@ - - + + diff --git a/DigitalOcean.API/Extensions/RestSharpExtensions.cs b/DigitalOcean.API/Extensions/RestSharpExtensions.cs index 9b1dc78..59872d5 100755 --- a/DigitalOcean.API/Extensions/RestSharpExtensions.cs +++ b/DigitalOcean.API/Extensions/RestSharpExtensions.cs @@ -19,7 +19,6 @@ public static async Task ExecuteTask(this IRestClient client, RestRequest public static async Task ExecuteTaskRaw(this IRestClient client, RestRequest request) { var ret = await GetResponseContentAsync(client, request); - request.OnBeforeDeserialization(ret); return ret.ThrowIfException(); } @@ -50,7 +49,6 @@ private static Task GetResponseContentAsync(IRestClient theClient, } public static T Deserialize(this RestResponse response) { - response.Request.OnBeforeDeserialization(response); try { var parsedJson = (JObject)JsonConvert.DeserializeObject(response.Content); return JsonDeserializationHelper.DeserializeWithRootElementName(parsedJson, response.Request.RootElement); diff --git a/DigitalOcean.API/Http/Connection.cs b/DigitalOcean.API/Http/Connection.cs index 33220f6..abeceab 100644 --- a/DigitalOcean.API/Http/Connection.cs +++ b/DigitalOcean.API/Http/Connection.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json; using RestSharp; +using RestSharp.Interceptors; namespace DigitalOcean.API.Http { public class Connection : IConnection { @@ -96,7 +97,11 @@ public async Task> GetPaginated(string endpoint, IList parameters) { var request = new RestRequest(endpoint) { - OnBeforeDeserialization = r => { Rates = new RateLimit(r.Headers); } + Interceptors = new List() { + new CompatibilityInterceptor() { + OnBeforeDeserialization = r => { Rates = new RateLimit(r.Headers); } + } + } }; if (parameters == null) {