Remove the YamlReaders folder in the Reader project and change the na…

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiDiagnostic.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiError.cs → 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
     {

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
+{
+    /// <summary>
+    /// Service class for converting streams into OpenApiDocument instances
+    /// </summary>
+    public class OpenApiStreamReader : IOpenApiReader<Stream, OpenApiDiagnostic>
+    {
+        /// <summary>
+        /// Gets the version of the Open API document.
+        /// </summary>
+        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();
+        }
+
+        /// <summary>
+        /// Reads the stream input and parses it into an Open API document.
+        /// </summary>
+        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);
+            }
+        }
+    }
+}

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiStringReader.cs → 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
 {
     /// <summary>
     /// Service class for converting strings into OpenApiDocument instances

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV2Deserializer.cs → 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
 {
     /// <summary>
     /// Class containing logic to deserialize Open API V2 document into

src/Microsoft.OpenApi.Readers/YamlReaders/OpenApiV3Deserializer.cs → 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
 {
     /// <summary>
     /// Class containing logic to deserialize Open API V3 document into

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/FixedFieldMap.cs → 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<T> : Dictionary<string, Action<T, ParseNode>>
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ListNode.cs → 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<ParseNode>
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/MapNode.cs → 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
 {
     /// <summary>
     /// Abstraction of a Map to isolate semantic parsing from details of

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ParseNode.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PatternFieldMap.cs → 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<T> : Dictionary<Func<string, bool>, Action<T, string, ParseNode>>
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/PropertyNode.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/RootNode.cs → 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
 {
     /// <summary>
     /// Wrapper class around YamlDocument to isolate semantic parsing from details of Yaml DOM.

src/Microsoft.OpenApi.Readers/YamlReaders/ParseNodes/ValueNode.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ParsingContext.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/ReferenceService.cs → 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
     {

src/Microsoft.OpenApi.Readers/YamlReaders/YamlHelper.cs → 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
     {

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
 {

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;
 

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

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;
 

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;