Skip to content

Commit 919c869

Browse files
committed
code cleanup
1 parent eb0cc24 commit 919c869

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using Microsoft.OpenApi.Any;
@@ -23,7 +23,7 @@ private OpenApiSchema Target
2323
{
2424
get
2525
{
26-
_target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiSchema>(_reference);
26+
_target ??= Reference.HostDocument?.ResolveReferenceTo<OpenApiSchema>(_reference);
2727
OpenApiSchema resolved = new OpenApiSchema(_target);
2828
if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
2929
return resolved;

src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ private static OpenApiRequestBody CreateFormBody(ParsingContext context, List<Op
173173
_ => mediaType)
174174
};
175175

176+
foreach (var value in formBody.Content.Values.Where(static x => x.Schema is not null && x.Schema.Properties.Any() && string.IsNullOrEmpty((string)x.Schema.Type)))
177+
value.Schema.Type = "object";
178+
176179
return formBody;
177180
}
178181

src/Microsoft.OpenApi/Services/OpenApiComponentsRegistryExtensions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ public static void RegisterComponents(this OpenApiWorkspace workspace, OpenApiDo
2424
}
2525
else
2626
{
27-
location = version == OpenApiSpecVersion.OpenApi2_0
28-
? document.BaseUri + "/" + OpenApiConstants.Definitions + "/" + item.Key
29-
: baseUri + ReferenceType.Schema.GetDisplayName() + "/" + item.Key;
27+
location = baseUri + ReferenceType.Schema.GetDisplayName() + "/" + item.Key;
3028
}
3129

3230
workspace.RegisterComponent(location, item.Value);

0 commit comments

Comments
 (0)