Skip to content

Commit 7e0f1e0

Browse files
committed
fix: Resolved conflicts.
1 parent c80b407 commit 7e0f1e0

File tree

3 files changed

+72
-69
lines changed

3 files changed

+72
-69
lines changed

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,11 @@ private static string ConvertByteArrayToString(byte[] hash)
529529
string relativePath = OpenApiConstants.ComponentsSegment + reference.Type.GetDisplayName() + "/" + reference.Id;
530530

531531
uriLocation = useExternal
532-
? Workspace.GetDocumentId(reference.ExternalResource)?.OriginalString + relativePath
532+
? Workspace?.GetDocumentId(reference.ExternalResource)?.OriginalString + relativePath
533533
: BaseUri + relativePath;
534534
}
535535

536-
return Workspace.ResolveReference<IOpenApiReferenceable>(uriLocation);
536+
return Workspace?.ResolveReference<IOpenApiReferenceable>(uriLocation);
537537
}
538538

539539
/// <summary>
@@ -628,9 +628,9 @@ public static ReadResult Parse(string input,
628628

629629
internal class FindSchemaReferences : OpenApiVisitorBase
630630
{
631-
private Dictionary<string, OpenApiSchema> Schemas;
631+
private Dictionary<string, OpenApiSchema> Schemas = new();
632632

633-
public static void ResolveSchemas(OpenApiComponents components, Dictionary<string, OpenApiSchema> schemas)
633+
public static void ResolveSchemas(OpenApiComponents? components, Dictionary<string, OpenApiSchema> schemas)
634634
{
635635
var visitor = new FindSchemaReferences();
636636
visitor.Schemas = schemas;

test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,21 @@ public void RemoveAnyOfAndOneOfFromSchema()
5757
var walker = new OpenApiWalker(powerShellFormatter);
5858
walker.Walk(openApiDocument);
5959

60-
var testSchema = openApiDocument.Components.Schemas["TestSchema"];
61-
var averageAudioDegradationProperty = testSchema.Properties["averageAudioDegradation"];
62-
var defaultPriceProperty = testSchema.Properties["defaultPrice"];
60+
var testSchema = openApiDocument.Components?.Schemas?["TestSchema"];
61+
var averageAudioDegradationProperty = testSchema?.Properties["averageAudioDegradation"];
62+
var defaultPriceProperty = testSchema?.Properties["defaultPrice"];
6363

6464
// Assert
65-
Assert.Null(averageAudioDegradationProperty.AnyOf);
66-
Assert.Equal("number", averageAudioDegradationProperty.Type);
67-
Assert.Equal("float", averageAudioDegradationProperty.Format);
68-
Assert.True(averageAudioDegradationProperty.Nullable);
69-
Assert.Null(defaultPriceProperty.OneOf);
70-
Assert.Equal("number", defaultPriceProperty.Type);
71-
Assert.Equal("double", defaultPriceProperty.Format);
65+
Assert.NotNull(openApiDocument.Components);
66+
Assert.NotNull(openApiDocument.Components.Schemas);
67+
Assert.NotNull(testSchema);
68+
Assert.Null(averageAudioDegradationProperty?.AnyOf);
69+
Assert.Equal("number", averageAudioDegradationProperty?.Type);
70+
Assert.Equal("float", averageAudioDegradationProperty?.Format);
71+
Assert.True(averageAudioDegradationProperty?.Nullable);
72+
Assert.Null(defaultPriceProperty?.OneOf);
73+
Assert.Equal("number", defaultPriceProperty?.Type);
74+
Assert.Equal("double", defaultPriceProperty?.Format);
7275
Assert.NotNull(testSchema.AdditionalProperties);
7376
}
7477

@@ -83,12 +86,12 @@ public void ResolveFunctionParameters()
8386
var walker = new OpenApiWalker(powerShellFormatter);
8487
walker.Walk(openApiDocument);
8588

86-
var idsParameter = openApiDocument.Paths["/foo"].Operations[OperationType.Get].Parameters.Where(static p => p.Name == "ids").FirstOrDefault();
89+
var idsParameter = openApiDocument.Paths?["/foo"].Operations[OperationType.Get].Parameters?.Where(static p => p.Name == "ids").FirstOrDefault();
8790

8891
// Assert
8992
Assert.Null(idsParameter?.Content);
9093
Assert.NotNull(idsParameter?.Schema);
91-
Assert.Equal("array", idsParameter?.Schema.Type);
94+
Assert.Equal("array", idsParameter.Schema.Type);
9295
}
9396

9497
private static OpenApiDocument GetSampleOpenApiDocument()

0 commit comments

Comments
 (0)