Fix issues from resolving merge conflicts

Author: MaggieKimani1

src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs

@@ -128,8 +128,8 @@ public async Task<ReadResult> ReadAsync(Stream input,
                 diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}"));
                 return new ReadResult
                 {
-                    OpenApiDocument = null,
-                    OpenApiDiagnostic = diagnostic
+                    Document = null,
+                    Diagnostic = diagnostic
                 };
             }
 

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

@@ -209,12 +209,12 @@ private static async Task<ReadResult> InternalLoadAsync(Stream input, string for
 
             if (settings?.LoadExternalRefs ?? DefaultReaderSettings.LoadExternalRefs)
             {
-                var diagnosticExternalRefs = await LoadExternalRefsAsync(readResult.OpenApiDocument, cancellationToken, settings, format);
+                var diagnosticExternalRefs = await LoadExternalRefsAsync(readResult.Document, cancellationToken, settings, format);
                 // Merge diagnostics of external reference
                 if (diagnosticExternalRefs != null)
                 {
-                    readResult.OpenApiDiagnostic.Errors.AddRange(diagnosticExternalRefs.Errors);
-                    readResult.OpenApiDiagnostic.Warnings.AddRange(diagnosticExternalRefs.Warnings);
+                    readResult.Diagnostic.Errors.AddRange(diagnosticExternalRefs.Errors);
+                    readResult.Diagnostic.Warnings.AddRange(diagnosticExternalRefs.Warnings);
                 }
             }
 

test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs

@@ -232,7 +232,7 @@ public async Task CopiesOverAllReferencedComponentsToTheSubsetDocumentCorrectly(
 
             // Act
             using var stream = File.OpenRead(filePath);
-            var doc = OpenApiDocument.Load(stream, "yaml").Document;            
+            var doc = (await OpenApiDocument.LoadAsync(stream, "yaml")).Document;            
             var predicate = OpenApiFilterService.CreatePredicate(operationIds: operationIds);
             var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(doc, predicate);
 

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs

@@ -108,7 +108,7 @@ public void ParseInlineStringWithoutProvidingFormatSucceeds()
 """;
 
             var readResult = OpenApiDocument.Parse(stringOpenApiDoc);
-            readResult.OpenApiDocument.Info.Title.Should().Be("Sample API");
+            readResult.Document.Info.Title.Should().Be("Sample API");
         }
 
         [Fact]
@@ -1323,7 +1323,7 @@ public async Task ParseDocWithRefsUsingProxyReferencesSucceeds()
             using var stream = Resources.GetStream(System.IO.Path.Combine(SampleFolderPath, "minifiedPetStore.yaml"));
 
             // Act
-            var doc = OpenApiDocument.Load(stream, "yaml").Document;
+            var doc = (await OpenApiDocument.LoadAsync(stream)).Document;
             var actualParam = doc.Paths["/pets"].Operations[OperationType.Get].Parameters[0];
             var outputDoc = doc.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0).MakeLineBreaksEnvironmentNeutral();
             var expectedParam = expected.Paths["/pets"].Operations[OperationType.Get].Parameters[0];

test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs

@@ -1702,7 +1702,7 @@ And reading in similar documents(one has a whitespace) yields the same hash code
 
         private static async Task<OpenApiDocument> ParseInputFileAsync(string filePath)
         {
-            var openApiDoc = (await OpenApiDocument.LoadAsync(filePath)).OpenApiDocument;
+            var openApiDoc = (await OpenApiDocument.LoadAsync(filePath)).Document;
             return openApiDoc;
         }