Merge pull request #149 from azhoshkin/master

Added correct usage of CanRead/CanReadType.

Author: damienbod

src/WebApiContrib.Core.Formatter.Csv/CsvInputFormatter.cs

@@ -45,9 +45,8 @@ public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterCo
             return InputFormatterResult.SuccessAsync(result);
         }
 
-        public override bool CanRead(InputFormatterContext context)
+        protected override bool CanReadType(Type type)
         {
-            var type = context.ModelType;
             if (type == null)
                 throw new ArgumentNullException("type");
 
@@ -127,7 +126,7 @@ private object ReadStream(Type type, Stream stream)
                 }
                 return array;
             }
-            
+
             return list;
         }
     }

src/WebApiContrib.Core.Formatter.MessagePack/MessagePackInputFormatter.cs

@@ -49,19 +49,14 @@ public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputForma
             return formatterResult;
         }
 
-        public override bool CanRead(InputFormatterContext context)
+        protected override bool CanReadType(Type type)
         {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            if (context.ModelType == null)
+            if (type == null)
             {
-                throw new ArgumentException("Model Type cannnot be null");
+                throw new ArgumentException("Type cannot be null");
             }
 
-            var typeInfo = context.ModelType.GetTypeInfo();
+            var typeInfo = type.GetTypeInfo();
             return !typeInfo.IsAbstract && !typeInfo.IsInterface && typeInfo.IsPublic;
         }
     }

src/WebApiContrib.Core.Formatter.Protobuf/ProtobufInputFormatter.cs

@@ -8,14 +8,14 @@ namespace WebApiContrib.Core.Formatter.Protobuf
 {
     public class ProtobufInputFormatter : InputFormatter
     {
-        private readonly ProtobufFormatterOptions _options;
-
-        public ProtobufInputFormatter(ProtobufFormatterOptions protobufFormatterOptions)
-        {
-            _options = protobufFormatterOptions ?? throw new ArgumentNullException(nameof(protobufFormatterOptions));
-            foreach (var contentType in protobufFormatterOptions.SupportedContentTypes)
-            {
-                SupportedMediaTypes.Add(new MediaTypeHeaderValue(contentType));
+        private readonly ProtobufFormatterOptions _options;
+
+        public ProtobufInputFormatter(ProtobufFormatterOptions protobufFormatterOptions)
+        {
+            _options = protobufFormatterOptions ?? throw new ArgumentNullException(nameof(protobufFormatterOptions));
+            foreach (var contentType in protobufFormatterOptions.SupportedContentTypes)
+            {
+                SupportedMediaTypes.Add(new MediaTypeHeaderValue(contentType));
             }
         }
 
@@ -38,7 +38,7 @@ public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterCo
             return InputFormatterResult.SuccessAsync(result);
         }
 
-        public override bool CanRead(InputFormatterContext context)
+        protected override bool CanReadType(Type type)
         {
             return true;
         }

src/WebApiContrib.Core.Formatter.Yaml/YamlInputFormatter.cs

@@ -32,7 +32,7 @@ public override Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterCo
             }
         }
 
-        public override bool CanRead(InputFormatterContext context)
+        protected override bool CanReadType(Type type)
         {
             return true;
         }

tests/WebApiContrib.Core.MessagePack.Tests/MessagePackTests.cs

@@ -73,6 +73,7 @@ public async Task Post_MessagePack_Header()
             };
 
             request.Content = new ByteArrayContent(MessagePackSerializer.Serialize<Book>(book, ContractlessStandardResolver.Instance));
+            request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/x-msgpack");
             var result = await client.SendAsync(request);
 
             var echo = MessagePackSerializer.Deserialize<Book>(await result.Content.ReadAsStreamAsync(), ContractlessStandardResolver.Instance);