chore: flatten namespace hierarchy

performance/benchmark/Descriptions.cs

@@ -1,12 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using Microsoft.OpenApi;
-using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
 
 namespace performance;

performance/benchmark/EmptyModels.cs

@@ -1,7 +1,5 @@
-using System;
-using BenchmarkDotNet;
-using BenchmarkDotNet.Attributes;
-using Microsoft.OpenApi.Models;
+using BenchmarkDotNet.Attributes;
+using Microsoft.OpenApi;
 
 namespace performance;
 [MemoryDiagnoser]

src/Microsoft.OpenApi.Hidi/Extensions/OpenApiExtensibleExtensions.cs

@@ -1,6 +1,4 @@
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json.Nodes;
 
 namespace Microsoft.OpenApi.Hidi.Extensions

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -7,9 +7,6 @@
 using Humanizer;
 using Humanizer.Inflections;
 using Microsoft.OpenApi.Hidi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Microsoft.OpenApi.Services;
 
 namespace Microsoft.OpenApi.Hidi.Formatters
 {

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -23,17 +23,11 @@
 using Microsoft.OpenApi.ApiManifest;
 using Microsoft.OpenApi.ApiManifest.OpenAI;
 using Microsoft.OpenApi.ApiManifest.OpenAI.Authentication;
-using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Hidi.Extensions;
 using Microsoft.OpenApi.Hidi.Formatters;
 using Microsoft.OpenApi.Hidi.Options;
 using Microsoft.OpenApi.Hidi.Utilities;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.OData;
 using Microsoft.OpenApi.Reader;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Writers;
-using Microsoft.OpenApi.YamlReader;
 using static Microsoft.OpenApi.Hidi.OpenApiSpecVersionHelper;
 
 namespace Microsoft.OpenApi.Hidi
@@ -420,7 +414,8 @@ private static async Task<ReadResult> ParseOpenApiAsync(string openApiFile, bool
             var edmModel = CsdlReader.Parse(XElement.Parse(csdlText).CreateReader());
             settings ??= SettingsUtilities.GetConfiguration();
 
-            var document = edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion));
+            // TODO: uncomment when namespaces are fixed in OData lib
+            var document = new OpenApiDocument(); //edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion));
             document = FixReferences(document, format);
 
             return document;

src/Microsoft.OpenApi.Hidi/StatsVisitor.cs

@@ -3,9 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Microsoft.OpenApi.Services;
 
 namespace Microsoft.OpenApi.Hidi
 {

src/Microsoft.OpenApi.Workbench/MainModel.cs

@@ -8,13 +8,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations;
-using Microsoft.OpenApi.YamlReader;
-using Microsoft.OpenApi.Writers;
 
 namespace Microsoft.OpenApi.Workbench
 {

src/Microsoft.OpenApi.Workbench/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Microsoft.OpenApi.Workbench"
-        xmlns:writers="clr-namespace:Microsoft.OpenApi.Writers;assembly=Microsoft.OpenApi"
+        xmlns:writers="clr-namespace:Microsoft.OpenApi;assembly=Microsoft.OpenApi"
         mc:Ignorable="d"
         Title="OpenAPI Workbench" Height="600" Width="800">
     <Grid>

src/Microsoft.OpenApi.Workbench/StatsVisitor.cs

@@ -3,9 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Microsoft.OpenApi.Services;
 
 namespace Microsoft.OpenApi.Workbench
 {

src/Microsoft.OpenApi.YamlReader/OpenApiReaderSettingsExtensions.cs

@@ -1,5 +1,4 @@
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.YamlReader;
+using Microsoft.OpenApi.YamlReader;
 
 namespace Microsoft.OpenApi.Reader;
 

src/Microsoft.OpenApi.YamlReader/OpenApiYamlReader.cs

@@ -6,10 +6,8 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Reader;
 using SharpYaml.Serialization;
-using Microsoft.OpenApi.Models;
 using System;
 using System.Linq;
 using System.Text;

src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.OpenApi.Attributes
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Represents the Open Api Data type metadata attribute.

src/Microsoft.OpenApi/Exceptions/OpenApiException.cs

@@ -2,9 +2,8 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Exception type representing exceptions in the Open API library.

src/Microsoft.OpenApi/Exceptions/OpenApiReaderException.cs

@@ -2,16 +2,15 @@
 // Licensed under the MIT license.
 
 using System;
-using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Reader;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Defines an exception indicating OpenAPI Reader encountered an issue while reading.
     /// </summary>
     [Serializable]
     public class OpenApiReaderException : OpenApiException
     {
         /// <summary>
         /// Initializes the <see cref="OpenApiReaderException"/> class.

src/Microsoft.OpenApi/Exceptions/OpenApiUnsupportedSpecVersionException.cs

@@ -4,13 +4,13 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Defines an exception indicating OpenAPI Reader encountered an unsupported specification version while reading.
     /// </summary>
     [Serializable]
     public class OpenApiUnsupportedSpecVersionException : Exception
     {
         const string messagePattern = "OpenAPI specification version '{0}' is not supported.";
 

src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs

@@ -2,9 +2,8 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Exception type representing exceptions in the OpenAPI writer.

src/Microsoft.OpenApi/Expressions/BodyExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Body expression.

src/Microsoft.OpenApi/Expressions/CompositeExpression.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// String literal with embedded expressions
@@ -13,12 +13,12 @@
     public class CompositeExpression : RuntimeExpression
     {
         private readonly string template;
         private Regex expressionPattern = new(@"{(?<exp>\$[^}]*)");
 
         /// <summary>
         /// Expressions embedded into string literal
         /// </summary>
         public List<RuntimeExpression> ContainedExpressions = new();
 
         /// <summary>
         /// Create a composite expression from a string literal with an embedded expression

src/Microsoft.OpenApi/Expressions/HeaderExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Header expression, The token identifier in header is case-insensitive.

src/Microsoft.OpenApi/Expressions/MethodExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Method expression.

src/Microsoft.OpenApi/Expressions/PathExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Path expression, the name in path is case-sensitive.

src/Microsoft.OpenApi/Expressions/QueryExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Query expression, the name in query is case-sensitive.

src/Microsoft.OpenApi/Expressions/RequestExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// $request. expression.

src/Microsoft.OpenApi/Expressions/ResponseExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// $response. expression.

src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs

@@ -2,15 +2,13 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Base class for the Open API runtime expression.
     /// </summary>
     public abstract class RuntimeExpression : IEquatable<RuntimeExpression>
     {
         /// <summary>
         /// The dollar sign prefix for a runtime expression.

src/Microsoft.OpenApi/Expressions/SourceExpression.cs

@@ -2,10 +2,8 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Source expression.

src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// StatusCode expression.

src/Microsoft.OpenApi/Expressions/UrlExpression.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Url expression.

src/Microsoft.OpenApi/Extensions/EnumExtensions.cs

@@ -6,9 +6,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using Microsoft.OpenApi.Attributes;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Enumeration type extension methods.

src/Microsoft.OpenApi/Extensions/JsonNodeExtension.cs

@@ -2,10 +2,8 @@
 // Licensed under the MIT license.
 
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// A wrapper class for JsonNode

src/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs

@@ -1,6 +1,4 @@
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi
+namespace Microsoft.OpenApi
 {
     internal static class OpenAPIWriterExtensions
     {

src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs

@@ -3,12 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods that apply across all OpenAPIElements

src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs

@@ -2,13 +2,8 @@
 // Licensed under the MIT license.
 
 using System;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods to verify validity and add an extension to Extensions property.

src/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs

@@ -4,12 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods for resolving references on <see cref="IOpenApiReferenceable"/> elements.

src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs

@@ -5,13 +5,8 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods for <see cref="IOpenApiSerializable"/> serialization.

src/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Extensions;
+namespace Microsoft.OpenApi;
 
 /// <summary>
 /// Extension methods for <see cref="OpenApiServer"/> serialization.