fix ApiGenerator style violations

(cherry picked from commit e1b89de)

Author: Mpdreamz

src/ApiGenerator/Configuration/CodeConfiguration.cs

@@ -140,12 +140,13 @@ public static Dictionary<string, string> ApiNameMapping
 				if (_apiNameMapping != null) return _apiNameMapping;
 				lock (LowLevelApiNameMapping)
 				{
-					if (_apiNameMapping != null) return _apiNameMapping;
-
-					var mapping = new Dictionary<string,string>(HighLevelApiNameMapping);
-					foreach (var (k, v) in LowLevelApiNameMapping)
-						mapping[k] = v;
-					_apiNameMapping = mapping;
+					if (_apiNameMapping == null)
+					{
+						var mapping = new Dictionary<string, string>(HighLevelApiNameMapping);
+						foreach (var (k, v) in LowLevelApiNameMapping)
+							mapping[k] = v;
+						_apiNameMapping = mapping;
+					}
 					return _apiNameMapping;
 				}
 			}

src/ApiGenerator/Domain/Code/CsharpNames.cs

@@ -38,7 +38,7 @@ string Replace(string original, string ns, string find, string replace, string[]
 			var namespaceRenames = new Dictionary<string, (string find, string replace, string[] exceptions)>
 			{
 				{ "Watcher", (find: "Watch", replace: "", exceptions: new string[0]) },
-				{ "Indices", (find: "Index", replace: "", exceptions: new string[] { "SimulateIndexTemplate" }) },
+				{ "Indices", (find: "Index", replace: "", exceptions: new [] { "SimulateIndexTemplate" }) },
 				{ "CrossClusterReplication", (find: "Ccr", replace: "", exceptions: new string[0]) },
 				{ "IndexLifecycleManagement", (find: "Ilm", replace: "", exceptions: new string[0]) },
 				{ "SnapshotLifecycleManagement", (find: "Slm", replace: "", exceptions: new string[0]) },

src/ApiGenerator/Generator/ApiEndpointFactory.cs

@@ -87,7 +87,7 @@ private static void PatchRequestParameters(ApiEndpoint endpoint)
 		private static void PatchOfficialSpec(JObject original, string jsonFile)
 		{
 			var directory = Path.GetDirectoryName(jsonFile);
-			var patchFile = Path.Combine(directory,"..", "_Patches", Path.GetFileNameWithoutExtension(jsonFile)) + ".patch.json";
+			var patchFile = Path.Combine(directory!,"..", "_Patches", Path.GetFileNameWithoutExtension(jsonFile)) + ".patch.json";
 			if (!File.Exists(patchFile)) return;
 
 			var patchedJson = JObject.Parse(File.ReadAllText(patchFile));
@@ -103,9 +103,7 @@ private static void PatchOfficialSpec(JObject original, string jsonFile)
 
 			var methodsOverride = patchedJson.SelectToken("*.methods");
 			if (methodsOverride != null)
-			{
 				original.SelectToken("*.methods").Replace(methodsOverride);
-			}
 
 			var paramsOverride = patchedJson.SelectToken("*.params");
 			var originalParams = original.SelectToken("*.url.params") as JObject;
@@ -179,7 +177,7 @@ private static void TransformNewSpecStructureToOld(JObject original)
 
 			var newUrl = new JObject
 			{
-				["paths"] = new JArray(paths.ToArray()),
+				["paths"] = new JArray(paths.Cast<object>().ToArray()),
 			};
 
 			if (spec.ContainsKey("params"))
@@ -192,10 +190,10 @@ private static void TransformNewSpecStructureToOld(JObject original)
 				newUrl["parts"] = parts;
 
 			if (deprecatedPaths.Any())
-				newUrl["deprecated_paths"] = new JArray(deprecatedPaths.ToArray());
+				newUrl["deprecated_paths"] = new JArray(deprecatedPaths.Cast<object>().ToArray());
 
 			spec["url"] = newUrl;
-			spec["methods"] = new JArray(methods.ToArray());
+			spec["methods"] = new JArray(methods.Cast<object>().ToArray());
 		}
 	}
 }

src/ApiGenerator/Generator/ApiGenerator.cs

@@ -22,7 +22,7 @@ public class ApiGenerator
 
 		public static async Task Generate(string downloadBranch, bool lowLevelOnly, RestApiSpec spec)
 		{
-			async Task Generate(IList<RazorGeneratorBase> generators, RestApiSpec restApiSpec, bool highLevel)
+			static async Task DoGenerate(ICollection<RazorGeneratorBase> generators, RestApiSpec restApiSpec, bool highLevel)
 			{
 				var pbarOpts = new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray };
 				var message = $"Generating {(highLevel ? "high" : "low")} level code";
@@ -55,17 +55,15 @@ async Task Generate(IList<RazorGeneratorBase> generators, RestApiSpec restApiSpe
 				new RequestsGenerator(),
 			};
 
-			await Generate(lowLevelGenerators, spec, highLevel: false);
+			await DoGenerate(lowLevelGenerators, spec, highLevel: false);
 			if (!lowLevelOnly)
-				await Generate(highLevelGenerators, spec, highLevel: true);
+				await DoGenerate(highLevelGenerators, spec, highLevel: true);
 
 			// Check if there are any non-Stable endpoints present.
 			foreach (var endpoint in spec.Endpoints)
 			{
 				if (endpoint.Value.Stability != Stability.Stable)
-				{
 					Warnings.Add($"Endpoint {endpoint.Value.Name} is not marked as Stable ({endpoint.Value.Stability})");
-				}
 			}
 
 			if (Warnings.Count == 0) return;

src/ApiGenerator/Program.cs

@@ -36,8 +36,8 @@ private static async Task Main(string[] args)
 			if (string.IsNullOrEmpty(downloadBranch))
 				downloadBranch = DownloadBranch;
 
-			var generateCode = Ask("Generate code from the specification files on disk?", true);
-			var lowLevelOnly = generateCode && Ask("Generate low level client only?", false);
+			var generateCode = Ask("Generate code from the specification files on disk?", defaultAnswer: true);
+			var lowLevelOnly = generateCode && Ask("Generate low level client only?", defaultAnswer: false);
 
 			if (redownloadCoreSpecification)
 				RestSpecDownloader.Download(downloadBranch);

src/ApiGenerator/Views/HighLevel/Client/Implementation/ElasticClient.cshtml

@@ -13,7 +13,7 @@ using Nest;
 
 @{
 	RestApiSpec model = Model;
-	var namespaces = model.EndpointsPerNamespaceHighLevel.Keys.Where(k => k != CsharpNames.RootNamespace);
+	var namespaces = model.EndpointsPerNamespaceHighLevel.Keys.Where(k => k != CsharpNames.RootNamespace).ToList();
 <text>
 // ReSharper disable RedundantTypeArgumentsOfMethod
 namespace Nest

src/ApiGenerator/Views/HighLevel/Client/Usings.cshtml

@@ -7,6 +7,5 @@
 	{
 <text>using Nest.@(CsharpNames.ApiNamespace).@(kv.Key)@(CsharpNames.ApiNamespaceSuffix);
 </text>
-		continue;
 	}
 }

src/ApiGenerator/Views/HighLevel/Descriptors/RequestDescriptorBase.cshtml

@@ -1,8 +1,5 @@
 @using ApiGenerator.Domain
 @inherits ApiGenerator.CodeTemplatePage<RestApiSpec>
-@{
-	RestApiSpec m = Model;
-}
 using System.Collections.Generic;
 
 namespace Nest

src/ApiGenerator/Views/HighLevel/Requests/PlainRequestBase.cshtml

@@ -1,9 +1,6 @@
 @using System.Linq
 @using ApiGenerator.Domain
 @inherits ApiGenerator.CodeTemplatePage<RestApiSpec>
-@{
-	RestApiSpec m = Model;
-}
 @{ await IncludeAsync("GeneratorNotice.cshtml", Model); }
 // ReSharper disable RedundantUsingDirective
 using System;

src/ApiGenerator/Views/LowLevel/Client/Implementation/ElasticLowLevelClient.cshtml

@@ -18,7 +18,7 @@ using static Elasticsearch.Net.HttpMethod;
 
 @{
 	RestApiSpec model = Model;
-	var namespaces = model.EndpointsPerNamespaceLowLevel.Keys.Where(k => k != CsharpNames.RootNamespace);
+	var namespaces = model.EndpointsPerNamespaceLowLevel.Keys.Where(k => k != CsharpNames.RootNamespace).ToList();
 <text>
 // ReSharper disable InterpolatedStringExpressionIsNotIFormattable
 // ReSharper disable RedundantExtendsListEntry