Improve readability of ProcessCompositionForNull

desjoerd · desjoerd · commit 3673612ae47a · 2025-12-16T10:44:36.000+01:00
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -884,16 +884,14 @@ private static (IList<IOpenApiSchema>? effective, JsonSchemaType? inferredType,
                     commonType |= schema.Type.GetValueOrDefault() & ~JsonSchemaType.Null;
                 }
 
-                var isSingleType = !HasMultipleTypes(commonType);
-                if (isSingleType)
+                if (HasMultipleTypes(commonType) || commonType == 0)
                 {
-                    // Single common type
-                    return (nonNullSchemas, commonType, true);
+                    return (nonNullSchemas, null, true);
                 }
                 else
                 {
-                    // Multiple different types
-                    return (nonNullSchemas, null, true);
+                    // Single common type
+                    return (nonNullSchemas, commonType, true);
                 }
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -884,16 +884,14 @@ private static (IList<IOpenApiSchema>? effective, JsonSchemaType? inferredType,`
`884`	`884`	`commonType \|= schema.Type.GetValueOrDefault() & ~JsonSchemaType.Null;`
`885`	`885`	`}`
`886`	`886`
`887`		`- var isSingleType = !HasMultipleTypes(commonType);`
`888`		`- if (isSingleType)`
	`887`	`+ if (HasMultipleTypes(commonType) \|\| commonType == 0)`
`889`	`888`	`{`
`890`		`- // Single common type`
`891`		`- return (nonNullSchemas, commonType, true);`
	`889`	`+ return (nonNullSchemas, null, true);`
`892`	`890`	`}`
`893`	`891`	`else`
`894`	`892`	`{`
`895`		`- // Multiple different types`
`896`		`- return (nonNullSchemas, null, true);`
	`893`	`+ // Single common type`
	`894`	`+ return (nonNullSchemas, commonType, true);`
`897`	`895`	`}`
`898`	`896`	`}`
`899`	`897`	`else`