AutoRest Option Page

src/ApiClientCodeGen.Tests/ApiClientCodeGen.Tests.csproj

@@ -352,7 +352,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Converters\CSharpToVisualBasicLanguageConverterTests.cs" />
+    <None Include="Converters\CSharpToVisualBasicLanguageConverterTests.cs" />
     <Compile Include="CustomTool\SingleFileCodeGeneratorTests.cs" />
     <Compile Include="CustomTool\TestSingleFileCodeGenerator.cs" />
     <Compile Include="Extensions\GetDependenciesTests.cs" />
@@ -381,6 +381,7 @@
     <Compile Include="Options\CustomPathOptionsTests.cs" />
     <Compile Include="Options\JavaPathProviderTests.cs" />
     <Compile Include="Options\NSwagCSharpOptionsNullOptionsTests.cs" />
+    <Compile Include="Options\AutoRestOptionsTests.cs" />
     <Compile Include="Options\NSwagCSharpOptionsTests.cs" />
     <Compile Include="Options\NSwagStudioOptionsNullOptionsTests.cs" />
     <Compile Include="Options\NSwagStudioOptionsTests.cs" />

src/ApiClientCodeGen.Tests/Generators/CodeGeneratorFactoryTests.cs

@@ -5,6 +5,9 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.OpenApi;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.Swagger;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.AutoRest;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -26,6 +29,9 @@ public void Init()
             mockFactory
                 .Setup(c => c.Create<IGeneralOptions, GeneralOptionPage>())
                 .Returns(Test.CreateDummy<IGeneralOptions>());
+            mockFactory
+                .Setup(c => c.Create<IAutoRestOptions, AutoRestOptionsPage>())
+                .Returns(Test.CreateDummy<IAutoRestOptions>());
 
             sut = new CodeGeneratorFactory(mockFactory.Object);
         }

src/ApiClientCodeGen.Tests/Generators/NSwag/NSwagCSharpCodeGeneratorTests.cs

@@ -2,6 +2,7 @@
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwag;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
 using FluentAssertions;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

src/ApiClientCodeGen.Tests/Generators/NSwag/NSwagCodeGeneratorSettingsFactoryTests.cs

@@ -1,5 +1,6 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwag;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

src/ApiClientCodeGen.Tests/Generators/NSwagStudio/NSwagStudioFileHelperTests.cs

@@ -4,6 +4,9 @@
 using Moq;
 using System.IO;
 using System.Threading.Tasks;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwagStudio;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Windows;
 
 namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Tests.Generators.NSwagStudio
 {
@@ -20,8 +23,7 @@ public async Task InitAsync()
             mock = new Mock<INSwagStudioOptions>();
 
             await NSwagStudioFileHelper.CreateNSwagStudioFileAsync(
-                File.ReadAllText("Swagger.json"),
-                "https://petstore.swagger.io/v2/swagger.json",
+                new EnterOpenApiSpecDialogResult(File.ReadAllText("Swagger.json"), "Swagger", "https://petstore.swagger.io/v2/swagger.json"),
                 mock.Object);
         }
 

src/ApiClientCodeGen.Tests/Generators/OpenApi/OpenApiCSharpCodeGeneratorTests.cs

@@ -1,6 +1,7 @@
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.OpenApi;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Generators/Swagger/SwaggerCSharpCodeGeneratorTests.cs

@@ -1,6 +1,7 @@
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.Swagger;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Options/AutoRestOptionsTests.cs

@@ -0,0 +1,59 @@
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.AutoRest;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Tests.Options
+{
+    [TestClass]
+    public class AutoRestOptionsTests
+    {
+        private IAutoRestOptions options;
+
+        [TestInitialize]
+        public void Init()
+            => options = new Mock<IAutoRestOptions>().Object;
+
+        [TestMethod]
+        public void Reads_AddCredentials_From_Options()
+            => new AutoRestOptions(options)
+                .AddCredentials
+                .Should()
+                .Be(options.AddCredentials);
+
+        [TestMethod]
+        public void Reads_ClientSideValidation_From_Options()
+            => new AutoRestOptions(options)
+                .ClientSideValidation
+                .Should()
+                .Be(options.ClientSideValidation);
+
+        [TestMethod]
+        public void Reads_SyncMethods_From_Options()
+            => new AutoRestOptions(options)
+                .SyncMethods
+                .Should()
+                .Be(options.SyncMethods);
+
+        [TestMethod]
+        public void Reads_UseDateTimeOffset_From_Options()
+            => new AutoRestOptions(options)
+                .UseDateTimeOffset
+                .Should()
+                .Be(options.UseDateTimeOffset);
+
+        [TestMethod]
+        public void Reads_UseInternalConstructors_From_Options()
+            => new AutoRestOptions(options)
+                .UseInternalConstructors
+                .Should()
+                .Be(options.UseInternalConstructors);
+
+        [TestMethod]
+        public void Reads_OverrideClientName_From_Options()
+            => new AutoRestOptions(options)
+                .OverrideClientName
+                .Should()
+                .Be(options.OverrideClientName);
+    }
+}

src/ApiClientCodeGen.Tests/Options/CustomPathOptionsNullOptionsTests.cs

@@ -1,6 +1,7 @@
 using System;
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Options/CustomPathOptionsTests.cs

@@ -1,5 +1,6 @@
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Options/JavaPathProviderTests.cs

@@ -1,5 +1,6 @@
 using AutoFixture;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Options/NSwagCSharpOptionsNullOptionsTests.cs

@@ -1,4 +1,5 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NJsonSchema.CodeGeneration.CSharp;

src/ApiClientCodeGen.Tests/Options/NSwagCSharpOptionsTests.cs

@@ -1,4 +1,5 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;

src/ApiClientCodeGen.Tests/Options/NSwagStudioOptionsNullOptionsTests.cs

@@ -1,4 +1,6 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwagStudio;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NJsonSchema.CodeGeneration.CSharp;
@@ -9,10 +11,10 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Tests.Options
     public class NSwagStudioOptionsNullOptionsTests
     {
         [TestMethod]
-        public void Extends_NSwagCSharpOptions() 
+        public void Implements_INSwagStudioOptions() 
             => typeof(NSwagStudioOptions)
                 .Should()
-                .BeAssignableTo<NSwagCSharpOptions>();
+                .BeAssignableTo<INSwagStudioOptions>();
 
         [TestMethod]
         public void Reads_InjectHttpClient_From_Options()

src/ApiClientCodeGen.Tests/Options/NSwagStudioOptionsTests.cs

@@ -1,5 +1,4 @@
-using AutoFixture;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwagStudio;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -19,10 +18,10 @@ public void Init()
         }
 
         [TestMethod]
-        public void Extends_NSwagCSharpOptions() 
+        public void Implements_INSwagStudioOptions() 
             => typeof(NSwagStudioOptions)
                 .Should()
-                .BeAssignableTo<NSwagCSharpOptions>();
+                .BeAssignableTo<INSwagStudioOptions>();
 
         [TestMethod]
         public void Reads_InjectHttpClient_From_Options()

src/ApiClientCodeGen.Tests/Options/PathProviderTests.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

src/ApiClientCodeGen.VSIX/ApiClientCodeGen.VSIX.csproj

@@ -106,31 +106,38 @@
     <Compile Include="Generators\NSwag\NSwagCSharpCodeGenerator.cs" />
     <Compile Include="Generators\NSwag\OpenApiDocumentFactory.cs" />
     <Compile Include="NuGet\PackageDependencies.cs" />
-    <Compile Include="Options\CustomPathOptions.cs" />
-    <Compile Include="Options\IGeneralOptions.cs" />
-    <Compile Include="Options\INSwagOption.cs" />
-    <Compile Include="Options\INSwagStudioOptions.cs" />
+    <Compile Include="Options\AutoRest\AutoRestOptions.cs" />
+    <Compile Include="Options\AutoRest\AutoRestOptionsPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Options\AutoRest\IAutoRestOptions.cs" />
+    <Compile Include="Options\OptionsBase.cs" />
+    <Compile Include="Options\AutoRest\SyncMethodOptions.cs" />
+    <Compile Include="Options\General\CustomPathOptions.cs" />
+    <Compile Include="Options\General\IGeneralOptions.cs" />
+    <Compile Include="Options\NSwag\INSwagOption.cs" />
+    <Compile Include="Options\NSwagStudio\INSwagStudioOptions.cs" />
     <Compile Include="Options\IOptionsFactory.cs" />
-    <Compile Include="Options\JavaPathProvider.cs" />
-    <Compile Include="Options\NSwagStudioOptions.cs" />
-    <Compile Include="Options\NSwagCSharpOptions.cs" />
+    <Compile Include="Options\General\JavaPathProvider.cs" />
+    <Compile Include="Options\NSwagStudio\NSwagStudioOptions.cs" />
+    <Compile Include="Options\NSwag\NSwagCSharpOptions.cs" />
     <Compile Include="Generators\OpenApi\OpenApiCSharpCodeGenerator.cs" />
     <Compile Include="Generators\ProcessHelper.cs" />
     <Compile Include="Generators\Swagger\SwaggerCSharpCodeGenerator.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="NuGet\PackageDependency.cs" />
     <Compile Include="NuGet\PackageDependencyListProvider.cs" />
-    <Compile Include="Options\NSwagOptionsPage.cs">
+    <Compile Include="Options\NSwag\NSwagOptionsPage.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Options\NSwagStudioOptionsPage.cs">
+    <Compile Include="Options\NSwagStudio\NSwagStudioOptionsPage.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Options\OptionsFactory.cs" />
-    <Compile Include="Options\GeneralOptionPage.cs">
+    <Compile Include="Options\General\GeneralOptionPage.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Options\PathProvider.cs" />
+    <Compile Include="Options\General\PathProvider.cs" />
     <Compile Include="Utility\OutputWindow.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utility\OutputWindowTraceListener.cs" />

src/ApiClientCodeGen.VSIX/Commands/AddNew/NewRestClientCommand.cs

@@ -7,6 +7,9 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwagStudio;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwagStudio;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Windows;
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
@@ -51,8 +54,7 @@ private async Task OnExecuteAsync(DTE dte, AsyncPackage package)
             {
                 var outputNamespace = ProjectExtensions.GetActiveProject(dte)?.GetTopLevelNamespace();
                 contents = await NSwagStudioFileHelper.CreateNSwagStudioFileAsync(
-                    result.OpenApiSpecification,
-                    result.Url,
+                    result,
                     new NSwagStudioOptions(),
                     outputNamespace);
                 filename = filename.Replace(".json", ".nswag");

src/ApiClientCodeGen.VSIX/Commands/NSwagStudio/NSwagStudioCommand.cs

@@ -5,6 +5,7 @@
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwagStudio;
 using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
 using Task = System.Threading.Tasks.Task;

src/ApiClientCodeGen.VSIX/Extensions/OpenApiDocumentExtensions.cs

@@ -1,14 +1,32 @@
-using System.Linq;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using NSwag;
 
 namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions
 {
     public static class OpenApiDocumentExtensions
     {
-        public static string GenerateClassName(this OpenApiDocument document)
-            => string.IsNullOrWhiteSpace(document.Info?.Title)
+        public static string GenerateClassName(this OpenApiDocument document, bool useDocumentTitle = true)
+        {
+            try
+            {
+                if (!useDocumentTitle)
+                    return new FileInfo(document.DocumentPath)
+                        .Name
+                        .Replace(".json", string.Empty);
+            }
+            catch (Exception e)
+            {
+                Trace.WriteLine("Unable to extract class name from document path: " + document.DocumentPath);
+                Trace.WriteLine(e);
+            }
+
+            return string.IsNullOrWhiteSpace(document.Info?.Title)
                 ? "ApiClient"
                 : $"{GetSanitizeTitle(document)}Client";
+        }
 
         public static string GetSanitizeTitle(this OpenApiDocument document)
             => RemoveCharacters(