Code Cleanup: ApiGenerator

Author: Mpdreamz

src/CodeGeneration/ApiGenerator/ApiGenerator.cs

@@ -5,9 +5,9 @@
 using System.Linq;
 using ApiGenerator.Domain;
 using Newtonsoft.Json;
-using ShellProgressBar;
 using Newtonsoft.Json.Linq;
 using RazorLight;
+using ShellProgressBar;
 
 namespace ApiGenerator
 {
@@ -22,20 +22,19 @@ public static void Generate(string downloadBranch, params string[] folders)
 			var spec = CreateRestApiSpecModel(downloadBranch, folders);
 			var actions = new Dictionary<Action<RestApiSpec>, string>
 			{
-				{  GenerateClientInterface, "Client interface" },
-				{  GenerateRequestParameters, "Request parameters" },
-				{  GenerateDescriptors, "Descriptors" },
-				{  GenerateRequests, "Requests" },
-				{  GenerateEnums, "Enums" },
-				{  GenerateRawClient, "Lowlevel client" },
-				{  GenerateRawDispatch, "Dispatch" },
-				{  GenerateRequestParametersExtensions, "Request parameters override" },
-
+				{ GenerateClientInterface, "Client interface" },
+				{ GenerateRequestParameters, "Request parameters" },
+				{ GenerateDescriptors, "Descriptors" },
+				{ GenerateRequests, "Requests" },
+				{ GenerateEnums, "Enums" },
+				{ GenerateRawClient, "Lowlevel client" },
+				{ GenerateRawDispatch, "Dispatch" },
+				{ GenerateRequestParametersExtensions, "Request parameters override" },
 			};
 
 			using (var pbar = new ProgressBar(actions.Count, "Generating code", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
 			{
-				foreach(var kv in actions)
+				foreach (var kv in actions)
 				{
 					pbar.Message = "Generating " + kv.Value;
 					kv.Key(spec);
@@ -47,15 +46,17 @@ public static void Generate(string downloadBranch, params string[] folders)
 		private static RestApiSpec CreateRestApiSpecModel(string downloadBranch, string[] folders)
 		{
 			var directories = Directory.GetDirectories(CodeConfiguration.RestSpecificationFolder, "*", SearchOption.AllDirectories)
-				.Where(f=>folders == null || folders.Length == 0 || folders.Contains(new DirectoryInfo(f).Name))
+				.Where(f => folders == null || folders.Length == 0 || folders.Contains(new DirectoryInfo(f).Name))
 				.ToList();
 
 			var endpoints = new Dictionary<string, ApiEndpoint>();
-			using (var pbar = new ProgressBar(directories.Count, $"Listing {directories.Count} directories", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
+			using (var pbar = new ProgressBar(directories.Count, $"Listing {directories.Count} directories",
+				new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
 			{
 				foreach (var jsonFiles in directories.Select(dir => Directory.GetFiles(dir).Where(f => f.EndsWith(".json")).ToList()))
 				{
-					using (var fileProgress = pbar.Spawn(jsonFiles.Count, $"Listing {jsonFiles.Count} files", new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.DarkGray }))
+					using (var fileProgress = pbar.Spawn(jsonFiles.Count, $"Listing {jsonFiles.Count} files",
+						new ProgressBarOptions { ProgressCharacter = '─', BackgroundColor = ConsoleColor.DarkGray }))
 					{
 						foreach (var file in jsonFiles)
 						{
@@ -68,6 +69,7 @@ private static RestApiSpec CreateRestApiSpecModel(string downloadBranch, string[
 								var endpoint = CreateApiEndpoint(file);
 								endpoints.Add(endpoint.Key, endpoint.Value);
 							}
+
 							fileProgress.Tick();
 						}
 					}
@@ -137,41 +139,40 @@ private static Dictionary<string, ApiQueryParameters> CreateCommonApiQueryParame
 			return commonParameters;
 		}
 
-		private static string CreateMethodName(string apiEndpointKey)
-		{
-			return PascalCase(apiEndpointKey);
-		}
+		private static string CreateMethodName(string apiEndpointKey) => PascalCase(apiEndpointKey);
 
-		private static string DoRazor(string name, string template, RestApiSpec model)
-		{
-			return Razor.CompileRenderAsync(name, template, model).GetAwaiter().GetResult();
-		}
+		private static string DoRazor(string name, string template, RestApiSpec model) =>
+			Razor.CompileRenderAsync(name, template, model).GetAwaiter().GetResult();
 
 		private static void GenerateClientInterface(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"IElasticLowLevelClient.Generated.cs";
-			var source = DoRazor(nameof(GenerateClientInterface), File.ReadAllText(CodeConfiguration.ViewFolder + @"IElasticLowLevelClient.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateClientInterface),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"IElasticLowLevelClient.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateRawDispatch(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.NestFolder + @"_Generated/_LowLevelDispatch.Generated.cs";
-			var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"),
+				model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateRawClient(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"ElasticLowLevelClient.Generated.cs";
-			var source = DoRazor(nameof(GenerateRawClient), File.ReadAllText(CodeConfiguration.ViewFolder + @"ElasticLowLevelClient.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRawClient),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"ElasticLowLevelClient.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateDescriptors(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.NestFolder + @"_Generated\_Descriptors.Generated.cs";
-			var source = DoRazor(nameof(GenerateDescriptors), File.ReadAllText(CodeConfiguration.ViewFolder + @"_Descriptors.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateDescriptors), File.ReadAllText(CodeConfiguration.ViewFolder + @"_Descriptors.Generated.cshtml"),
+				model);
 			File.WriteAllText(targetFile, source);
 		}
 
@@ -185,14 +186,16 @@ private static void GenerateRequests(RestApiSpec model)
 		private static void GenerateRequestParameters(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"Domain\RequestParameters\RequestParameters.Generated.cs";
-			var source = DoRazor(nameof(GenerateRequestParameters), File.ReadAllText(CodeConfiguration.ViewFolder + @"RequestParameters.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRequestParameters),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"RequestParameters.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 
 		private static void GenerateRequestParametersExtensions(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.NestFolder + @"_Generated\_RequestParametersExtensions.Generated.cs";
-			var source = DoRazor(nameof(GenerateRequestParametersExtensions), File.ReadAllText(CodeConfiguration.ViewFolder + @"_RequestParametersExtensions.Generated.cshtml"), model);
+			var source = DoRazor(nameof(GenerateRequestParametersExtensions),
+				File.ReadAllText(CodeConfiguration.ViewFolder + @"_RequestParametersExtensions.Generated.cshtml"), model);
 			File.WriteAllText(targetFile, source);
 		}
 

src/CodeGeneration/ApiGenerator/CodeConfiguration.cs

@@ -8,59 +8,60 @@ namespace ApiGenerator
 {
 	public static class CodeConfiguration
 	{
-		public static readonly Assembly Assembly = typeof(ApiGenerator).Assembly;
-
 		private static string _root = null;
-
-		private static string Root
-		{
-			get
-			{
-				if (CodeConfiguration._root != null) return CodeConfiguration._root;
-				var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
-
-				var runningAsDnx =
-					directoryInfo.Name == "ApiGenerator" &&
-					directoryInfo.Parent != null &&
-					directoryInfo.Parent.Name == "CodeGeneration";
-
-				CodeConfiguration._root = runningAsDnx ? "" : @"..\..\..\";
-				return CodeConfiguration._root;
-			}
-		}
-
-		public static string NestFolder { get; } = $@"{Root}..\..\..\src\Nest\";
-		public static string EsNetFolder { get; } = $@"{Root}..\..\..\src\Elasticsearch.Net\";
-		public static string ViewFolder { get; } = $@"{Root}Views\";
-		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification\";
-		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
+		public static readonly Assembly Assembly = typeof(ApiGenerator).Assembly;
 
 		public static readonly Dictionary<string, string> MethodNameOverrides =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)
 				let c = Regex.Replace(contents, @"^.+\[DescriptorFor\(""([^ \r\n]+)""\)\].*$", "$1", RegexOptions.Singleline)
 				where !c.Contains(" ") //filter results that did not match
 				select new { Value = f.Name.Replace("Request", ""), Key = c })
-				.DistinctBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
+			.DistinctBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value.Replace(".cs", ""));
 
-		public static  readonly Dictionary<string, string> KnownDescriptors =
+		public static readonly Dictionary<string, string> KnownDescriptors =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)
 				let c = Regex.Replace(contents, @"^.+class ([^ \r\n]+Descriptor(?:<[^>\r\n]+>)?[^ \r\n]*).*$", "$1", RegexOptions.Singleline)
 				select new { Key = Regex.Replace(c, "<.*$", ""), Value = Regex.Replace(c, @"^.*?(?:(\<.+>).*?)?$", "$1") })
-				.DistinctBy(v => v.Key)
-				.OrderBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value);
+			.DistinctBy(v => v.Key)
+			.OrderBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value);
 
-		public static  readonly Dictionary<string, string> KnownRequests =
+		public static readonly Dictionary<string, string> KnownRequests =
 			(from f in new DirectoryInfo(NestFolder).GetFiles("*Request.cs", SearchOption.AllDirectories)
 				let contents = File.ReadAllText(f.FullName)
 				let c = Regex.Replace(contents, @"^.+interface ([^ \r\n]+Request(?:<[^>\r\n]+>)?[^ \r\n]*).*$", "$1", RegexOptions.Singleline)
 				where c.StartsWith("I") && c.Contains("Request")
 				select new { Key = Regex.Replace(c, "<.*$", ""), Value = Regex.Replace(c, @"^.*?(?:(\<.+>).*?)?$", "$1") })
-				.DistinctBy(v => v.Key)
-				.ToDictionary(k => k.Key, v => v.Value);
+			.DistinctBy(v => v.Key)
+			.ToDictionary(k => k.Key, v => v.Value);
 
+
+		public static string EsNetFolder { get; } = $@"{Root}..\..\..\src\Elasticsearch.Net\";
+		public static string LastDownloadedVersionFile { get; } = Path.Combine(Root, "last_downloaded_version.txt");
+
+		public static string NestFolder { get; } = $@"{Root}..\..\..\src\Nest\";
+		public static string RestSpecificationFolder { get; } = $@"{Root}RestSpecification\";
+		public static string ViewFolder { get; } = $@"{Root}Views\";
+
+		private static string Root
+		{
+			get
+			{
+				if (_root != null) return _root;
+
+				var directoryInfo = new DirectoryInfo(Directory.GetCurrentDirectory());
+
+				var runningAsDnx =
+					directoryInfo.Name == "ApiGenerator" &&
+					directoryInfo.Parent != null &&
+					directoryInfo.Parent.Name == "CodeGeneration";
+
+				_root = runningAsDnx ? "" : @"..\..\..\";
+				return _root;
+			}
+		}
 	}
 }