handle RequiredAttribute

zcsizmadia · Apr 22, 2024 · 6ce94eb · 6ce94eb
1 parent 1f01369
commit 6ce94eb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,13 +2,11 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-
   <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
-
   <ItemGroup Label="Dependencies">
+    <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" Condition="$(TargetFramework.StartsWith('netstandard'))" />
     <PackageVersion Include="System.Text.Json" Version="8.0.3" Condition="$(TargetFramework.StartsWith('netstandard'))" />
   </ItemGroup>
-
   <ItemGroup Label="Build Dependencies">
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

diff --git a/src/ZCS.DataContractResolver/DataContractResolver.cs b/src/ZCS.DataContractResolver/DataContractResolver.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
@@ -117,9 +118,19 @@ private static IEnumerable<JsonPropertyInfo> CreateDataMembers(JsonTypeInfo json
 
                 if (attr != null)
                 {
+                    jsonPropertyInfo.IsRequired = attr.IsRequired;
                     jsonPropertyInfo.Order = attr.Order;
                     jsonPropertyInfo.ShouldSerialize = !attr.EmitDefaultValue ? ((_, obj) => !IsNullOrDefault(obj)) : null;
                 }
+
+                if (!jsonPropertyInfo.IsRequired)
+                {
+                    var requiredAttr = memberInfo.GetCustomAttribute<RequiredAttribute>();
+                    if (requiredAttr != null)
+                    {
+                        jsonPropertyInfo.IsRequired = true;
+                    }
+                }
 
                 yield return jsonPropertyInfo;
             }

diff --git a/src/ZCS.DataContractResolver/ZCS.DataContractResolver.csproj b/src/ZCS.DataContractResolver/ZCS.DataContractResolver.csproj
@@ -1,11 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(ClassLibTargetFrameworks)</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Condition="$(TargetFramework.StartsWith('netstandard'))"/>
+    <PackageReference Include="System.ComponentModel.Annotations" Condition="$(TargetFramework.StartsWith('netstandard'))" />
+    <PackageReference Include="System.Text.Json" Condition="$(TargetFramework.StartsWith('netstandard'))" />
   </ItemGroup>
 </Project>
diff --git a/test/ZCS.DataContractResolver.Tests/PortedNewtonsoftTests.cs b/test/ZCS.DataContractResolver.Tests/PortedNewtonsoftTests.cs
@@ -513,7 +513,6 @@ public void SerializeClassWithRequiredObject()
     {
         var options = new JsonSerializerOptions()
         {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
             TypeInfoResolver = System.Text.Json.Serialization.Metadata.DataContractResolver.Default,
         };
 
@@ -522,6 +521,19 @@ public void SerializeClassWithRequiredObject()
         Assert.Contains("AllowNullProperty", json);
     }
 
+    [Fact]
+    public void SerializeClassWithoutRequiredObject()
+    {
+        var options = new JsonSerializerOptions()
+        {
+            TypeInfoResolver = System.Text.Json.Serialization.Metadata.DataContractResolver.Default,
+        };
+
+        const string json = "{}";
+
+        Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<RequiredObject>(json, options));
+    }
+
     [Fact]
     public void SerializeObject()
     {