✨ Keep IsRequiredSpecified() but use JsonProperty.Required internally

Newtonsoft do all the work for us, handling [JsonProperty(Required = Required.Always)] or [JsonRequired] or [DataMember(IsRequired = true)] and filling the JsonProperty.Required field.
ouvreboite · Aug 1, 2024 · 77994ee · 77994ee
1 parent 5ec8ff2
commit 77994ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/JsonPropertyExtensions.cs b/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/JsonPropertyExtensions.cs
@@ -14,5 +14,10 @@ public static bool TryGetMemberInfo(this JsonProperty jsonProperty, out MemberIn
 
             return (memberInfo != null);
         }
+
+        public static bool IsRequiredSpecified(this JsonProperty jsonProperty)
+        {
+            return jsonProperty.Required != Required.Default;
+        }
     }
 }
diff --git a/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/NewtonsoftDataContractResolver.cs b/src/Swashbuckle.AspNetCore.Newtonsoft/SchemaGenerator/NewtonsoftDataContractResolver.cs
@@ -152,7 +152,7 @@ private List<DataProperty> GetDataPropertiesFor(JsonObjectContract jsonObjectCon
             {
                 if (jsonProperty.Ignored) continue;
 
-                var required = jsonProperty.Required != Required.Default
+                var required = jsonProperty.IsRequiredSpecified()
                     ? jsonProperty.Required
                     : jsonObjectContract.ItemRequired ?? Required.Default;
 

diff --git a/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonPropertyAnnotatedType.cs b/test/Swashbuckle.AspNetCore.Newtonsoft.Test/Fixtures/JsonPropertyAnnotatedType.cs
@@ -24,12 +24,12 @@ public class JsonPropertyAnnotatedType
         [JsonProperty(Required = Required.AllowNull)]
         public string StringWithRequiredAllowNull { get; set; }
 
-        [DataMember(IsRequired = false)] //As the support for DataMember has been implemented later, JsonRequired should take precedence
+        [DataMember(IsRequired = false)] //As the support for DataMember has been implemented later, JsonProperty.Required should take precedence
         [JsonProperty(Required = Required.Always)]
         public string StringWithRequiredAlwaysButConflictingDataMember { get; set; }
 
-        [DataMember(IsRequired = true)] //As the support for DataMember has been implemented later, JsonRequired should take precedence
+        [DataMember(IsRequired = true)] //As the support for DataMember has been implemented later, JsonProperty.Required should take precedence
         [JsonProperty(Required = Required.Default)]
         public string StringWithRequiredDefaultButConflictingDataMember { get; set; }
     }
-}
+}