From 38771b0838f5a01cb8a17a24384b6cefefa725b4 Mon Sep 17 00:00:00 2001 From: Sam Xu Date: Thu, 2 Nov 2017 15:48:48 -0700 Subject: [PATCH] Remove the YamlReaders folder in the Reader project and change the namespace --- .../{YamlReaders => }/OpenApiDiagnostic.cs | 2 +- .../{YamlReaders => }/OpenApiError.cs | 2 +- .../OpenApiStreamReader.cs | 91 +++++++++++++++++++ .../{YamlReaders => }/OpenApiStringReader.cs | 2 +- .../OpenApiV2Deserializer.cs | 11 ++- .../OpenApiV3Deserializer.cs | 13 ++- .../ParseNodes/FixedFieldMap.cs | 2 +- .../{YamlReaders => }/ParseNodes/ListNode.cs | 2 +- .../{YamlReaders => }/ParseNodes/MapNode.cs | 2 +- .../{YamlReaders => }/ParseNodes/ParseNode.cs | 2 +- .../ParseNodes/PatternFieldMap.cs | 2 +- .../ParseNodes/PropertyNode.cs | 2 +- .../{YamlReaders => }/ParseNodes/RootNode.cs | 2 +- .../{YamlReaders => }/ParseNodes/ValueNode.cs | 2 +- .../{YamlReaders => }/ParsingContext.cs | 2 +- .../{YamlReaders => }/ReferenceService.cs | 3 +- .../{YamlReaders => }/YamlHelper.cs | 2 +- .../YamlReaders/OpenApiStreamReader.cs | 91 ------------------- src/Microsoft.OpenApi.Workbench/MainModel.cs | 2 +- .../BasicTests.cs | 1 - .../CallbackTests.cs | 1 - .../FixtureTests.cs | 3 +- .../InfoTests.cs | 1 - .../ModelToV2Tests.cs | 1 - .../OpenApiExampleTests.cs | 1 - .../OpenApiReferenceTests.cs | 1 - .../OperationTests.cs | 3 +- .../SchemaTests.cs | 3 +- .../V2Tests/V2Tests.cs | 1 - 29 files changed, 126 insertions(+), 127 deletions(-) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/OpenApiDiagnostic.cs (91%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/OpenApiError.cs (94%) create mode 100644 src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/OpenApiStringReader.cs (96%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/OpenApiV2Deserializer.cs (99%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/OpenApiV3Deserializer.cs (98%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/FixedFieldMap.cs (88%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/ListNode.cs (97%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/MapNode.cs (99%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/ParseNode.cs (98%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/PatternFieldMap.cs (88%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/PropertyNode.cs (97%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/RootNode.cs (97%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParseNodes/ValueNode.cs (96%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ParsingContext.cs (98%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/ReferenceService.cs (96%) rename src/Microsoft.OpenApi.Readers/{YamlReaders => }/YamlHelper.cs (95%) delete mode 100644 src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStreamReader.cs diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiDiagnostic.cs b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs similarity index 91% rename from src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiDiagnostic.cs rename to src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs index 0c40644b3..5aa675064 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiDiagnostic.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.OpenApi.Readers.Interface; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { public class OpenApiDiagnostic : IDiagnostic { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiError.cs b/src/Microsoft.OpenApi.Readers/OpenApiError.cs similarity index 94% rename from src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiError.cs rename to src/Microsoft.OpenApi.Readers/OpenApiError.cs index fb78ceeb3..26ecc4d5e 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiError.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiError.cs @@ -3,7 +3,7 @@ // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. // ------------------------------------------------------------ -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { public class OpenApiError { diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs new file mode 100644 index 000000000..067aba5e5 --- /dev/null +++ b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs @@ -0,0 +1,91 @@ +// ------------------------------------------------------------ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. +// ------------------------------------------------------------ + +using System.IO; +using System.Linq; +using Microsoft.OpenApi.Readers.Interface; +using Microsoft.OpenApi.Readers.ParseNodes; +using SharpYaml; +using SharpYaml.Serialization; +using Microsoft.OpenApi.Models; + +namespace Microsoft.OpenApi.Readers +{ + /// + /// Service class for converting streams into OpenApiDocument instances + /// + public class OpenApiStreamReader : IOpenApiReader + { + /// + /// Gets the version of the Open API document. + /// + private static string GetVersion(RootNode rootNode) + { + var versionNode = rootNode.Find(new JsonPointer("/openapi")); + + if (versionNode != null) + { + return versionNode.GetScalarValue(); + } + + versionNode = rootNode.Find(new JsonPointer("/swagger")); + + return versionNode?.GetScalarValue(); + } + + /// + /// Reads the stream input and parses it into an Open API document. + /// + public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic) + { + RootNode rootNode; + var context = new ParsingContext(); + diagnostic = new OpenApiDiagnostic(); + + try + { + using (var streamReader = new StreamReader(input)) + { + var yamlStream = new YamlStream(); + yamlStream.Load(streamReader); + + var yamlDocument = yamlStream.Documents.First(); + rootNode = new RootNode(context, diagnostic, yamlDocument); + } + } + catch (SyntaxErrorException ex) + { + diagnostic.Errors.Add(new OpenApiError(string.Empty, ex.Message)); + + return new OpenApiDocument(); + } + + var inputVersion = GetVersion(rootNode); + + switch (inputVersion) + { + case "2.0": + context.SetReferenceService( + new OpenApiReferenceService(rootNode) + { + loadReference = OpenApiV2Deserializer.LoadReference, + parseReference = p => OpenApiV2Deserializer.ParseReference(p) + }); + + return OpenApiV2Deserializer.LoadOpenApi(rootNode); + + default: + context.SetReferenceService( + new OpenApiReferenceService(rootNode) + { + loadReference = OpenApiV3Deserializer.LoadReference, + parseReference = p => new OpenApiReference(p) + }); + + return OpenApiV3Deserializer.LoadOpenApi(rootNode); + } + } + } +} \ No newline at end of file diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStringReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs similarity index 96% rename from src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStringReader.cs rename to src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs index 79b16f7ac..8c68bdae5 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStringReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs @@ -7,7 +7,7 @@ using Microsoft.OpenApi.Readers.Interface; using Microsoft.OpenApi.Models; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { /// /// Service class for converting strings into OpenApiDocument instances diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi.Readers/OpenApiV2Deserializer.cs similarity index 99% rename from src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV2Deserializer.cs rename to src/Microsoft.OpenApi.Readers/OpenApiV2Deserializer.cs index cd8e223aa..4f32c973f 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV2Deserializer.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiV2Deserializer.cs @@ -1,12 +1,17 @@ -using System; +// ------------------------------------------------------------ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. +// ------------------------------------------------------------ + +using System; using System.Collections.Generic; using System.Linq; -using Microsoft.OpenApi.Readers.YamlReaders.ParseNodes; using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Interfaces; using Microsoft.OpenApi.Models; +using Microsoft.OpenApi.Readers.ParseNodes; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { /// /// Class containing logic to deserialize Open API V2 document into diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi.Readers/OpenApiV3Deserializer.cs similarity index 98% rename from src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV3Deserializer.cs rename to src/Microsoft.OpenApi.Readers/OpenApiV3Deserializer.cs index 57358d264..d64a9a8ba 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV3Deserializer.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiV3Deserializer.cs @@ -1,12 +1,17 @@ -using System; +// ------------------------------------------------------------ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. +// ------------------------------------------------------------ + +using System; using System.Collections.Generic; using System.Linq; -using Microsoft.OpenApi.Readers.YamlReaders.ParseNodes; using Microsoft.OpenApi.Any; -using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Interfaces; +using Microsoft.OpenApi.Models; +using Microsoft.OpenApi.Readers.ParseNodes; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { /// /// Class containing logic to deserialize Open API V3 document into diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/FixedFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs similarity index 88% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/FixedFieldMap.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs index 3e7fcaf78..ca3febb33 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/FixedFieldMap.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal class FixedFieldMap : Dictionary> { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ListNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs similarity index 97% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ListNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs index 3d98857bf..772598c7f 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ListNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs @@ -10,7 +10,7 @@ using SharpYaml.Serialization; using Microsoft.OpenApi.Any; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal class ListNode : ParseNode, IEnumerable { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/MapNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs similarity index 99% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/MapNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs index e3435ef9f..0dcc9b5ad 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/MapNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs @@ -12,7 +12,7 @@ using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Interfaces; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { /// /// Abstraction of a Map to isolate semantic parsing from details of diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ParseNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs similarity index 98% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ParseNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs index 9122e8aac..b143a2972 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ParseNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs @@ -10,7 +10,7 @@ using Microsoft.OpenApi.Any; using Microsoft.OpenApi.Interfaces; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal abstract class ParseNode { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PatternFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs similarity index 88% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PatternFieldMap.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs index 1fd238f68..51028da14 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PatternFieldMap.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal class PatternFieldMap : Dictionary, Action> { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PropertyNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs similarity index 97% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PropertyNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs index e810500d8..fd76eaa9d 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PropertyNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs @@ -9,7 +9,7 @@ using SharpYaml.Serialization; using Microsoft.OpenApi.Any; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal class PropertyNode : ParseNode { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/RootNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs similarity index 97% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/RootNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs index fedf2483d..1d2602436 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/RootNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs @@ -6,7 +6,7 @@ using System; using SharpYaml.Serialization; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { /// /// Wrapper class around YamlDocument to isolate semantic parsing from details of Yaml DOM. diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ValueNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs similarity index 96% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ValueNode.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs index b8f90b3d5..8e8b8dfef 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ValueNode.cs +++ b/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs @@ -7,7 +7,7 @@ using SharpYaml.Serialization; using Microsoft.OpenApi.Any; -namespace Microsoft.OpenApi.Readers.YamlReaders.ParseNodes +namespace Microsoft.OpenApi.Readers.ParseNodes { internal class ValueNode : ParseNode { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs similarity index 98% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ParsingContext.cs rename to src/Microsoft.OpenApi.Readers/ParsingContext.cs index 32394f5f3..7b374cf5f 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ParsingContext.cs +++ b/src/Microsoft.OpenApi.Readers/ParsingContext.cs @@ -8,7 +8,7 @@ using Microsoft.OpenApi.Interfaces; using Microsoft.OpenApi.Models; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { public class ParsingContext { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/ReferenceService.cs b/src/Microsoft.OpenApi.Readers/ReferenceService.cs similarity index 96% rename from src/Microsoft.OpenApi.Readers/YamlReaders/ReferenceService.cs rename to src/Microsoft.OpenApi.Readers/ReferenceService.cs index 3bd40a2cd..e640f5332 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/ReferenceService.cs +++ b/src/Microsoft.OpenApi.Readers/ReferenceService.cs @@ -1,9 +1,8 @@ using System; -using Microsoft.OpenApi; using Microsoft.OpenApi.Interfaces; using Microsoft.OpenApi.Models; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { internal class OpenApiReferenceService : IOpenApiReferenceService { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/YamlHelper.cs b/src/Microsoft.OpenApi.Readers/YamlHelper.cs similarity index 95% rename from src/Microsoft.OpenApi.Readers/YamlReaders/YamlHelper.cs rename to src/Microsoft.OpenApi.Readers/YamlHelper.cs index 0f94ddbf6..267494874 100644 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/YamlHelper.cs +++ b/src/Microsoft.OpenApi.Readers/YamlHelper.cs @@ -7,7 +7,7 @@ using System.Linq; using SharpYaml.Serialization; -namespace Microsoft.OpenApi.Readers.YamlReaders +namespace Microsoft.OpenApi.Readers { internal static class YamlHelper { diff --git a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStreamReader.cs deleted file mode 100644 index 246bd1450..000000000 --- a/src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStreamReader.cs +++ /dev/null @@ -1,91 +0,0 @@ -// ------------------------------------------------------------ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. -// ------------------------------------------------------------ - -using System.IO; -using System.Linq; -using Microsoft.OpenApi.Readers.Interface; -using Microsoft.OpenApi.Readers.YamlReaders.ParseNodes; -using SharpYaml; -using SharpYaml.Serialization; -using Microsoft.OpenApi.Models; - -namespace Microsoft.OpenApi.Readers.YamlReaders -{ - /// - /// Service class for converting streams into OpenApiDocument instances - /// - public class OpenApiStreamReader : IOpenApiReader - { - /// - /// Gets the version of the Open API document. - /// - private static string GetVersion(RootNode rootNode) - { - var versionNode = rootNode.Find(new JsonPointer("/openapi")); - - if (versionNode != null) - { - return versionNode.GetScalarValue(); - } - - versionNode = rootNode.Find(new JsonPointer("/swagger")); - - return versionNode?.GetScalarValue(); - } - - /// - /// Reads the stream input and parses it into an Open API document. - /// - public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic) - { - RootNode rootNode; - var context = new ParsingContext(); - diagnostic = new OpenApiDiagnostic(); - - try - { - using (var streamReader = new StreamReader(input)) - { - var yamlStream = new YamlStream(); - yamlStream.Load(streamReader); - - var yamlDocument = yamlStream.Documents.First(); - rootNode = new RootNode(context, diagnostic, yamlDocument); - } - } - catch (SyntaxErrorException ex) - { - diagnostic.Errors.Add(new OpenApiError(string.Empty, ex.Message)); - - return new OpenApiDocument(); - } - - var inputVersion = GetVersion(rootNode); - - switch (inputVersion) - { - case "2.0": - context.SetReferenceService( - new OpenApiReferenceService(rootNode) - { - loadReference = OpenApiV2Deserializer.LoadReference, - parseReference = p => OpenApiV2Deserializer.ParseReference(p) - }); - - return OpenApiV2Deserializer.LoadOpenApi(rootNode); - - default: - context.SetReferenceService( - new OpenApiReferenceService(rootNode) - { - loadReference = OpenApiV3Deserializer.LoadReference, - parseReference = p => new OpenApiReference(p) - }); - - return OpenApiV3Deserializer.LoadOpenApi(rootNode); - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs index fbc59c194..9a59829d5 100644 --- a/src/Microsoft.OpenApi.Workbench/MainModel.cs +++ b/src/Microsoft.OpenApi.Workbench/MainModel.cs @@ -4,7 +4,7 @@ using System.IO; using System.Text; using Microsoft.OpenApi.Models; -using Microsoft.OpenApi.Readers.YamlReaders; +using Microsoft.OpenApi.Readers; namespace Microsoft.OpenApi.Workbench { diff --git a/test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs b/test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs index 3ac1c4af4..efff15ae0 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using System.Text; -using Microsoft.OpenApi.Readers.YamlReaders; using SharpYaml.Serialization; using Xunit; diff --git a/test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs index 170984636..2deb7f039 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs @@ -4,7 +4,6 @@ // ------------------------------------------------------------ using System.Linq; -using Microsoft.OpenApi.Readers.YamlReaders; using Xunit; namespace Microsoft.OpenApi.Readers.Tests diff --git a/test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs b/test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs index 0a5d9bb41..cf946dc75 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs @@ -5,8 +5,7 @@ using System.IO; using System.Linq; -using Microsoft.OpenApi.Readers.YamlReaders; -using Microsoft.OpenApi.Readers.YamlReaders.ParseNodes; +using Microsoft.OpenApi.Readers.ParseNodes; using SharpYaml.Serialization; using Xunit; diff --git a/test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs index 79165a5e3..41fc3da9f 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs @@ -4,7 +4,6 @@ // ------------------------------------------------------------ using Microsoft.OpenApi.Any; -using Microsoft.OpenApi.Readers.YamlReaders; using System.Linq; using Xunit; diff --git a/test/Microsoft.OpenApi.Readers.Tests/ModelToV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ModelToV2Tests.cs index f011ec1b4..380cac870 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ModelToV2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ModelToV2Tests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using Microsoft.OpenApi.Models; -using Microsoft.OpenApi.Readers.YamlReaders; using Newtonsoft.Json.Linq; using Xunit; diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiExampleTests.cs index 6c3fb2298..462fc6e15 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiExampleTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiExampleTests.cs @@ -6,7 +6,6 @@ using System; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.OpenApi.Readers.YamlReaders; using Xunit; namespace Microsoft.OpenApi.Readers.Tests diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs index c1afb7210..48077a232 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs @@ -4,7 +4,6 @@ // ------------------------------------------------------------ using Microsoft.OpenApi.Models; -using Microsoft.OpenApi.Readers.YamlReaders; using Xunit; namespace Microsoft.OpenApi.Readers.Tests diff --git a/test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs index 9e50e3239..68fcd2de0 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs @@ -4,9 +4,8 @@ // ------------------------------------------------------------ using System.Linq; -using Microsoft.OpenApi.Readers.YamlReaders; -using Xunit; using Microsoft.OpenApi.Models; +using Xunit; namespace Microsoft.OpenApi.Readers.Tests { diff --git a/test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs index 3aa4c738f..77fd117b3 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs @@ -3,8 +3,7 @@ // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. // ------------------------------------------------------------ -using Microsoft.OpenApi.Readers.YamlReaders; -using Microsoft.OpenApi.Readers.YamlReaders.ParseNodes; +using Microsoft.OpenApi.Readers.ParseNodes; using Xunit; namespace Microsoft.OpenApi.Readers.Tests diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs index 984edcf46..0b6277bbf 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs @@ -3,7 +3,6 @@ // Licensed under the MIT License (MIT). See LICENSE in the repo root for license information. // ------------------------------------------------------------ -using Microsoft.OpenApi.Readers.YamlReaders; using Xunit; namespace Microsoft.OpenApi.Readers.Tests.V2Tests