Skip to content

Fix anyOf and oneOf v2 serialization #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 15, 2022
Merged

Fix anyOf and oneOf v2 serialization #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa503ff
Fix anyOf and oneOf serialization by checking for null first before w…
millicentachieng Aug 13, 2022
19d9edc
Remove unused method
millicentachieng Aug 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ internal static partial class OpenApiV2Deserializer
"consumes", (o, n) => {
var consumes = n.CreateSimpleList(s => s.GetScalarValue());
if (consumes.Count > 0) {
n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
}
}
},
Expand Down
24 changes: 0 additions & 24 deletions src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,30 +107,6 @@ private static ReferenceType ParseReferenceType(string referenceTypeName)
}
}

private static string GetReferenceTypeV2Name(ReferenceType referenceType)
{
switch (referenceType)
{
case ReferenceType.Schema:
return "definitions";

case ReferenceType.Parameter:
return "parameters";

case ReferenceType.Response:
return "responses";

case ReferenceType.Tag:
return "tags";

case ReferenceType.SecurityScheme:
return "securityDefinitions";

default:
throw new ArgumentException();
}
}

private static ReferenceType GetReferenceTypeV2FromName(string referenceType)
{
switch (referenceType)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.OpenApi/Models/OpenApiSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,12 +700,12 @@ internal void WriteAsSchemaProperties(
if (AllOf == null || AllOf.Count == 0)
{
// anyOf (Not Supported in V2) - Write the first schema only as an allOf.
writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf.Take(1), (w, s) => s.SerializeAsV2(w));
writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf?.Take(1), (w, s) => s.SerializeAsV2(w));

if (AnyOf == null || AnyOf.Count == 0)
{
// oneOf (Not Supported in V2) - Write the first schema only as an allOf.
writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf.Take(1), (w, s) => s.SerializeAsV2(w));
writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf?.Take(1), (w, s) => s.SerializeAsV2(w));
}
}

Expand Down