Fix regression causing Newtonsoft JsonRequired to be ignored

domaindrivendev · Apr 29, 2020 · c4dcb1b · c4dcb1b
1 parent 32505fb
commit c4dcb1b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/JsonPropertyExtensions.cs b/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/JsonPropertyExtensions.cs
@@ -17,9 +17,14 @@ public static bool TryGetMemberInfo(this JsonProperty jsonProperty, out MemberIn
 
         public static bool IsRequiredSpecified(this JsonProperty jsonProperty)
         {
-            var jsonPropertyAttributeData = jsonProperty.TryGetMemberInfo(out MemberInfo memberInfo)
-                ? memberInfo.GetCustomAttributesData().FirstOrDefault(attrData => attrData.AttributeType == typeof(JsonPropertyAttribute))
-                : null;
+            if (!jsonProperty.TryGetMemberInfo(out MemberInfo memberInfo))
+                return false;
+
+            if (memberInfo.GetCustomAttribute<JsonRequiredAttribute>() != null)
+                return true;
+
+            var jsonPropertyAttributeData = memberInfo.GetCustomAttributesData()
+                .FirstOrDefault(attrData => attrData.AttributeType == typeof(JsonPropertyAttribute));
 
             return (jsonPropertyAttributeData != null) && jsonPropertyAttributeData.NamedArguments.Any(arg => arg.MemberName == "Required");
         }

diff --git a/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonRequiredAnnotatedType.cs b/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonRequiredAnnotatedType.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace Swashbuckle.AspNetCore.Newtonsoft.Test
+{
+    public class JsonRequiredAnnotatedType
+    {
+        [JsonRequired]
+        public string StringWithJsonRequired { get; set; }
+    }
+}
diff --git a/test/Swashbuckle.AspNetCore.Newtonsoft.Test/NewtonsoftSerializerTesting.cs b/test/Swashbuckle.AspNetCore.Newtonsoft.Test/NewtonsoftSerializerTesting.cs
@@ -27,10 +27,20 @@ public void Serialize()
         [Fact]
         public void Deserialize()
         {
-            var dto = JsonConvert.DeserializeObject<Dictionary<JsonConverterAnnotatedEnum, string>>(
-                "{ \"value1\": \"foo\", \"value2\": \"bar\" }");
+            var dto = JsonConvert.DeserializeObject<TestDto>(
+                "{ \"jsonRequired\": \"foo\", \"jsonProperty\": null }");
 
-            Assert.Equal(new[] { JsonConverterAnnotatedEnum.Value1, JsonConverterAnnotatedEnum.Value2 }, dto.Keys);
+            Assert.Equal("foo", dto.jsonRequired);
+            Assert.Null(dto.jsonProperty);
         }
     }
+
+    public class TestDto
+    {
+        [JsonRequired]
+        public string jsonRequired;
+
+        [JsonProperty(Required = Required.AllowNull)]
+        public string jsonProperty;
+    }
 }
diff --git a/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs b/.../Swashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs
@@ -589,6 +589,18 @@ public void GenerateSchema_HonorsSerializerAttribute_JsonProperty()
             Assert.True(schema.Properties["StringWithRequiredAllowNull"].Nullable);
         }
 
+        [Fact]
+        public void GenerateSchema_HonorsSerializerAttribute_JsonRequired()
+        {
+            var schemaRepository = new SchemaRepository();
+
+            var referenceSchema = Subject().GenerateSchema(typeof(JsonRequiredAnnotatedType), schemaRepository);
+
+            var schema = schemaRepository.Schemas[referenceSchema.Reference.Id];
+            Assert.Equal(new[] { "StringWithJsonRequired" }, schema.Required.ToArray());
+            Assert.False(schema.Properties["StringWithJsonRequired"].Nullable);
+        }
+
         [Fact]
         public void GenerateSchema_HonorsSerializerAttribute_JsonObject()
         {