Address more feedback

captainsafia · captainsafia · commit 4c45af2fdeee · 2025-04-18T08:31:31.000-07:00
diff --git a/src/OpenApi/gen/XmlCommentGenerator.Emitter.cs b/src/OpenApi/gen/XmlCommentGenerator.Emitter.cs
@@ -398,7 +398,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -407,7 +407,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs
@@ -148,7 +148,7 @@ internal static IOpenApiSchema ResolveReferenceForSchema(OpenApiDocument documen
         var schema = UnwrapOpenApiSchema(inputSchema);
 
         if (schema.Metadata is not null &&
-                schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var resolvedBaseSchemaId))
+            schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var resolvedBaseSchemaId))
         {
             if (schema.AnyOf is { Count: > 0 })
             {
@@ -241,7 +241,7 @@ private static OpenApiSchema UnwrapOpenApiSchema(IOpenApiSchema sourceSchema)
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiSchema or OpenApiSchemaReference.");
+                throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");
             }
         }
         else if (sourceSchema is OpenApiSchema directSchema)
@@ -250,7 +250,7 @@ private static OpenApiSchema UnwrapOpenApiSchema(IOpenApiSchema sourceSchema)
         }
         else
         {
-            throw new InvalidOperationException("The input schema must be an OpenApiSchema or OpenApiSchemaReference.");
+            throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");
         }
     }
 
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs
@@ -380,7 +380,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -389,7 +389,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs
@@ -409,7 +409,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -418,7 +418,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
@@ -499,7 +499,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -508,7 +508,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs
@@ -384,7 +384,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -393,7 +393,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs
@@ -402,7 +402,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -411,7 +411,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs
@@ -410,7 +410,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
                 }
                 else
                 {
-                    throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                    throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
                 }
             }
             else if (sourceParameter is OpenApiParameter directParameter)
@@ -419,7 +419,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP
             }
             else
             {
-                throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");
+                throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");
             }
         }
     }
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
@@ -338,6 +338,8 @@ await VerifyOpenApiDocument(action, document =>
         [([MinLength(2)] int[] id) => {}, (OpenApiSchema schema) => Assert.Equal(2, schema.MinItems)],
         [([Length(4, 8)] int[] id) => {}, (OpenApiSchema schema) => { Assert.Equal(4, schema.MinItems); Assert.Equal(8, schema.MaxItems); }],
         [([Range(4, 8)]int id) => {}, (OpenApiSchema schema) => { Assert.Equal("4", schema.Minimum); Assert.Equal("8", schema.Maximum); }],
+        [([Range(1234, 5678)]int id) => {}, (OpenApiSchema schema) => { Assert.Equal("1234", schema.Minimum); Assert.Equal("5678", schema.Maximum); }],
+         [([Range(1234.56, 7891.1)] decimal id) => {}, (OpenApiSchema schema) => { Assert.Equal("1234.56", schema.Minimum); Assert.Equal("7891.1", schema.Maximum); }],
         [([Range(typeof(DateTime), "2024-02-01", "2024-02-031")] DateTime id) => {}, (OpenApiSchema schema) => { Assert.Null(schema.Minimum); Assert.Null(schema.Maximum); }],
         [([StringLength(10)] string name) => {}, (OpenApiSchema schema) => { Assert.Equal(10, schema.MaxLength); Assert.Equal(0, schema.MinLength); }],
         [([StringLength(10, MinimumLength = 5)] string name) => {}, (OpenApiSchema schema) => { Assert.Equal(10, schema.MaxLength); Assert.Equal(5, schema.MinLength); }],

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`398`	`398`	`}`
`399`	`399`	`else`
`400`	`400`	`{`
`401`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`401`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -407,7 +407,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`407`	`407`	`}`
`408`	`408`	`else`
`409`	`409`	`{`
`410`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`410`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ internal static IOpenApiSchema ResolveReferenceForSchema(OpenApiDocument documen`
`148`	`148`	`var schema = UnwrapOpenApiSchema(inputSchema);`
`149`	`149`
`150`	`150`	`if (schema.Metadata is not null &&`
`151`		`- schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var resolvedBaseSchemaId))`
	`151`	`+ schema.Metadata.TryGetValue(OpenApiConstants.SchemaId, out var resolvedBaseSchemaId))`
`152`	`152`	`{`
`153`	`153`	`if (schema.AnyOf is { Count: > 0 })`
`154`	`154`	`{`
`@@ -241,7 +241,7 @@ private static OpenApiSchema UnwrapOpenApiSchema(IOpenApiSchema sourceSchema)`
`241`	`241`	`}`
`242`	`242`	`else`
`243`	`243`	`{`
`244`		`- throw new InvalidOperationException("The input schema must be an OpenApiSchema or OpenApiSchemaReference.");`
	`244`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`	`else if (sourceSchema is OpenApiSchema directSchema)`
`@@ -250,7 +250,7 @@ private static OpenApiSchema UnwrapOpenApiSchema(IOpenApiSchema sourceSchema)`
`250`	`250`	`}`
`251`	`251`	`else`
`252`	`252`	`{`
`253`		`- throw new InvalidOperationException("The input schema must be an OpenApiSchema or OpenApiSchemaReference.");`
	`253`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiSchema)} or {nameof(OpenApiSchemaReference)}.");`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`380`	`380`	`}`
`381`	`381`	`else`
`382`	`382`	`{`
`383`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`383`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -389,7 +389,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`389`	`389`	`}`
`390`	`390`	`else`
`391`	`391`	`{`
`392`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`392`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`409`	`409`	`}`
`410`	`410`	`else`
`411`	`411`	`{`
`412`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`412`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -418,7 +418,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`418`	`418`	`}`
`419`	`419`	`else`
`420`	`420`	`{`
`421`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`421`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`	`}`
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`499`	`499`	`}`
`500`	`500`	`else`
`501`	`501`	`{`
`502`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`502`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`503`	`503`	`}`
`504`	`504`	`}`
`505`	`505`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -508,7 +508,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`508`	`508`	`}`
`509`	`509`	`else`
`510`	`510`	`{`
`511`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`511`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`384`	`384`	`}`
`385`	`385`	`else`
`386`	`386`	`{`
`387`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`387`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -393,7 +393,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`393`	`393`	`}`
`394`	`394`	`else`
`395`	`395`	`{`
`396`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`396`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`402`	`402`	`}`
`403`	`403`	`else`
`404`	`404`	`{`
`405`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`405`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -411,7 +411,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`411`	`411`	`}`
`412`	`412`	`else`
`413`	`413`	`{`
`414`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`414`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`410`	`410`	`}`
`411`	`411`	`else`
`412`	`412`	`{`
`413`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`413`	`+ throw new InvalidOperationException($"The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`	`else if (sourceParameter is OpenApiParameter directParameter)`
`@@ -419,7 +419,7 @@ private static OpenApiParameter UnwrapOpenApiParameter(IOpenApiParameter sourceP`
`419`	`419`	`}`
`420`	`420`	`else`
`421`	`421`	`{`
`422`		`- throw new InvalidOperationException("The input schema must be an OpenApiParameter or OpenApiParameterReference.");`
	`422`	`+ throw new InvalidOperationException("The input schema must be an {nameof(OpenApiParameter)} or {nameof(OpenApiParameterReference)}.");`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`	`}`