diff --git a/Activout.RestClient.Newtonsoft.Json.Test/Activout.RestClient.Newtonsoft.Json.Test.csproj b/Activout.RestClient.Newtonsoft.Json.Test/Activout.RestClient.Newtonsoft.Json.Test.csproj new file mode 100644 index 0000000..b592bfb --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json.Test/Activout.RestClient.Newtonsoft.Json.Test.csproj @@ -0,0 +1,28 @@ + + + + + false + net8.0 + default + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + diff --git a/Activout.RestClient.Test/DomainExceptionTests/DefaultDomainExceptionErrorObjectTests.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DefaultDomainExceptionErrorObjectTests.cs similarity index 97% rename from Activout.RestClient.Test/DomainExceptionTests/DefaultDomainExceptionErrorObjectTests.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DefaultDomainExceptionErrorObjectTests.cs index 7428b0c..61b627b 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/DefaultDomainExceptionErrorObjectTests.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DefaultDomainExceptionErrorObjectTests.cs @@ -8,7 +8,7 @@ using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { [ErrorResponse(typeof(MyApiErrorResponse))] [DomainException(typeof(SomeDomainErrorObjectException))] @@ -43,6 +43,7 @@ public DefaultDomainExceptionErrorObjectTests() _defaultMapperApiClient = Services.CreateRestClientFactory() .CreateBuilder() + .WithNewtonsoftJson() .With(_mockHttp.ToHttpClient()) .BaseUri(new Uri(BaseUri)) .Build(); diff --git a/Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorEnumTests.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorEnumTests.cs similarity index 97% rename from Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorEnumTests.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorEnumTests.cs index a6bba92..aa86902 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorEnumTests.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorEnumTests.cs @@ -8,7 +8,7 @@ using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { internal class MyDomainErrorEnumException : Exception { @@ -47,6 +47,7 @@ public DomainExceptionErrorEnumTests() _myApiClient = Services.CreateRestClientFactory() .CreateBuilder() .With(_mockHttp.ToHttpClient()) + .WithNewtonsoftJson() .BaseUri(new Uri(BaseUri)) .Build(); } diff --git a/Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorObjectTests.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorObjectTests.cs similarity index 97% rename from Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorObjectTests.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorObjectTests.cs index 8eddc7c..2e99c85 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/DomainExceptionErrorObjectTests.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/DomainExceptionErrorObjectTests.cs @@ -9,7 +9,7 @@ using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { internal class MyDomainErrorObject { @@ -78,6 +78,7 @@ public DomainExceptionErrorObjectTests() _myApiClient = Services.CreateRestClientFactory() .CreateBuilder() + .WithNewtonsoftJson() .With(_mockHttp.ToHttpClient()) .BaseUri(new Uri(BaseUri)) .With(new MyDomainExceptionMapperFactory()) diff --git a/Activout.RestClient.Test/DomainExceptionTests/MyApiError.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiError.cs similarity index 52% rename from Activout.RestClient.Test/DomainExceptionTests/MyApiError.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiError.cs index 6795aa8..1bd2570 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/MyApiError.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiError.cs @@ -1,4 +1,4 @@ -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { public enum MyApiError { diff --git a/Activout.RestClient.Test/DomainExceptionTests/MyApiErrorResponse.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiErrorResponse.cs similarity index 70% rename from Activout.RestClient.Test/DomainExceptionTests/MyApiErrorResponse.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiErrorResponse.cs index 19883bf..b010980 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/MyApiErrorResponse.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyApiErrorResponse.cs @@ -1,4 +1,4 @@ -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { public class MyApiErrorResponse { diff --git a/Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorAttribute.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorAttribute.cs similarity index 79% rename from Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorAttribute.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorAttribute.cs index 3dad713..573d320 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorAttribute.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorAttribute.cs @@ -1,6 +1,6 @@ using Activout.RestClient.DomainExceptions; -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { internal class MyDomainErrorAttribute : DomainErrorAttribute { diff --git a/Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorEnum.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorEnum.cs similarity index 73% rename from Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorEnum.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorEnum.cs index b83fbec..03090fe 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/MyDomainErrorEnum.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainErrorEnum.cs @@ -1,4 +1,4 @@ -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { public enum MyDomainErrorEnum { diff --git a/Activout.RestClient.Test/DomainExceptionTests/MyDomainHttpErrorAttribute.cs b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainHttpErrorAttribute.cs similarity index 53% rename from Activout.RestClient.Test/DomainExceptionTests/MyDomainHttpErrorAttribute.cs rename to Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainHttpErrorAttribute.cs index 9ad9103..d488765 100644 --- a/Activout.RestClient.Test/DomainExceptionTests/MyDomainHttpErrorAttribute.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/DomainExceptions/MyDomainHttpErrorAttribute.cs @@ -1,8 +1,9 @@ using System.Net; +using Activout.RestClient.DomainExceptions; -namespace Activout.RestClient.Test.DomainExceptionTests +namespace Activout.RestClient.Newtonsoft.Json.Test.DomainExceptions { - internal class MyDomainHttpErrorAttribute : DomainExceptions.DomainHttpErrorAttribute + internal class MyDomainHttpErrorAttribute : DomainHttpErrorAttribute { public MyDomainHttpErrorAttribute(HttpStatusCode httpStatusCode, MyDomainErrorEnum domainErrorValue) : base( httpStatusCode, domainErrorValue) diff --git a/Activout.RestClient.Newtonsoft.Json.Test/LoggerFactoryHelpers.cs b/Activout.RestClient.Newtonsoft.Json.Test/LoggerFactoryHelpers.cs new file mode 100644 index 0000000..ad5f135 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json.Test/LoggerFactoryHelpers.cs @@ -0,0 +1,20 @@ +using Microsoft.Extensions.Logging; +using Xunit.Abstractions; + +namespace Activout.RestClient.Newtonsoft.Json.Test +{ + public static class LoggerFactoryHelpers + { + public static ILoggerFactory CreateLoggerFactory(ITestOutputHelper outputHelper) + { + return LoggerFactory.Create(builder => + { + builder + .AddFilter("Microsoft", LogLevel.Warning) + .AddFilter("System", LogLevel.Warning) + .AddFilter("Activout.RestClient", LogLevel.Debug) + .AddXUnit(outputHelper); + }); + } + } +} \ No newline at end of file diff --git a/Activout.RestClient.Test/MovieReviews/ErrorResponse.cs b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/ErrorResponse.cs similarity index 80% rename from Activout.RestClient.Test/MovieReviews/ErrorResponse.cs rename to Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/ErrorResponse.cs index ba48292..c3e04dc 100644 --- a/Activout.RestClient.Test/MovieReviews/ErrorResponse.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/ErrorResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Activout.RestClient.Test.MovieReviews +namespace Activout.RestClient.Newtonsoft.Json.Test.MovieReviews { public class ErrorResponse { diff --git a/Activout.RestClient.Test/MovieReviews/IMovieReviewService.cs b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/IMovieReviewService.cs similarity index 97% rename from Activout.RestClient.Test/MovieReviews/IMovieReviewService.cs rename to Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/IMovieReviewService.cs index 949aecc..6fb1c6f 100644 --- a/Activout.RestClient.Test/MovieReviews/IMovieReviewService.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/IMovieReviewService.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; -namespace Activout.RestClient.Test.MovieReviews +namespace Activout.RestClient.Newtonsoft.Json.Test.MovieReviews { [Path("movies")] [ErrorResponse(typeof(ErrorResponse))] diff --git a/Activout.RestClient.Test/MovieReviews/Movie.cs b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Movie.cs similarity index 74% rename from Activout.RestClient.Test/MovieReviews/Movie.cs rename to Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Movie.cs index e31231c..fc0c87f 100644 --- a/Activout.RestClient.Test/MovieReviews/Movie.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Movie.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Activout.RestClient.Test.MovieReviews +namespace Activout.RestClient.Newtonsoft.Json.Test.MovieReviews { [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")] public class Movie diff --git a/Activout.RestClient.Test/MovieReviews/Review.cs b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Review.cs similarity index 82% rename from Activout.RestClient.Test/MovieReviews/Review.cs rename to Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Review.cs index c11ee0a..e6037f7 100644 --- a/Activout.RestClient.Test/MovieReviews/Review.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/MovieReviews/Review.cs @@ -1,4 +1,4 @@ -namespace Activout.RestClient.Test.MovieReviews +namespace Activout.RestClient.Newtonsoft.Json.Test.MovieReviews { public class Review { diff --git a/Activout.RestClient.Test/JsonDeserializerTest.cs b/Activout.RestClient.Newtonsoft.Json.Test/NewtonsoftJsonDeserializerTest.cs similarity index 89% rename from Activout.RestClient.Test/JsonDeserializerTest.cs rename to Activout.RestClient.Newtonsoft.Json.Test/NewtonsoftJsonDeserializerTest.cs index 7c4ba01..cdd9945 100644 --- a/Activout.RestClient.Test/JsonDeserializerTest.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/NewtonsoftJsonDeserializerTest.cs @@ -3,13 +3,14 @@ using System.Linq; using System.Net.Http; using System.Text; +using Activout.RestClient.Newtonsoft.Json; using Activout.RestClient.Serialization.Implementation; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test +namespace Activout.RestClient.Newtonsoft.Json.Test { [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")] public class Data @@ -22,9 +23,9 @@ public interface IClient Data GetData(); } - public class JsonDeserializerTest + public class NewtonsoftJsonDeserializerTest { - public JsonDeserializerTest() + public NewtonsoftJsonDeserializerTest() { _restClientFactory = Services.CreateRestClientFactory(); _mockHttp = new MockHttpMessageHandler(); @@ -76,7 +77,7 @@ public void TestCamelCaseWithDeserializer() MockCamelCaseResponse(); var client = CreateRestClientBuilder() - .With(new JsonDeserializer(new JsonSerializerSettings + .With(new NewtonsoftJsonDeserializer(new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() })) @@ -97,7 +98,7 @@ public void TestCamelCaseWithSerializationManager() MockCamelCaseResponse(); var deserializers = SerializationManager.DefaultDeserializers.ToList(); - deserializers.Add(new JsonDeserializer(new JsonSerializerSettings + deserializers.Add(new NewtonsoftJsonDeserializer(new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() })); @@ -118,8 +119,9 @@ public void TestCamelCaseWithSerializationManager() private IRestClientBuilder CreateRestClientBuilder() { return _restClientFactory.CreateBuilder() + .WithNewtonsoftJson() .With(_mockHttp.ToHttpClient()) .BaseUri(new Uri(BaseUri)); } } -} \ No newline at end of file +} diff --git a/Activout.RestClient.Test/RestClientTests.cs b/Activout.RestClient.Newtonsoft.Json.Test/RestClientTests.cs similarity index 99% rename from Activout.RestClient.Test/RestClientTests.cs rename to Activout.RestClient.Newtonsoft.Json.Test/RestClientTests.cs index f778ae4..ec19802 100644 --- a/Activout.RestClient.Test/RestClientTests.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/RestClientTests.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Activout.RestClient.Helpers.Implementation; -using Activout.RestClient.Test.MovieReviews; +using Activout.RestClient.Newtonsoft.Json.Test.MovieReviews; using Microsoft.Extensions.Logging; using Moq; using Newtonsoft.Json; @@ -15,7 +15,7 @@ using Xunit; using Xunit.Abstractions; -namespace Activout.RestClient.Test +namespace Activout.RestClient.Newtonsoft.Json.Test { public class RestClientTests { @@ -37,6 +37,7 @@ public RestClientTests(ITestOutputHelper outputHelper) private IRestClientBuilder CreateRestClientBuilder() { return _restClientFactory.CreateBuilder() + .WithNewtonsoftJson() .Accept("application/json") .ContentType("application/json") .With(_loggerFactory.CreateLogger()) diff --git a/Activout.RestClient.Test/SerializationOrderTest.cs b/Activout.RestClient.Newtonsoft.Json.Test/SerializationOrderTest.cs similarity index 93% rename from Activout.RestClient.Test/SerializationOrderTest.cs rename to Activout.RestClient.Newtonsoft.Json.Test/SerializationOrderTest.cs index 36b8cab..032c3d6 100644 --- a/Activout.RestClient.Test/SerializationOrderTest.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/SerializationOrderTest.cs @@ -2,13 +2,12 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Activout.RestClient.Serialization.Implementation; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test +namespace Activout.RestClient.Newtonsoft.Json.Test { public class SerializationOrderTest { @@ -64,7 +63,7 @@ public interface ISerializationOrderClient private ISerializationOrderClient CreateClient(int orderOfJsonDeserializer) { return CreateRestClientBuilder() - .With(new JsonDeserializer(new JsonSerializerSettings() + .With(new NewtonsoftJsonDeserializer(new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() { @@ -78,6 +77,7 @@ private ISerializationOrderClient CreateClient(int orderOfJsonDeserializer) private IRestClientBuilder CreateRestClientBuilder() { return _restClientFactory.CreateBuilder() + .WithNewtonsoftJson() .With(_mockHttp.ToHttpClient()) .BaseUri(new Uri(BaseUri)); } diff --git a/Activout.RestClient.Test/SimpleValueObjectTest.cs b/Activout.RestClient.Newtonsoft.Json.Test/SimpleValueObjectTest.cs similarity index 97% rename from Activout.RestClient.Test/SimpleValueObjectTest.cs rename to Activout.RestClient.Newtonsoft.Json.Test/SimpleValueObjectTest.cs index e4ede52..a942464 100644 --- a/Activout.RestClient.Test/SimpleValueObjectTest.cs +++ b/Activout.RestClient.Newtonsoft.Json.Test/SimpleValueObjectTest.cs @@ -7,7 +7,7 @@ using RichardSzalay.MockHttp; using Xunit; -namespace Activout.RestClient.Test +namespace Activout.RestClient.Newtonsoft.Json.Test { public class MySimpleValueObject { @@ -128,6 +128,7 @@ private IValueObjectClient CreateClient() { return _restClientFactory.CreateBuilder() .With(_mockHttp.ToHttpClient()) + .WithNewtonsoftJson() .BaseUri(new Uri(BaseUri)) .Build(); } diff --git a/Activout.RestClient.Newtonsoft.Json/Activout.RestClient.Newtonsoft.Json.csproj b/Activout.RestClient.Newtonsoft.Json/Activout.RestClient.Newtonsoft.Json.csproj new file mode 100644 index 0000000..b4d8fa4 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/Activout.RestClient.Newtonsoft.Json.csproj @@ -0,0 +1,23 @@ + + + + + net8.0 + enable + enable + README.md + + + + + + + + + + + + + + + diff --git a/Activout.RestClient/Serialization/Implementation/JsonHelper.cs b/Activout.RestClient.Newtonsoft.Json/JsonHelper.cs similarity index 75% rename from Activout.RestClient/Serialization/Implementation/JsonHelper.cs rename to Activout.RestClient.Newtonsoft.Json/JsonHelper.cs index 721978d..c902b4d 100644 --- a/Activout.RestClient/Serialization/Implementation/JsonHelper.cs +++ b/Activout.RestClient.Newtonsoft.Json/JsonHelper.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; -namespace Activout.RestClient.Serialization.Implementation +namespace Activout.RestClient.Newtonsoft.Json { public static class JsonHelper { @@ -14,4 +14,4 @@ static JsonHelper() public static IReadOnlyCollection SupportedMediaTypes { get; } } -} \ No newline at end of file +} diff --git a/Activout.RestClient.Newtonsoft.Json/LICENSE b/Activout.RestClient.Newtonsoft.Json/LICENSE new file mode 100644 index 0000000..09f33ff --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 David Eriksson + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonDeserializer.cs b/Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonDeserializer.cs new file mode 100644 index 0000000..4ae0bd4 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonDeserializer.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Threading.Tasks; +using Activout.RestClient.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace Activout.RestClient.Newtonsoft.Json; + +public class NewtonsoftJsonDeserializer : IDeserializer +{ + private readonly JsonSerializerSettings _jsonSerializerSettings; + + public IReadOnlyCollection SupportedMediaTypes => JsonHelper.SupportedMediaTypes; + + public NewtonsoftJsonDeserializer(JsonSerializerSettings jsonSerializerSettings) + { + _jsonSerializerSettings = jsonSerializerSettings; + } + + public int Order { get; set; } + + public async Task Deserialize(HttpContent content, Type type) + { + if (type == typeof(JObject)) + { + return JObject.Parse(await content.ReadAsStringAsync()); + } + + if (type == typeof(JArray)) + { + return JArray.Parse(await content.ReadAsStringAsync()); + } + + return JsonConvert.DeserializeObject(await content.ReadAsStringAsync(), type, _jsonSerializerSettings); + } + + public bool CanDeserialize(MediaType mediaType) + { + return SupportedMediaTypes.Contains(mediaType); + } +} \ No newline at end of file diff --git a/Activout.RestClient/Serialization/Implementation/JsonSerializer.cs b/Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonSerializer.cs similarity index 75% rename from Activout.RestClient/Serialization/Implementation/JsonSerializer.cs rename to Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonSerializer.cs index 42f117c..0ba6afd 100644 --- a/Activout.RestClient/Serialization/Implementation/JsonSerializer.cs +++ b/Activout.RestClient.Newtonsoft.Json/NewtonsoftJsonSerializer.cs @@ -1,18 +1,19 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Text; +using Activout.RestClient.Serialization; using Newtonsoft.Json; -namespace Activout.RestClient.Serialization.Implementation +namespace Activout.RestClient.Newtonsoft.Json { - public class JsonSerializer : ISerializer + public class NewtonsoftJsonSerializer : ISerializer { private readonly JsonSerializerSettings _jsonSerializerSettings; public IReadOnlyCollection SupportedMediaTypes => JsonHelper.SupportedMediaTypes; - public JsonSerializer(JsonSerializerSettings jsonSerializerSettings) + public NewtonsoftJsonSerializer(JsonSerializerSettings jsonSerializerSettings) { _jsonSerializerSettings = jsonSerializerSettings; } @@ -31,4 +32,4 @@ public bool CanSerialize(MediaType mediaType) return SupportedMediaTypes.Contains(mediaType); } } -} \ No newline at end of file +} diff --git a/Activout.RestClient.Newtonsoft.Json/README.md b/Activout.RestClient.Newtonsoft.Json/README.md new file mode 100644 index 0000000..acc10a2 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/README.md @@ -0,0 +1,18 @@ +# Activout.RestClient.Xml + +This project is an extension to [Activout.RestClient](https://www.nuget.org/packages/Activout.RestClient/). + +It provides support for JSON serialization and deserialization via Newtonsoft.Json. + +See the [Activout.RestClient README](https://github.com/twogood/Activout.RestClient/tree/main) for more information. + +## Need help implementing Activout.RestClient? + +Contact [david@activout.se](mailto:david@activout.se) to order a support package, starting at 20000 SEK or 1800 EUR or 2000 USD. + +## License + +[MIT License](LICENSE). + +## About Activout +[Activout AB](http://activout.se) is a software company in Ronneby, Sweden. diff --git a/Activout.RestClient.Newtonsoft.Json/RestClientBuilderNewtonsoftJsonExtensions.cs b/Activout.RestClient.Newtonsoft.Json/RestClientBuilderNewtonsoftJsonExtensions.cs new file mode 100644 index 0000000..7e99c35 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/RestClientBuilderNewtonsoftJsonExtensions.cs @@ -0,0 +1,29 @@ +using Newtonsoft.Json; +using System.Collections.Immutable; +using System.Diagnostics.CodeAnalysis; + +namespace Activout.RestClient.Newtonsoft.Json +{ + [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] + public static class RestClientBuilderNewtonsoftJsonExtensions + { + public static readonly IReadOnlyCollection DefaultJsonConverters = new List + { new SimpleValueObjectConverter() }.ToImmutableList(); + + public static readonly JsonSerializerSettings DefaultJsonSerializerSettings = new() + { + Converters = DefaultJsonConverters.ToList() + }; + + public static IRestClientBuilder WithNewtonsoftJson(this IRestClientBuilder builder, + JsonSerializerSettings? jsonSerializerSettings = null) + { + var settings = jsonSerializerSettings ?? DefaultJsonSerializerSettings; + + builder.With(new NewtonsoftJsonSerializer(settings)); + builder.With(new NewtonsoftJsonDeserializer(settings)); + + return builder; + } + } +} \ No newline at end of file diff --git a/Activout.RestClient/Serialization/Implementation/SimpleValueObjectConverter.cs b/Activout.RestClient.Newtonsoft.Json/SimpleValueObjectConverter.cs similarity index 60% rename from Activout.RestClient/Serialization/Implementation/SimpleValueObjectConverter.cs rename to Activout.RestClient.Newtonsoft.Json/SimpleValueObjectConverter.cs index dab8e91..30c367e 100644 --- a/Activout.RestClient/Serialization/Implementation/SimpleValueObjectConverter.cs +++ b/Activout.RestClient.Newtonsoft.Json/SimpleValueObjectConverter.cs @@ -1,8 +1,7 @@ -using System; using System.Reflection; using Newtonsoft.Json; -namespace Activout.RestClient.Serialization.Implementation +namespace Activout.RestClient.Newtonsoft.Json { /* * We define a "simple value object" as an object that has: @@ -14,17 +13,16 @@ namespace Activout.RestClient.Serialization.Implementation */ public class SimpleValueObjectConverter : JsonConverter { - public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { - var valueProperty = GetValueProperty(value.GetType()); - serializer.Serialize(writer, valueProperty.GetValue(value)); + var valueProperty = GetValueProperty(value!.GetType()); + serializer.Serialize(writer, valueProperty!.GetValue(value)); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, - Newtonsoft.Json.JsonSerializer serializer) + public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { var valueProperty = GetValueProperty(objectType); - var value = serializer.Deserialize(reader, valueProperty.PropertyType); + var value = serializer.Deserialize(reader, valueProperty!.PropertyType); return value == null ? null : Activator.CreateInstance(objectType, value); } @@ -38,19 +36,19 @@ public override bool CanConvert(Type objectType) return constructor != null; } - private static ConstructorInfo GetValueConstructor(Type objectType, PropertyInfo valueProperty) + private static ConstructorInfo? GetValueConstructor(Type objectType, PropertyInfo valueProperty) { - return objectType.GetConstructor(new[] { valueProperty.PropertyType }); + return objectType.GetConstructor([valueProperty.PropertyType]); } - private static PropertyInfo GetValueProperty(Type objectType) + private static PropertyInfo? GetValueProperty(Type objectType) { return objectType.GetProperty("Value"); } - private static ConstructorInfo GetDefaultConstructor(Type objectType) + private static ConstructorInfo? GetDefaultConstructor(Type objectType) { - return objectType.GetConstructor(new Type[0]); + return objectType.GetConstructor([]); } } -} \ No newline at end of file +} diff --git a/Activout.RestClient.Newtonsoft.Json/make-nuget.sh b/Activout.RestClient.Newtonsoft.Json/make-nuget.sh new file mode 100755 index 0000000..197fa73 --- /dev/null +++ b/Activout.RestClient.Newtonsoft.Json/make-nuget.sh @@ -0,0 +1,26 @@ +#!/bin/sh +set -e +cd "$(dirname "$0")" || exit 1 +VERSION=$1 +if [ -z "$VERSION" ]; then + echo "Missing version on command line!" >&2 + exit 1 +fi +dotnet pack \ + -p:Title="Activout Rest Client - Newtonsoft.Json Support" \ + -p:Description="Newtonsoft.Json Support for Activout.RestClient." \ + -p:PackageVersion="$VERSION" \ + -p:PackageLicenseExpression="MIT" \ + -p:PackageProjectUrl="https://github.com/twogood/Activout.RestClient" \ + -p:RepositoryType="git" \ + -p:RepositoryUrl="https://github.com/twogood/Activout.RestClient.git" \ + --configuration=Release \ + --include-symbols \ + --include-source \ + ./Activout.RestClient.Newtonsoft.Json.csproj + +echo "Upload:" +echo "https://www.nuget.org/packages/manage/upload" + +ls -1 "$(pwd)"/bin/Release/*."$VERSION".*nupkg + diff --git a/Activout.RestClient.Test/BodyArgumentFormPostTest.cs b/Activout.RestClient.Test/BodyArgumentFormPostTest.cs index 0145245..e32f88e 100644 --- a/Activout.RestClient.Test/BodyArgumentFormPostTest.cs +++ b/Activout.RestClient.Test/BodyArgumentFormPostTest.cs @@ -4,7 +4,6 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Newtonsoft.Json; using RichardSzalay.MockHttp; using Xunit; @@ -16,7 +15,7 @@ public class FormData public string SomeString { get; set; } = "foo"; public string Unused { get; set; } = null; public int SomeNumber { get; set; } = 42; - [JsonProperty("another")] public string AnotherString { get; set; } = "bar"; + [FormKey("another")] public string AnotherString { get; set; } = "bar"; } [ContentType("application/x-www-form-urlencoded")] @@ -116,4 +115,5 @@ await client.PostEnumerable(new[] _mockHttp.VerifyNoOutstandingExpectation(); } } -} \ No newline at end of file +} + diff --git a/Activout.RestClient.Test/MultipartFormDataContentTest.cs b/Activout.RestClient.Test/MultipartFormDataContentTest.cs index 5409cac..1bd2519 100644 --- a/Activout.RestClient.Test/MultipartFormDataContentTest.cs +++ b/Activout.RestClient.Test/MultipartFormDataContentTest.cs @@ -221,4 +221,5 @@ private IMultipartFormDataContentClient CreateClient() .Build(); } } -} \ No newline at end of file +} + diff --git a/Activout.RestClient.Xml/Activout.RestClient.Xml.csproj b/Activout.RestClient.Xml/Activout.RestClient.Xml.csproj index 6652270..2e1b308 100644 --- a/Activout.RestClient.Xml/Activout.RestClient.Xml.csproj +++ b/Activout.RestClient.Xml/Activout.RestClient.Xml.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/Activout.RestClient.Xml/make-nuget.sh b/Activout.RestClient.Xml/make-nuget.sh index 4b5ff26..df1e7f4 100755 --- a/Activout.RestClient.Xml/make-nuget.sh +++ b/Activout.RestClient.Xml/make-nuget.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e cd "$(dirname "$0")" || exit 1 VERSION=$1 if [ -z "$VERSION" ]; then diff --git a/Activout.RestClient/Activout.RestClient.csproj b/Activout.RestClient/Activout.RestClient.csproj index 5515c56..93b3aea 100644 --- a/Activout.RestClient/Activout.RestClient.csproj +++ b/Activout.RestClient/Activout.RestClient.csproj @@ -7,7 +7,6 @@ - diff --git a/Activout.RestClient/FormKeyAttribute.cs b/Activout.RestClient/FormKeyAttribute.cs new file mode 100644 index 0000000..c40d91e --- /dev/null +++ b/Activout.RestClient/FormKeyAttribute.cs @@ -0,0 +1,25 @@ +using System; + +namespace Activout.RestClient +{ + /// + /// Specifies the key name for a property when serialized to form-url-encoded content. + /// + [AttributeUsage(AttributeTargets.Property)] + public class FormKeyAttribute : Attribute + { + /// + /// Gets the key name for the property. + /// + public string KeyName { get; } + + /// + /// Initializes a new instance of the class with the specified key name. + /// + /// The key name for the property. + public FormKeyAttribute(string keyName) + { + KeyName = keyName; + } + } +} diff --git a/Activout.RestClient/Serialization/Implementation/FormUrlEncodedSerializer.cs b/Activout.RestClient/Serialization/Implementation/FormUrlEncodedSerializer.cs index 591073f..ce2c3d9 100644 --- a/Activout.RestClient/Serialization/Implementation/FormUrlEncodedSerializer.cs +++ b/Activout.RestClient/Serialization/Implementation/FormUrlEncodedSerializer.cs @@ -3,7 +3,6 @@ using System.Net.Http; using System.Reflection; using System.Text; -using Newtonsoft.Json; namespace Activout.RestClient.Serialization.Implementation { @@ -51,8 +50,9 @@ private static string SerializeValue(object value) private static string GetKey(MemberInfo property) { - var attribute = property.GetCustomAttribute(); - return attribute == null ? property.Name : attribute.PropertyName; + var attribute = property.GetCustomAttribute(); + return attribute == null ? property.Name : attribute.KeyName; } } -} \ No newline at end of file +} + diff --git a/Activout.RestClient/Serialization/Implementation/JsonDeserializer.cs b/Activout.RestClient/Serialization/Implementation/JsonDeserializer.cs deleted file mode 100644 index 98a633f..0000000 --- a/Activout.RestClient/Serialization/Implementation/JsonDeserializer.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace Activout.RestClient.Serialization.Implementation -{ - public class JsonDeserializer : IDeserializer - { - private readonly JsonSerializerSettings _jsonSerializerSettings; - - public IReadOnlyCollection SupportedMediaTypes => JsonHelper.SupportedMediaTypes; - - public JsonDeserializer(JsonSerializerSettings jsonSerializerSettings) - { - _jsonSerializerSettings = jsonSerializerSettings; - } - - public int Order { get; set; } - - public async Task Deserialize(HttpContent content, Type type) - { - if (type == typeof(JObject)) - { - return JObject.Parse(await content.ReadAsStringAsync()); - } - - if (type == typeof(JArray)) - { - return JArray.Parse(await content.ReadAsStringAsync()); - } - - return JsonConvert.DeserializeObject(await content.ReadAsStringAsync(), type, _jsonSerializerSettings); - } - - public bool CanDeserialize(MediaType mediaType) - { - return SupportedMediaTypes.Contains(mediaType); - } - } -} \ No newline at end of file diff --git a/Activout.RestClient/Serialization/Implementation/SerializationManager.cs b/Activout.RestClient/Serialization/Implementation/SerializationManager.cs index 9c2da51..47708b8 100644 --- a/Activout.RestClient/Serialization/Implementation/SerializationManager.cs +++ b/Activout.RestClient/Serialization/Implementation/SerializationManager.cs @@ -2,24 +2,14 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using Newtonsoft.Json; namespace Activout.RestClient.Serialization.Implementation { public class SerializationManager : ISerializationManager { - public static readonly IReadOnlyCollection DefaultJsonConverters = new List - {new SimpleValueObjectConverter()}.ToImmutableList(); - - private static readonly JsonSerializerSettings DefaultJsonSerializerSettings = new JsonSerializerSettings - { - Converters = DefaultJsonConverters.ToList() - }; - public static readonly IReadOnlyCollection DefaultSerializers = new List { new FormUrlEncodedSerializer(), - new JsonSerializer(DefaultJsonSerializerSettings), new StringSerializer(), new ByteArraySerializer() } @@ -28,7 +18,6 @@ public class SerializationManager : ISerializationManager public static readonly IReadOnlyCollection DefaultDeserializers = new List { - new JsonDeserializer(DefaultJsonSerializerSettings), new StringDeserializer(), new ByteArrayDeserializer() } @@ -57,4 +46,5 @@ public ISerializer GetSerializer(MediaType mediaType) return Serializers.FirstOrDefault(serializer => serializer.CanSerialize(mediaType)); } } -} \ No newline at end of file +} + diff --git a/ActivoutRestClient.sln b/ActivoutRestClient.sln index 788d8d0..a784f49 100644 --- a/ActivoutRestClient.sln +++ b/ActivoutRestClient.sln @@ -11,6 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Activout.RestClient.Xml", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Activout.RestClient.Xml.Test", "Activout.RestClient.Xml.Test\Activout.RestClient.Xml.Test.csproj", "{AEDBF6CA-65A6-42E3-B991-3B954ACCA94D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Activout.RestClient.Newtonsoft.Json", "Activout.RestClient.Newtonsoft.Json\Activout.RestClient.Newtonsoft.Json.csproj", "{0D33957E-E4C6-4C17-AEBA-6D6B2A90F1CB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Activout.RestClient.Newtonsoft.Json.Test", "Activout.RestClient.Newtonsoft.Json.Test\Activout.RestClient.Newtonsoft.Json.Test.csproj", "{D4DE7929-0435-46AB-93F3-5615536CA08D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +37,14 @@ Global {AEDBF6CA-65A6-42E3-B991-3B954ACCA94D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AEDBF6CA-65A6-42E3-B991-3B954ACCA94D}.Release|Any CPU.ActiveCfg = Release|Any CPU {AEDBF6CA-65A6-42E3-B991-3B954ACCA94D}.Release|Any CPU.Build.0 = Release|Any CPU + {0D33957E-E4C6-4C17-AEBA-6D6B2A90F1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D33957E-E4C6-4C17-AEBA-6D6B2A90F1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D33957E-E4C6-4C17-AEBA-6D6B2A90F1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D33957E-E4C6-4C17-AEBA-6D6B2A90F1CB}.Release|Any CPU.Build.0 = Release|Any CPU + {D4DE7929-0435-46AB-93F3-5615536CA08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4DE7929-0435-46AB-93F3-5615536CA08D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4DE7929-0435-46AB-93F3-5615536CA08D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4DE7929-0435-46AB-93F3-5615536CA08D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index c1007f5..ce43fab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ # Activout Rest Client -[![SonarCloud](https://sonarcloud.io/api/project_badges/measure?project=Activout.RestClient&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Activout.RestClient) -[![NuGet Badge](https://buildstats.info/nuget/Activout.RestClient)](https://www.nuget.org/packages/Activout.RestClient/) Create a REST(ish) API client only by defining the C# interface you want. @@ -50,6 +48,7 @@ var restClientFactory = Services.CreateRestClientFactory(); var movieReviewService = restClientFactory .CreateBuilder() .With(_httpClient) + .WithNewtonsoftJson() .BaseUri(new Uri("https://example.com/movieReviewService")) .Build(); @@ -83,7 +82,11 @@ public static IServiceCollection AddRestClient(this IServiceCollection self) return self; } ``` +## Breaking changes in version 5 +- Replaced `[JsonProperty]` (`JsonPropertyAttribute`) in HTTP form data classes with `[FormKey]` (`FormKeyAttribute`) to + avoid dependency on Newtonsoft.Json. +- Extracted package `Activout.RestClient.Newtonsoft.Json` to make Activout.RestClient independent of Newtonsoft.Json. ## Breaking changes in version 3 diff --git a/make-nuget.sh b/make-nuget.sh index f44f70e..fc1a061 100755 --- a/make-nuget.sh +++ b/make-nuget.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e cd "$(dirname "$0")" || exit 1 VERSION=$1 if [ -z "$VERSION" ]; then @@ -21,3 +22,4 @@ dotnet pack \ echo "Upload:" echo "https://www.nuget.org/packages/manage/upload" +ls -1 "$(pwd)"/Activout.RestClient/bin/Release/*."$VERSION".*nupkg