Don't check for null for structs (#4922)

Fix to #4919
microsoft · Oct 30, 2024 · 6d168d3 · 6d168d3
1 parent 3f13f87
commit 6d168d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/...or/Microsoft.Generator.CSharp.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs b/...or/Microsoft.Generator.CSharp.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs
@@ -206,7 +206,7 @@ private MethodProvider BuildImplicitToBinaryContent()
                 new MethodSignature(ClientModelPlugin.Instance.TypeFactory.RequestContentApi.RequestContentType.FrameworkType.Name, null, modifiers, null, null, [model]),
                 new MethodBodyStatement[]
                 {
-                    new IfStatement(model.AsExpression.Equal(Null)) { Return(Null) },
+                    !_isStruct ? new IfStatement(model.AsExpression.Equal(Null)) { Return(Null) } : MethodBodyStatement.Empty,
                     ClientModelPlugin.Instance.TypeFactory.RequestContentApi.ToExpression().Create(model)
                 },
                 this);

diff --git a/...del/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs b/...del/test/Providers/MrwSerializationTypeDefinitions/MrwSerializationTypeDefinitionTests.cs
@@ -611,10 +611,11 @@ public void TestBuildDeserializationMethodNestedSARD()
             Assert.AreEqual(1, methodBodyString.Split(sardDeclaration).Length - 1);
         }
 
-        [Test]
-        public void TestBuildImplicitToBinaryContent()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBuildImplicitToBinaryContent(bool useStruct)
         {
-            var inputModel = InputFactory.Model("mockInputModel");
+            var inputModel = InputFactory.Model("mockInputModel", modelAsStruct: useStruct);
             var (model, serialization) = CreateModelAndSerialization(inputModel);
             var methods = serialization.Methods;
 
@@ -637,6 +638,7 @@ public void TestBuildImplicitToBinaryContent()
 
             var methodBody = method?.BodyStatements;
             Assert.IsNotNull(methodBody);
+            Assert.AreEqual(Helpers.GetExpectedFromFile(useStruct.ToString()), methodBody!.ToDisplayString());
         }
 
         [Test]

diff --git a/...s/TestData/MrwSerializationTypeDefinitionTests/TestBuildImplicitToBinaryContent(False).cs b/...s/TestData/MrwSerializationTypeDefinitionTests/TestBuildImplicitToBinaryContent(False).cs
@@ -0,0 +1,5 @@
+if ((mockInputModel == null))
+{
+    return null;
+}
+return global::System.ClientModel.BinaryContent.Create(mockInputModel, global::Sample.ModelSerializationExtensions.WireOptions);
diff --git a/...ns/TestData/MrwSerializationTypeDefinitionTests/TestBuildImplicitToBinaryContent(True).cs b/...ns/TestData/MrwSerializationTypeDefinitionTests/TestBuildImplicitToBinaryContent(True).cs
@@ -0,0 +1 @@
+return global::System.ClientModel.BinaryContent.Create(mockInputModel, global::Sample.ModelSerializationExtensions.WireOptions);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		return global::System.ClientModel.BinaryContent.Create(mockInputModel, global::Sample.ModelSerializationExtensions.WireOptions);