Feature/response type issues (#76)

#73
#74
0.17.1

appveyor.yml

@@ -1,4 +1,4 @@
-version: '0.17.1+{build}'
+version: '0.17.2+{build}'
 configuration: Release
 image: Visual Studio 2017
 

src/AspNetCore.Client.BlazorJson/BlazorSimpleJsonSerializer.cs

@@ -14,7 +14,8 @@ namespace AspNetCore.Client.Serializers
 	internal class BlazorSimpleJsonSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "application/json";
-		public string ContentType => CONTENT_TYPE;
+		internal static readonly string PROBLEM_TYPE = "application/problem+json";
+		public string[] ContentTypes => new string[] { CONTENT_TYPE, PROBLEM_TYPE };
 
 		private static readonly IDictionary<Type, Func<string, object>> _knownJsonPrimitives = new Dictionary<Type, Func<string, object>>
 		{
@@ -67,7 +68,7 @@ public HttpContent Serialize<T>(T request)
 			//Can't use the same stream writing as AspNetCore.Client.Serializers.JsonHttpSerializer because Blazor's json doesn't expose those AFAIK
 
 			var json = Json.Serialize(request);
-			return new StringContent(json, Encoding.UTF8, ContentType);
+			return new StringContent(json, Encoding.UTF8, CONTENT_TYPE);
 		}
 	}
 }

src/AspNetCore.Client.Generator.Framework/AspNetCoreHttp/AspNetCoreHttpEndpoint.cs

@@ -198,7 +198,34 @@ public IEnumerable<Header> GetHeaders()
 		/// <returns></returns>
 		public IEnumerable<ResponseType> GetResponseTypes()
 		{
-			return GetChildren().OfType<ResponseType>().OrderBy(x => x.SortOrder);
+			var responseTypes = GetChildren().OfType<ResponseType>();
+
+			var groupedResponses = responseTypes.GroupBy(x => x.Status);
+
+			List<ResponseType> prioritizedResponseTypes = new List<ResponseType>();
+
+			foreach (var responseGroup in groupedResponses)
+			{
+				if (responseGroup.Count() > 1)
+				{
+					if (ResponseTypes.Count(x => x.Status == responseGroup.Key) == 1)
+					{
+						var endpointResponse = ResponseTypes.SingleOrDefault(x => x.Status == responseGroup.Key);
+						prioritizedResponseTypes.Add(endpointResponse);
+					}
+					else
+					{
+						//This will fail, we will let it.
+						prioritizedResponseTypes.AddRange(responseGroup);
+					}
+				}
+				else
+				{
+					prioritizedResponseTypes.Add(responseGroup.Single());
+				}
+			}
+
+			return prioritizedResponseTypes.OrderBy(x => x.SortOrder);
 		}
 
 		/// <summary>

src/AspNetCore.Client.Generator/Helpers.cs

@@ -9,7 +9,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using AspNetCore.Client.Generator.CSharp.AspNetCoreHttp;
+using AspNetCore.Client.Generator.Framework;
+using AspNetCore.Client.Generator.Framework.AspNetCoreHttp.ResponseTypes;
 using AspNetCore.Client.Generator.Framework.AspNetCoreHttp.Routes;
+using AspNetCore.Client.Generator.Framework.Navigation;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing.Template;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -37,6 +40,38 @@ internal static class Helpers
 			return source.Where(x => !typeof(K).IsAssignableFrom(x.GetType()));
 		}
 
+		public static IEnumerable<IParameter> FilterResponseTypes(this IEnumerable<IParameter> source, IEnumerable<ResponseType> priorityResponseTypes)
+		{
+			var responseTypes = source.OfType<ResponseType>();
+
+			var groupedResponses = responseTypes.GroupBy(x => x.Status);
+
+			List<ResponseType> prioritizedResponseTypes = new List<ResponseType>();
+
+			foreach (var responseGroup in groupedResponses)
+			{
+				if (responseGroup.Count() > 1)
+				{
+					if (priorityResponseTypes.Count(x => x.Status == responseGroup.Key) == 1)
+					{
+						var endpointResponse = priorityResponseTypes.SingleOrDefault(x => x.Status == responseGroup.Key);
+						prioritizedResponseTypes.Add(endpointResponse);
+					}
+					else
+					{
+						//This will fail, we will let it.
+						prioritizedResponseTypes.AddRange(responseGroup);
+					}
+				}
+				else
+				{
+					prioritizedResponseTypes.Add(responseGroup.Single());
+				}
+			}
+
+			return source.NotOfType<IParameter, ResponseType>().Union(prioritizedResponseTypes).OrderBy(x => x.DefaultValue == null ? 0 : 1).ThenBy(x => x.SortOrder);
+		}
+
 		public static HttpMethod HttpMethodFromEnum(HttpAttributeType type)
 		{
 			switch (type)

src/AspNetCore.Client.Generator/Output/ClassWriter.cs

@@ -617,7 +617,7 @@ public static string WriteEndpointInterface(AspNetCoreHttpEndpoint endpoint)
 {SharedWriter.GetObsolete(endpoint)}
 {SharedWriter.GetInterfaceReturnType(endpoint.ReturnType, false)} {endpoint.Name}
 (
-{string.Join($",{Environment.NewLine}", endpoint.GetParameters().Select(SharedWriter.GetParameter).NotNull())}
+{string.Join($",{Environment.NewLine}", endpoint.GetParameters().FilterResponseTypes(endpoint.ResponseTypes).Select(SharedWriter.GetParameter).NotNull())}
 );
 
 {SharedWriter.GetObsolete(endpoint)}
@@ -629,7 +629,7 @@ public static string WriteEndpointInterface(AspNetCoreHttpEndpoint endpoint)
 {SharedWriter.GetObsolete(endpoint)}
 {SharedWriter.GetInterfaceReturnType(endpoint.ReturnType, true)} {endpoint.Name}Async
 (
-{string.Join($",{Environment.NewLine}", endpoint.GetParameters().Select(SharedWriter.GetParameter).NotNull())}
+{string.Join($",{Environment.NewLine}", endpoint.GetParameters().FilterResponseTypes(endpoint.ResponseTypes).Select(SharedWriter.GetParameter).NotNull())}
 );
 
 {SharedWriter.GetObsolete(endpoint)}
@@ -649,7 +649,7 @@ public static string WriteEndpointImplementation(AspNetCoreHttpController contro
 {SharedWriter.GetObsolete(endpoint)}
 public {SharedWriter.GetImplementationReturnType(endpoint.ReturnType, false)} {endpoint.Name}
 (
-{string.Join($",{Environment.NewLine}", endpoint.GetParameters().Select(SharedWriter.GetParameter).NotNull())}
+{string.Join($",{Environment.NewLine}", endpoint.GetParameters().FilterResponseTypes(endpoint.ResponseTypes).Select(SharedWriter.GetParameter).NotNull())}
 )
 {{
 {GetMethodDetails(controller, endpoint, false, false)}
@@ -667,7 +667,7 @@ public static string WriteEndpointImplementation(AspNetCoreHttpController contro
 {SharedWriter.GetObsolete(endpoint)}
 public {SharedWriter.GetImplementationReturnType(endpoint.ReturnType, true)} {endpoint.Name}Async
 (
-{string.Join($",{Environment.NewLine}", endpoint.GetParameters().Select(SharedWriter.GetParameter).NotNull())}
+{string.Join($",{Environment.NewLine}", endpoint.GetParameters().FilterResponseTypes(endpoint.ResponseTypes).Select(SharedWriter.GetParameter).NotNull())}
 )
 {{
 {GetMethodDetails(controller, endpoint, true, false)}

src/AspNetCore.Client.JSInterop/JSInteropJsonSerializer.cs

@@ -14,7 +14,8 @@ namespace AspNetCore.Client.Serializers
 	internal class JSInteropJsonSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "application/json";
-		public string ContentType => CONTENT_TYPE;
+		internal static readonly string PROBLEM_TYPE = "application/problem+json";
+		public string[] ContentTypes => new string[] { CONTENT_TYPE, PROBLEM_TYPE };
 
 		private static readonly IDictionary<Type, Func<string, object>> _knownJsonPrimitives = new Dictionary<Type, Func<string, object>>
 		{
@@ -67,7 +68,7 @@ public HttpContent Serialize<T>(T request)
 			//Can't use the same stream writing as AspNetCore.Client.Serializers.JsonHttpSerializer because Blazor's json doesn't expose those AFAIK
 
 			var json = Json.Serialize(request);
-			return new StringContent(json, Encoding.UTF8, ContentType);
+			return new StringContent(json, Encoding.UTF8, CONTENT_TYPE);
 		}
 	}
 }

src/AspNetCore.Client.MessagePack/MessagePackSerializer.cs

@@ -13,7 +13,7 @@ namespace AspNetCore.Client.Serializers
 	internal class MessagePackSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "application/x-msgpack";
-		public string ContentType => CONTENT_TYPE;
+		public string[] ContentTypes => new string[] { CONTENT_TYPE };
 
 		/// <summary>
 		/// Deserializes the request content which is assumed to be MessagePack into a object of <typeparamref name="T"/>
@@ -36,7 +36,7 @@ public HttpContent Serialize<T>(T request)
 		{
 			var data = MessagePack.MessagePackSerializer.Serialize(request, ContractlessStandardResolver.Instance);
 			var content = new ByteArrayContent(data);
-			content.Headers.ContentType = new MediaTypeHeaderValue(ContentType);
+			content.Headers.ContentType = new MediaTypeHeaderValue(CONTENT_TYPE);
 			content.Headers.ContentLength = data.Length;
 
 			return content;

src/AspNetCore.Client.Protobuf/ProtobufSerializer.cs

@@ -13,7 +13,7 @@ namespace AspNetCore.Client.Serializers
 	internal class ProtobufSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "application/x-protobuf";
-		public string ContentType => CONTENT_TYPE;
+		public string[] ContentTypes => new string[] { CONTENT_TYPE };
 
 		/// <summary>
 		/// Deserializes the request content which is assumed to be protobuf into a object of <typeparamref name="T"/>
@@ -37,7 +37,7 @@ public HttpContent Serialize<T>(T request)
 			var stream = new MemoryStream();
 			Serializer.Serialize(stream, request);
 			var content = new StreamContent(stream);
-			content.Headers.ContentType = new MediaTypeHeaderValue(ContentType);
+			content.Headers.ContentType = new MediaTypeHeaderValue(CONTENT_TYPE);
 			return content;
 		}
 	}

src/AspNetCore.Client/Serializers/HttpSerializer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -27,13 +28,23 @@ public HttpSerializer(IServiceProvider provider, ClientConfiguration config)
 			_provider = provider;
 			_config = config;
 
-			Serializer = (IHttpContentSerializer)_provider.GetService(config.Serializer);
+			Serializer = (IHttpContentSerializer)_provider.GetService(_config.Serializer);
 
 			Deserializers = new Dictionary<string, IHttpContentSerializer>();
 			foreach (var serType in _config.Deserializers)
 			{
 				var ser = (IHttpContentSerializer)_provider.GetService(serType);
-				Deserializers.Add(ser.ContentType, ser);
+				foreach (var contentType in ser.ContentTypes ?? Enumerable.Empty<string>())
+				{
+					if (Deserializers.ContainsKey(contentType))
+					{
+						Deserializers[contentType] = ser;
+					}
+					else
+					{
+						Deserializers.Add(contentType, ser);
+					}
+				}
 			}
 		}
 

src/AspNetCore.Client/Serializers/IHttpContentSerializer.cs

@@ -10,9 +10,9 @@ namespace AspNetCore.Client.Serializers
 	public interface IHttpContentSerializer
 	{
 		/// <summary>
-		/// Content-Type that this Serializer can parse
+		/// Content-Types that this can deserialize
 		/// </summary>
-		string ContentType { get; }
+		string[] ContentTypes { get; }
 
 		/// <summary>
 		/// Deserializes the content of the http response into the type provided

src/AspNetCore.Client/Serializers/JsonHttpSerializer.cs

@@ -15,7 +15,8 @@ namespace AspNetCore.Client.Serializers
 	internal class JsonHttpSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "application/json";
-		public string ContentType => CONTENT_TYPE;
+		internal static readonly string PROBLEM_TYPE = "application/problem+json";
+		public string[] ContentTypes => new string[] { CONTENT_TYPE, PROBLEM_TYPE };
 
 
 		private static readonly IDictionary<Type, Func<string, object>> _knownJsonPrimitives = new Dictionary<Type, Func<string, object>>
@@ -69,7 +70,7 @@ public async Task<T> Deserialize<T>(HttpContent content)
 		public HttpContent Serialize<T>(T request)
 		{
 			var json = JsonConvert.SerializeObject(request);
-			return new StringContent(json, Encoding.UTF8, ContentType);
+			return new StringContent(json, Encoding.UTF8, CONTENT_TYPE);
 		}
 	}
 }

src/AspNetCore.Client/Serializers/TextHttpSerializer.cs

@@ -14,7 +14,7 @@ namespace AspNetCore.Client.Serializers
 	internal class TextHttpSerializer : IHttpContentSerializer
 	{
 		internal static readonly string CONTENT_TYPE = "text/plain";
-		public string ContentType => CONTENT_TYPE;
+		public string[] ContentTypes => new string[] { CONTENT_TYPE };
 
 
 		/// <summary>