Refactoring to fluent interfaces

i4004 · i4004 · commit 53ef859aeb4a · 2021-02-28T16:30:55.000+06:00
Refactoring to expression bodies for methods
Dependencies bump to latest
Meta info reorganized
diff --git a/Simplify.Web.Templates.csproj b/Simplify.Web.Templates.csproj
@@ -3,7 +3,7 @@
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 
 		<PackageType>Template</PackageType>
-		<PackageVersion>0.7.3</PackageVersion>
+		<PackageVersion>0.8</PackageVersion>
 		<PackageId>Simplify.Web.Templates</PackageId>
 		<IsPackable>true</IsPackable>
 		<PackageProjectUrl>https://github.com/SimplifyNet/Simplify.Web.Templates</PackageProjectUrl>
@@ -12,9 +12,10 @@
 		<RepositoryType>GIT</RepositoryType>
 		<PackageReleaseNotes>
 			Updates
-			* Upgrade to Simplify.Web 4.2.* (floating version set)
-			* Upgrade to Simplify.Web.Json 2.1.* (floating version set)
-			* Upgrade to Microsoft.AspNetCore.SpaServices.Extensions 3.1.* (floating version set)
+			* Refactoring to fluent interfaces
+			* Refactoring to expression bodies for methods
+			* Dependencies bump to latest
+			* Meta info reorganized
 		</PackageReleaseNotes>
 		<Title>Simplify.Web project templates</Title>
 		<Authors>Alexander Krylkov</Authors>
diff --git a/templates/MyProject.Angular/MyProject.Angular.csproj b/templates/MyProject.Angular/MyProject.Angular.csproj
@@ -2,7 +2,9 @@
 	<PropertyGroup>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<LangVersion>8.0</LangVersion>
+
 		<Version>0.1</Version>
+
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
 		<SpaRoot>ClientApp/</SpaRoot>
diff --git a/templates/MyProject.Angular/Program.cs b/templates/MyProject.Angular/Program.cs
@@ -5,10 +5,7 @@ namespace MyProject.Angular
 {
 	public class Program
 	{
-		public static void Main(string[] args)
-		{
-			CreateWebHostBuilder(args).Build().Run();
-		}
+		public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
 
 		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
 			WebHost.CreateDefaultBuilder(args)
diff --git a/templates/MyProject.Angular/Setup/IocRegistrations.cs b/templates/MyProject.Angular/Setup/IocRegistrations.cs
@@ -5,12 +5,14 @@ namespace MyProject.Angular.Setup
 {
 	public static class IocRegistrations
 	{
-		public static void Register()
+		public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
 		{
 			// Simplify.DI.DIContainer.Current IOC container registrations starting point
 
 			// Manual Simplify.Web internal types registrations
-			DIContainer.Current.RegisterSimplifyWeb();
+			provider.RegisterSimplifyWeb();
+
+			return provider;
 		}
 	}
 }
diff --git a/templates/MyProject.Angular/Startup.cs b/templates/MyProject.Angular/Startup.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.SpaServices.AngularCli;
@@ -13,22 +12,17 @@ namespace MyProject.Angular
 {
 	public class Startup
 	{
-		public IServiceProvider ConfigureServices(IServiceCollection services)
+		public void ConfigureServices(IServiceCollection services)
 		{
-			var provider = new MicrosoftDependencyInjectionDIProvider { Services = services };
-			DIContainer.Current = provider;
+			DIContainer.Current = new MicrosoftDependencyInjectionDIProvider { Services = services };
 
-			// Your registrations here (both via services or DIContainer.Current.Register)
+			DIContainer.Current.RegisterAll();
 
 			// In production, the Angular files will be served from this directory
 			services.AddSpaStaticFiles(configuration =>
 			{
 				configuration.RootPath = "ClientApp/dist";
 			});
-
-			IocRegistrations.Register();
-
-			return provider.ServiceProvider;
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/templates/MyProject.Api/Controllers/Api/v1/SampleInController.cs b/templates/MyProject.Api/Controllers/Api/v1/SampleInController.cs
@@ -1,18 +1,21 @@
 ﻿using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 using MyProject.Api.ViewModels;
 using Simplify.Web;
 using Simplify.Web.Attributes;
 
 namespace MyProject.Api.Controllers.Api.v1
 {
 	[Post("/api/v1/sampleIn")]
-	public class SampleInController : Controller<SampleModel>
+	public class SampleInController : AsyncController<SampleModel>
 	{
-		public override ControllerResponse Invoke()
+		public override async Task<ControllerResponse> Invoke()
 		{
 			try
 			{
+				await ReadModelAsync();
+
 				Trace.WriteLine($"Object with message received: {Model.Message}");
 
 				return NoContent();
diff --git a/templates/MyProject.Api/MyProject.Api.csproj b/templates/MyProject.Api/MyProject.Api.csproj
@@ -2,6 +2,7 @@
 	<PropertyGroup>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<LangVersion>8.0</LangVersion>
+
 		<Version>0.1</Version>
 	</PropertyGroup>
 	<ItemGroup>
diff --git a/templates/MyProject.Api/Program.cs b/templates/MyProject.Api/Program.cs
@@ -5,10 +5,7 @@ namespace MyProject.Api
 {
 	public class Program
 	{
-		public static void Main(string[] args)
-		{
-			CreateWebHostBuilder(args).Build().Run();
-		}
+		public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
 
 		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
 			WebHost.CreateDefaultBuilder(args)
diff --git a/templates/MyProject.Api/Setup/IocRegistrations.cs b/templates/MyProject.Api/Setup/IocRegistrations.cs
@@ -7,14 +7,16 @@ namespace MyProject.Api.Setup
 {
 	public static class IocRegistrations
 	{
-		public static void Register()
+		public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
 		{
 			// Simplify.DI.DIContainer.Current IOC container registrations starting point
 
-			DIContainer.Current.RegisterSimplifyWeb()
-				.RegisterJsonModelBinder();
+			provider.RegisterSimplifyWeb()
+				.RegisterJsonModelBinder()
 
-			DIContainer.Current.Register<SampleModelFactory>();
+			.Register<SampleModelFactory>();
+
+			return provider;
 		}
 	}
 }
diff --git a/templates/MyProject.Api/Startup.cs b/templates/MyProject.Api/Startup.cs
@@ -22,17 +22,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 			app.UseSimplifyWebWithoutRegistrations();
 		}
 
-		public void ConfigureServices()
-		{
-			InitializeContainer();
-		}
-
-		private static void InitializeContainer()
-		{
-			IocRegistrations.Register();
-
-			// IOC container dependencies graph verification
-			DIContainer.Current.Verify();
-		}
+		public void ConfigureServices() => DIContainer.Current.RegisterAll().Verify();
 	}
 }
diff --git a/templates/MyProject.Api/ViewModels/SampleModelFactory.cs b/templates/MyProject.Api/ViewModels/SampleModelFactory.cs
@@ -2,12 +2,10 @@
 {
 	public class SampleModelFactory
 	{
-		public SampleModel Create(string message)
-		{
-			return new SampleModel
+		public SampleModel Create(string message) =>
+			new SampleModel
 			{
 				Message = message
 			};
-		}
 	}
 }
diff --git a/templates/MyProject.Minimal/MyProject.Minimal.csproj b/templates/MyProject.Minimal/MyProject.Minimal.csproj
@@ -2,6 +2,7 @@
 	<PropertyGroup>
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 		<LangVersion>8.0</LangVersion>
+
 		<Version>0.1</Version>
 	</PropertyGroup>
 	<ItemGroup>
diff --git a/templates/MyProject.Minimal/Program.cs b/templates/MyProject.Minimal/Program.cs
@@ -5,10 +5,7 @@ namespace MyProject.Minimal
 {
 	public class Program
 	{
-		public static void Main(string[] args)
-		{
-			CreateWebHostBuilder(args).Build().Run();
-		}
+		public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
 
 		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
 			WebHost.CreateDefaultBuilder(args)
diff --git a/templates/MyProject.WindowsServiceApi/Controllers/StatusController.cs b/templates/MyProject.WindowsServiceApi/Controllers/StatusController.cs
@@ -6,9 +6,6 @@ namespace MyProject.WindowsServiceApi.Controllers
 	[Get("status")]
 	public class StatusController : Controller
 	{
-		public override ControllerResponse Invoke()
-		{
-			return Content("Service is running!");
-		}
+		public override ControllerResponse Invoke() => Content("Service is running!");
 	}
 }
diff --git a/templates/MyProject.WindowsServiceApi/MyProject.WindowsServiceApi.csproj b/templates/MyProject.WindowsServiceApi/MyProject.WindowsServiceApi.csproj
@@ -2,9 +2,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>net462</TargetFrameworks>
 		<LangVersion>8.0</LangVersion>
+		<OutputType>Exe</OutputType>
+
 		<Version>0.1</Version>
+
 		<Description>Simplify.Web API hosted inside windows service application</Description>
-		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
diff --git a/templates/MyProject.WindowsServiceApi/Program.cs b/templates/MyProject.WindowsServiceApi/Program.cs
@@ -34,12 +34,6 @@ private static void RunAsConsoleApplication()
 			Console.ReadLine();
 		}
 
-		private static void InitializeContainer()
-		{
-			IocRegistrations.Register();
-
-			// IOC container dependencies graph verification
-			DIContainer.Current.Verify();
-		}
+		private static void InitializeContainer() => DIContainer.Current.RegisterAll().Verify();
 	}
 }
diff --git a/templates/MyProject.WindowsServiceApi/Setup/IocRegistrations.cs b/templates/MyProject.WindowsServiceApi/Setup/IocRegistrations.cs
@@ -6,15 +6,17 @@
 
 namespace MyProject.WindowsServiceApi.Setup
 {
-	public class IocRegistrations
+	public static class IocRegistrations
 	{
-		public static void Register()
+		public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
 		{
-			DIContainer.Current.RegisterSimplifyWeb()
-				.RegisterJsonModelBinder();
+			provider.RegisterSimplifyWeb()
+				.RegisterJsonModelBinder()
 
-			DIContainer.Current.Register(r => new StatusServiceSettings(r.Resolve<IConfiguration>()), LifetimeType.Singleton);
-			DIContainer.Current.Register<WebApplicationStartup>(LifetimeType.Singleton);
+			.Register(r => new StatusServiceSettings(r.Resolve<IConfiguration>()), LifetimeType.Singleton)
+			.Register<WebApplicationStartup>(LifetimeType.Singleton);
+
+			return provider;
 		}
 	}
 }
diff --git a/templates/MyProject.WindowsServiceApi/WebApplicationStartup.cs b/templates/MyProject.WindowsServiceApi/WebApplicationStartup.cs
@@ -8,21 +8,16 @@ public class WebApplicationStartup
 	{
 		private readonly StatusServiceSettings _settings;
 
-		public WebApplicationStartup(StatusServiceSettings settings)
-		{
-			_settings = settings;
-		}
+		public WebApplicationStartup(StatusServiceSettings settings) => _settings = settings;
 
 		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
 			WebHost.CreateDefaultBuilder(args)
 				.UseStartup<Startup>();
 
-		public void Run()
-		{
+		public void Run() =>
 			CreateWebHostBuilder(Program.Args)
 				.UseUrls($"http://{_settings.BindHostName}:{_settings.WorkingPort}")
 				.Build()
 				.Start();
-		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,7 @@ namespace MyProject.Angular`
`5`	`5`	`{`
`6`	`6`	`public class Program`
`7`	`7`	`{`
`8`		`- public static void Main(string[] args)`
`9`		`- {`
`10`		`- CreateWebHostBuilder(args).Build().Run();`
`11`		`- }`
	`8`	`+ public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();`
`12`	`9`
`13`	`10`	`public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`14`	`11`	`WebHost.CreateDefaultBuilder(args)`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@ namespace MyProject.Angular.Setup`
`5`	`5`	`{`
`6`	`6`	`public static class IocRegistrations`
`7`	`7`	`{`
`8`		`- public static void Register()`
	`8`	`+ public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)`
`9`	`9`	`{`
`10`	`10`	`// Simplify.DI.DIContainer.Current IOC container registrations starting point`
`11`	`11`
`12`	`12`	`// Manual Simplify.Web internal types registrations`
`13`		`- DIContainer.Current.RegisterSimplifyWeb();`
	`13`	`+ provider.RegisterSimplifyWeb();`
	`14`	`+`
	`15`	`+ return provider;`
`14`	`16`	`}`
`15`	`17`	`}`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using Microsoft.AspNetCore.Builder;`
`3`	`2`	`using Microsoft.AspNetCore.Hosting;`
`4`	`3`	`using Microsoft.AspNetCore.SpaServices.AngularCli;`
`@@ -13,22 +12,17 @@ namespace MyProject.Angular`
`13`	`12`	`{`
`14`	`13`	`public class Startup`
`15`	`14`	`{`
`16`		`- public IServiceProvider ConfigureServices(IServiceCollection services)`
	`15`	`+ public void ConfigureServices(IServiceCollection services)`
`17`	`16`	`{`
`18`		`- var provider = new MicrosoftDependencyInjectionDIProvider { Services = services };`
`19`		`- DIContainer.Current = provider;`
	`17`	`+ DIContainer.Current = new MicrosoftDependencyInjectionDIProvider { Services = services };`
`20`	`18`
`21`		`- // Your registrations here (both via services or DIContainer.Current.Register)`
	`19`	`+ DIContainer.Current.RegisterAll();`
`22`	`20`
`23`	`21`	`// In production, the Angular files will be served from this directory`
`24`	`22`	`services.AddSpaStaticFiles(configuration =>`
`25`	`23`	`{`
`26`	`24`	`configuration.RootPath = "ClientApp/dist";`
`27`	`25`	`});`
`28`		`-`
`29`		`- IocRegistrations.Register();`
`30`		`-`
`31`		`- return provider.ServiceProvider;`
`32`	`26`	`}`
`33`	`27`
`34`	`28`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,21 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Diagnostics;`
	`3`	`+using System.Threading.Tasks;`
`3`	`4`	`using MyProject.Api.ViewModels;`
`4`	`5`	`using Simplify.Web;`
`5`	`6`	`using Simplify.Web.Attributes;`
`6`	`7`
`7`	`8`	`namespace MyProject.Api.Controllers.Api.v1`
`8`	`9`	`{`
`9`	`10`	`[Post("/api/v1/sampleIn")]`
`10`		`- public class SampleInController : Controller<SampleModel>`
	`11`	`+ public class SampleInController : AsyncController<SampleModel>`
`11`	`12`	`{`
`12`		`- public override ControllerResponse Invoke()`
	`13`	`+ public override async Task<ControllerResponse> Invoke()`
`13`	`14`	`{`
`14`	`15`	`try`
`15`	`16`	`{`
	`17`	`+ await ReadModelAsync();`
	`18`	`+`
`16`	`19`	`Trace.WriteLine($"Object with message received: {Model.Message}");`
`17`	`20`
`18`	`21`	`return NoContent();`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,7 @@ namespace MyProject.Api`
`5`	`5`	`{`
`6`	`6`	`public class Program`
`7`	`7`	`{`
`8`		`- public static void Main(string[] args)`
`9`		`- {`
`10`		`- CreateWebHostBuilder(args).Build().Run();`
`11`		`- }`
	`8`	`+ public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();`
`12`	`9`
`13`	`10`	`public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`14`	`11`	`WebHost.CreateDefaultBuilder(args)`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,16 @@ namespace MyProject.Api.Setup`
`7`	`7`	`{`
`8`	`8`	`public static class IocRegistrations`
`9`	`9`	`{`
`10`		`- public static void Register()`
	`10`	`+ public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)`
`11`	`11`	`{`
`12`	`12`	`// Simplify.DI.DIContainer.Current IOC container registrations starting point`
`13`	`13`
`14`		`- DIContainer.Current.RegisterSimplifyWeb()`
`15`		`- .RegisterJsonModelBinder();`
	`14`	`+ provider.RegisterSimplifyWeb()`
	`15`	`+ .RegisterJsonModelBinder()`
`16`	`16`
`17`		`- DIContainer.Current.Register<SampleModelFactory>();`
	`17`	`+ .Register<SampleModelFactory>();`
	`18`	`+`
	`19`	`+ return provider;`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`22`	`22`	`app.UseSimplifyWebWithoutRegistrations();`
`23`	`23`	`}`
`24`	`24`
`25`		`- public void ConfigureServices()`
`26`		`- {`
`27`		`- InitializeContainer();`
`28`		`- }`
`29`		`-`
`30`		`- private static void InitializeContainer()`
`31`		`- {`
`32`		`- IocRegistrations.Register();`
`33`		`-`
`34`		`- // IOC container dependencies graph verification`
`35`		`- DIContainer.Current.Verify();`
`36`		`- }`
	`25`	`+ public void ConfigureServices() => DIContainer.Current.RegisterAll().Verify();`
`37`	`26`	`}`
`38`	`27`	`}`