Skip to content

Commit cf54bb3

Browse files
baywetCopilot
andcommitted
fix(library): remove unshipped schema extension fallback
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent eb1891a commit cf54bb3

4 files changed

Lines changed: 2 additions & 30 deletions

File tree

src/Microsoft.OpenApi/Models/OpenApiConstants.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,6 @@ public static class OpenApiConstants
140140
/// </summary>
141141
public const string UnevaluatedPropertiesExtension = "x-jsonschema-unevaluatedProperties";
142142

143-
/// <summary>
144-
/// Legacy extension: x-oai-unevaluatedProperties
145-
/// </summary>
146-
public const string LegacyUnevaluatedPropertiesExtension = "x-oai-unevaluatedProperties";
147-
148143
/// <summary>
149144
/// Field: Version
150145
/// </summary>

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,22 +604,18 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
604604
// Skip when type is explicitly set to a non-object type (array, string, number, integer, boolean, null).
605605
if (!Type.HasValue || (Type.Value & JsonSchemaType.Object) != 0)
606606
{
607-
var unevaluatedPropertiesExtensionName = version == OpenApiSpecVersion.OpenApi3_0
608-
? OpenApiConstants.UnevaluatedPropertiesExtension
609-
: OpenApiConstants.LegacyUnevaluatedPropertiesExtension;
610-
611607
// Write UnevaluatedPropertiesSchema as extension if present
612608
if (UnevaluatedPropertiesSchema is not null)
613609
{
614610
writer.WriteOptionalObject(
615-
unevaluatedPropertiesExtensionName,
611+
OpenApiConstants.UnevaluatedPropertiesExtension,
616612
UnevaluatedPropertiesSchema,
617613
callback);
618614
}
619615
// Write boolean false as extension if explicitly set to false
620616
else if (!UnevaluatedProperties)
621617
{
622-
writer.WritePropertyName(unevaluatedPropertiesExtensionName);
618+
writer.WritePropertyName(OpenApiConstants.UnevaluatedPropertiesExtension);
623619
writer.WriteValue(false);
624620
}
625621
}

src/Microsoft.OpenApi/PublicAPI.Unshipped.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ const Microsoft.OpenApi.OpenApiConstants.Else = "else" -> string!
1313
const Microsoft.OpenApi.OpenApiConstants.ElseExtension = "x-jsonschema-else" -> string!
1414
const Microsoft.OpenApi.OpenApiConstants.If = "if" -> string!
1515
const Microsoft.OpenApi.OpenApiConstants.IfExtension = "x-jsonschema-if" -> string!
16-
const Microsoft.OpenApi.OpenApiConstants.LegacyUnevaluatedPropertiesExtension = "x-oai-unevaluatedProperties" -> string!
1716
const Microsoft.OpenApi.OpenApiConstants.PropertyNames = "propertyNames" -> string!
1817
const Microsoft.OpenApi.OpenApiConstants.PropertyNamesExtension = "x-jsonschema-propertyNames" -> string!
1918
const Microsoft.OpenApi.OpenApiConstants.Then = "then" -> string!

src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -300,24 +300,6 @@ internal static partial class OpenApiV3Deserializer
300300
}
301301
}
302302
},
303-
{
304-
OpenApiConstants.LegacyUnevaluatedPropertiesExtension,
305-
(o, n, t, c) =>
306-
{
307-
if (n is JsonValue)
308-
{
309-
var value = n.GetScalarValue();
310-
if (value is not null)
311-
{
312-
o.UnevaluatedProperties = bool.Parse(value);
313-
}
314-
}
315-
else
316-
{
317-
o.UnevaluatedPropertiesSchema = LoadSchema(n, t, c);
318-
}
319-
}
320-
},
321303
{
322304
OpenApiConstants.AnchorExtension,
323305
(o, n, _, _) => o.Anchor = n.GetScalarValue()

0 commit comments

Comments
 (0)