Merge pull request #39 from galvesribeiro/multi-media-types

Allow a MediaTypeHandler to support multiple media types.
OrleansContrib · Jan 20, 2020 · 9a343e3 · 9a343e3
2 parents 6708c0e + e4bf15c
commit 9a343e3
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 11 deletions.
diff --git a/src/Orleans.Http.Abstractions/IMediaTypeHandler.cs b/src/Orleans.Http.Abstractions/IMediaTypeHandler.cs
@@ -7,7 +7,7 @@ namespace Orleans.Http.Abstractions
 {
     public interface IMediaTypeHandler
     {
-        string MediaType { get; }
+        string[] MediaTypes { get; }
         ValueTask Serialize(object obj, PipeWriter writer);
         ValueTask<object> Deserialize(PipeReader reader, Type type, CancellationToken cancellationToken);
     }

diff --git a/src/Orleans.Http.MediaTypes.Protobuf/ProtobufMediaTypeHandler.cs b/src/Orleans.Http.MediaTypes.Protobuf/ProtobufMediaTypeHandler.cs
@@ -9,7 +9,7 @@ namespace Orleans.Http.MediaTypes.Protobuf
 {
     internal sealed class ProtobufMediaTypeHandler : IMediaTypeHandler
     {
-        public string MediaType => "application/protobuf";
+        public string[] MediaTypes => new[] { "application/protobuf" };
 
         public ValueTask<object> Deserialize(PipeReader reader, Type type, CancellationToken cancellationToken)
         {

diff --git a/src/Orleans.Http/FormsMediaTypeHandler.cs b/src/Orleans.Http/FormsMediaTypeHandler.cs
@@ -12,7 +12,7 @@ namespace Orleans.Http
     internal sealed class FormsMediaTypeHandler : IMediaTypeHandler
     {
         private static readonly Type _dicType = typeof(Dictionary<string, string>);
-        public string MediaType => "application/x-www-form-urlencoded";
+        public string[] MediaTypes => new[] { "application/x-www-form-urlencoded" };
 
         public async ValueTask<object> Deserialize(PipeReader reader, Type type, CancellationToken cancellationToken)
         {

diff --git a/src/Orleans.Http/JsonMediaTypeHandler.cs b/src/Orleans.Http/JsonMediaTypeHandler.cs
@@ -9,9 +9,8 @@ namespace Orleans.Http
 {
     internal sealed class JsonMediaTypeHandler : IMediaTypeHandler
     {
-        private const string MEDIA_TYPE = "application/json";
         private readonly JsonSerializerOptions _options;
-        public string MediaType => MEDIA_TYPE;
+        public string[] MediaTypes => new[] { "application/json; charset=utf-8", "application/json;charset=utf-8", "application/json" };
 
         public JsonMediaTypeHandler(JsonSerializerOptions options)
         {

diff --git a/src/Orleans.Http/MediaTypeManager.cs b/src/Orleans.Http/MediaTypeManager.cs
@@ -19,11 +19,23 @@ internal sealed class MediaTypeManager
         public MediaTypeManager(IServiceProvider serviceProvider)
         {
             this._logger = serviceProvider.GetRequiredService<ILoggerFactory>().CreateLogger<MediaTypeManager>();
-            this._handlers = serviceProvider.GetServices<IMediaTypeHandler>()?.ToDictionary(h => h.MediaType, h => h, StringComparer.InvariantCultureIgnoreCase);
-            if (this._handlers == null || this._handlers.Count == 0)
+            this._handlers = new Dictionary<string, IMediaTypeHandler>(StringComparer.InvariantCultureIgnoreCase);
+
+            var handlersRegistered = serviceProvider.GetServices<IMediaTypeHandler>();
+            if (handlersRegistered != null)
+            {
+                foreach (var handler in handlersRegistered)
+                {
+                    foreach (var mediaType in handler.MediaTypes)
+                    {
+                        this._handlers[mediaType] = handler;
+                    }
+                }
+            }
+
+            if (this._handlers.Count == 0)
             {
                 this._logger.LogWarning("There are no IMediaTypeHandlers registered! Request body will be ignored.");
-                this._handlers = new Dictionary<string, IMediaTypeHandler>();
             }
         }
 
@@ -40,7 +52,7 @@ public async ValueTask<bool> Serialize(string mediaType, object obj, PipeWriter
             }
             catch (Exception exc)
             {
-                this._logger.LogWarning(exc, $"Failure to serialize body into '{handler.MediaType}' using {handler.GetType().FullName}: {exc.Message}.");
+                this._logger.LogWarning(exc, $"Failure to serialize body into '{mediaType}' using {handler.GetType().FullName}: {exc.Message}.");
             }
 
             return false;

diff --git a/src/Orleans.Http/XMLMediaTypeHandler.cs b/src/Orleans.Http/XMLMediaTypeHandler.cs
@@ -11,7 +11,7 @@ namespace Orleans.Http
     internal sealed class XMLMediaTypeHandler : IMediaTypeHandler
     {
         private readonly ConcurrentDictionary<string, XmlSerializer> _serializers = new ConcurrentDictionary<string, XmlSerializer>();
-        public string MediaType => "application/xml";
+        public string[] MediaTypes => new[] { "application/xml" };
 
         public ValueTask<object> Deserialize(PipeReader reader, Type type, CancellationToken cancellationToken)
         {

diff --git a/test/Orleans.Http.Test/HttpTests.cs b/test/Orleans.Http.Test/HttpTests.cs
@@ -106,12 +106,24 @@ public async Task RouteTest()
         }
 
         [Fact]
-        public async Task FormsTest()
+        public async Task JsonTest()
         {
             var payload = new TestPayload();
             payload.Number = 12340000;
             payload.Text = "Test text";
 
+            var url = "/grains/test/00000000-0000-0000-0000-000000000000/JsonTest";
+            var response = await this._http.PostAsync(url, new StringContent(JsonSerializer.Serialize(payload, typeof(TestPayload)), Encoding.UTF8, TestExtensions.JSON));
+            Assert.True(response.IsSuccessStatusCode);
+            var stream = await response.Content.ReadAsStreamAsync();
+            var resp = await JsonSerializer.DeserializeAsync<TestPayload>(stream);
+            Assert.True(payload.Number == resp.Number);
+            Assert.True(payload.Text == resp.Text);
+        }
+
+        [Fact]
+        public async Task FormsTest()
+        {
             var url = "/grains/test/00000000-0000-0000-0000-000000000000/FormTest";
             var dic = new Dictionary<string, string>();
             dic["Test"] = "testing dic";

diff --git a/test/Orleans.Http.Test/TestGrain.cs b/test/Orleans.Http.Test/TestGrain.cs
@@ -6,6 +6,7 @@
 using Orleans.Http.Abstractions;
 using ProtoBuf;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace Orleans.Http.Test
 {
@@ -82,14 +83,19 @@ public interface ITestGrain : IGrainWithGuidKey
 
         [HttpPost("{grainId}/FormTest")]
         Task FormTest([FromBody]Dictionary<string, string> payload);
+
+        [HttpPost("{grainId}/JsonTest")]
+        Task<TestPayload> JsonTest([FromBody]TestPayload payload);
     }
 
     [ProtoContract]
     public class TestPayload
     {
         [ProtoMember(1)]
+        [JsonPropertyName("number")]
         public int Number { get; set; }
         [ProtoMember(2)]
+        [JsonPropertyName("text")]
         public string Text { get; set; }
     }
 
@@ -196,6 +202,16 @@ public Task FormTest(Dictionary<string, string> payload)
 
             throw new ArgumentException(nameof(payload));
         }
+
+        public Task<TestPayload> JsonTest(TestPayload payload)
+        {
+            if (payload != null && payload.Number == 12340000 && payload.Text == "Test text")
+            {
+                return Task.FromResult(payload);
+            }
+
+            throw new ArgumentException(nameof(payload));
+        }
     }
 
     public class RandomGuidRouteGrainProvider : IRouteGrainProvider