Merge pull request #2368 from microsoft/fix/flatten-namespaces

chore: flatten namespace hierarchy

Author: MaggieKimani1

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;