Clean up code

Author: MaggieKimani1

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -630,9 +630,9 @@ internal void WriteAsSchemaProperties(
             }
 
             // format
-            Format ??= AllOf?.FirstOrDefault(x => x.Format != null)?.Format ??
-                    AnyOf?.FirstOrDefault(x => x.Format != null)?.Format ??
-                    OneOf?.FirstOrDefault(x => x.Format != null)?.Format;
+            Format ??= AllOf?.FirstOrDefault(static x => x.Format != null)?.Format ??
+                    AnyOf?.FirstOrDefault(static x => x.Format != null)?.Format ??
+                    OneOf?.FirstOrDefault(static x => x.Format != null)?.Format;
 
             writer.WriteProperty(OpenApiConstants.Format, Format);
 

test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs

@@ -424,7 +424,7 @@ public async Task SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync(bool prod
         }
 
         [Fact]
-        public void SerializeSchemaPrimitiveTypeShouldRemoveFormatInRootIfPresentInChildrenSchema()
+        public void SerializeAsV2ShouldSetFormatPropertyInParentSchemaIfPresentInChildrenSchema()
         {
             // Arrange
             var schema = new OpenApiSchema()
@@ -448,13 +448,7 @@ public void SerializeSchemaPrimitiveTypeShouldRemoveFormatInRootIfPresentInChild
             schema.SerializeAsV2(openApiJsonWriter);
             openApiJsonWriter.Flush();
 
-            var v2Schema = outputStringWriter.GetStringBuilder().ToString().MakeLineBreaksEnvironmentNeutral();//.Replace(Environment.NewLine, "").Replace(" ", "").Replace("\n","");
-
-            // Serialize as V3
-            //schema.SerializeAsV3(openApiJsonWriter);
-            //openApiJsonWriter.Flush();
-
-            //var v3Schema = outputStringWriter.GetStringBuilder().ToString();//.Replace(Environment.NewLine, "").Replace(" ", "").Replace("\n", "");
+            var v2Schema = outputStringWriter.GetStringBuilder().ToString().MakeLineBreaksEnvironmentNeutral();
 
             var expectedV2Schema = @"{
   ""format"": ""decimal"",
@@ -466,25 +460,8 @@ public void SerializeSchemaPrimitiveTypeShouldRemoveFormatInRootIfPresentInChild
   ]
 }".MakeLineBreaksEnvironmentNeutral();
 
-            
-            var expectedV3Schema = @"{
-""allOf"": [
-{
-    ""format"": ""decimal"",
-    ""type"": ""number""
-}]}
-{""oneOf"": [
-{
-    ""type"": ""number"",
-    ""format"": ""decimal""
-},
-{""type"" : ""string""}
-
-]}}";//.Replace(Environment.NewLine, "").Replace(" ", "").Replace("\n", "");
-
             // Assert
-            Assert.Equal(expectedV2Schema, v2Schema); // Assert that v2 schema has the root schema Format defined
-            //Assert.Equal(expectedV3Schema, v3Schema);
+            Assert.Equal(expectedV2Schema, v2Schema);
         }
     }
 }