[edit] switch to controllers v2

i4004 · i4004 · commit e71edd629bce · 2024-06-03T19:39:53.000+05:00
[edit] swithc to internal Simplify.Web Json implementation using System.Text.Json
[add] Language latest set
[edit] switch to async handler and web app methods
[add] scheduler install file
[r] to primary constructors
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,6 @@
 		"ASPNETCORE",
 		"HOSTINGSTARTUPASSEMBLIES",
 		"HSTS",
-		"Krylkov",
 		"proxying"
 	]
 }
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.3.0] - Unreleased
+
+### Dependencies
+
+- Bump to Simplify.Web v5 with internal Json implementation instead of Simplify.Text.Json
+
+### Added
+
+- Language latest set
+- Scheduler install file
+
+### Changed
+
+- Switch to async handler and web app methods
+
 ## [1.2.1] - 2024-03-26
 
 ### Dependencies
diff --git a/src/Simplify.Web.Templates.csproj b/src/Simplify.Web.Templates.csproj
@@ -3,11 +3,11 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<IsPackable>true</IsPackable>
 
-		<PackageVersion>1.2.1</PackageVersion>
+		<PackageVersion>1.3</PackageVersion>
 
 		<Title>Simplify.Web project templates</Title>
 		<Description>The Simplify.Web web framework project templates collection.</Description>
-		<Authors>Alexander Krylkov</Authors>
+		<Authors>Simplify community</Authors>
 		<Copyright>Licensed under LGPL</Copyright>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<PackageType>Template</PackageType>
diff --git a/src/templates/MyProject.Angular/Controllers/v1/WeatherForecastsController.cs b/src/templates/MyProject.Angular/Controllers/v1/WeatherForecastsController.cs
@@ -1,20 +1,19 @@
 using MyProject.Angular.ViewModels;
 using Simplify.Web;
 using Simplify.Web.Attributes;
-using Simplify.Web.Json.Responses;
 
 namespace MyProject.Angular.Controllers.v1;
 
 [Get("api/v1/weatherForecasts")]
-public class WeatherForecastsController : Controller
+public class WeatherForecastsController : Controller2
 {
-	private static readonly string[] Summaries = new[]
-	{
+	private static readonly string[] Summaries =
+	[
 		"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-	};
+	];
 
-	public override ControllerResponse Invoke() =>
-		new Json(Enumerable.Range(1, 5).Select(index => new WeatherForecast
+	public ControllerResponse Invoke() =>
+		Json(Enumerable.Range(1, 5).Select(index => new WeatherForecast
 		{
 			Date = DateTime.Now.AddDays(index),
 			TemperatureC = Random.Shared.Next(-20, 55),
diff --git a/src/templates/MyProject.Angular/MyProject.Angular.csproj b/src/templates/MyProject.Angular/MyProject.Angular.csproj
@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 
@@ -16,7 +17,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.*" />
 		<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.*" />
-		<PackageReference Include="Simplify.Web.Json" Version="2.3.*" />
+		<PackageReference Include="Simplify.Web" Version="5.0-pre01" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/templates/MyProject.Angular/Program.cs b/src/templates/MyProject.Angular/Program.cs
@@ -31,4 +31,4 @@
 if (!app.Environment.IsDevelopment())
 	app.UseSpa(spa => spa.Options.SourcePath = "ClientApp");
 
-app.Run();
+await app.RunAsync();
diff --git a/src/templates/MyProject.Api/Controllers/Api/v1/SampleInController.cs b/src/templates/MyProject.Api/Controllers/Api/v1/SampleInController.cs
@@ -6,15 +6,15 @@
 namespace MyProject.Api.Controllers.Api.v1;
 
 [Post("/api/v1/sampleIn")]
-public class SampleInController : AsyncController<SampleModel>
+public class SampleInController : Controller2<SampleModel>
 {
-	public override async Task<ControllerResponse> Invoke()
+	public async Task<ControllerResponse> Invoke()
 	{
 		try
 		{
 			await ReadModelAsync();
 
-			Trace.WriteLine($"Object with message received: {Model.Message}");
+			Trace.TraceInformation($"Object with message received: {Model.Message}");
 
 			return NoContent();
 		}
@@ -23,4 +23,4 @@ public override async Task<ControllerResponse> Invoke()
 			return StatusCode(500, e.Message);
 		}
 	}
-}
+}
diff --git a/src/templates/MyProject.Api/Controllers/Api/v1/SampleOutController.cs b/src/templates/MyProject.Api/Controllers/Api/v1/SampleOutController.cs
@@ -1,24 +1,21 @@
 ﻿using MyProject.Api.ViewModels;
 using Simplify.Web;
 using Simplify.Web.Attributes;
-using Simplify.Web.Json.Responses;
 
 namespace MyProject.Api.Controllers.Api.v1;
 
 [Get("/api/v1/sampleOut")]
-public class SampleOutController(SampleModelFactory modelFactory) : Controller
+public class SampleOutController(SampleModelFactory modelFactory) : Controller2
 {
-	private readonly SampleModelFactory _modelFactory = modelFactory;
-
-	public override ControllerResponse Invoke()
+	public ControllerResponse Invoke()
 	{
 		try
 		{
-			return new Json(_modelFactory.Create("Hello from Simplify.Web API example application"));
+			return Json(modelFactory.Create("Hello from Simplify.Web API example application"));
 		}
 		catch (Exception e)
 		{
 			return StatusCode(500, e.Message);
 		}
 	}
-}
+}
diff --git a/src/templates/MyProject.Api/MyProject.Api.csproj b/src/templates/MyProject.Api/MyProject.Api.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Simplify.Web.Json" Version="2.3.*" />
+		<PackageReference Include="Simplify.Web" Version="5.0-pre01" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Update="appsettings.Development.json">
diff --git a/src/templates/MyProject.Api/Setup/IocRegistrations.cs b/src/templates/MyProject.Api/Setup/IocRegistrations.cs
@@ -1,7 +1,6 @@
 ﻿using MyProject.Api.ViewModels;
 using Simplify.DI;
 using Simplify.Web;
-using Simplify.Web.Json;
 
 namespace MyProject.Api.Setup;
 
@@ -12,10 +11,9 @@ public static IDIContainerProvider RegisterAll(this IDIContainerProvider provide
 		// Simplify.DI.DIContainer.Current IOC container registrations starting point
 
 		provider.RegisterSimplifyWeb()
-			.RegisterJsonModelBinder()
 
 		.Register<SampleModelFactory>();
 
 		return provider;
 	}
-}
+}
diff --git a/src/templates/MyProject.Api/Startup.cs b/src/templates/MyProject.Api/Startup.cs
@@ -1,8 +1,6 @@
 ﻿using MyProject.Api.Setup;
 using Simplify.DI;
 using Simplify.Web;
-using Simplify.Web.Json.Model.Binding;
-using Simplify.Web.Model;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -15,9 +13,6 @@
 if (app.Environment.IsDevelopment())
 	app.UseDeveloperExceptionPage();
 
-// Enabling Simplify.Web JSON requests handling
-HttpModelHandler.RegisterModelBinder<JsonModelBinder>();
+app.UseSimplifyWeb();
 
-app.UseSimplifyWebWithoutRegistrations();
-
-app.Run();
+await app.RunAsync();
diff --git a/src/templates/MyProject.Api/ViewModels/SampleModelFactory.cs b/src/templates/MyProject.Api/ViewModels/SampleModelFactory.cs
@@ -7,4 +7,4 @@ public SampleModel Create(string message) =>
 		{
 			Message = message
 		};
-}
+}
diff --git a/src/templates/MyProject.Api/appsettings.Development.json b/src/templates/MyProject.Api/appsettings.Development.json
@@ -1,5 +1,4 @@
 {
-	"SimplifyWebSettings":
-	{
+	"SimplifyWebSettings": {
 	}
 }
diff --git a/src/templates/MyProject.Minimal/MyProject.Minimal.csproj b/src/templates/MyProject.Minimal/MyProject.Minimal.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Simplify.Web" Version="4.8.*" />
+		<PackageReference Include="Simplify.Web" Version="5.0-pre01" />
 	</ItemGroup>
 </Project>
diff --git a/src/templates/MyProject.Minimal/Startup.cs b/src/templates/MyProject.Minimal/Startup.cs
@@ -1,7 +1,8 @@
 ﻿using Simplify.Web;
 
-var app = WebApplication.CreateBuilder(args).Build();
+var app = WebApplication.CreateBuilder(args)
+	.Build();
 
-app.UseSimplifyWeb();
+app.UseSimplifyWeb(true);
 
-app.Run();
+await app.RunAsync();
diff --git a/src/templates/MyProject.SchedulerApi/Controllers/StatusController.cs b/src/templates/MyProject.SchedulerApi/Controllers/StatusController.cs
@@ -4,7 +4,7 @@
 namespace MyProject.SchedulerApi.Controllers;
 
 [Get("status")]
-public class StatusController : Controller
+public class StatusController : Controller2
 {
-	public override ControllerResponse Invoke() => Content("Service is running!");
-}
+	public ControllerResponse Invoke() => Content("Service is running!");
+}
diff --git a/src/templates/MyProject.SchedulerApi/Install.ps1 b/src/templates/MyProject.SchedulerApi/Install.ps1
@@ -0,0 +1,18 @@
+# Parameters
+
+$appName = "MyProject.SchedulerApir"
+$appPath = $PSScriptRoot
+$exepath = $appPath + "\" + $appName + ".exe"
+$description = "MyProject.SchedulerApi service"
+$stopTimeout = 150000 # 5 minutes
+$logonUser = "LocalService"
+
+# Installation execution
+
+nssm install $appName $exepath
+nssm set $appName AppDirectory $appPath
+nssm set $appName DisplayName $description
+nssm set $appName Description $description
+nssm set $appName ObjectName $logonUser
+nssm set $appName AppStopMethodConsole $stopTimeout
+nssm set $appName AppExit Default Exit
diff --git a/src/templates/MyProject.SchedulerApi/MyProject.SchedulerApi.csproj b/src/templates/MyProject.SchedulerApi/MyProject.SchedulerApi.csproj
@@ -1,13 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<Description>Simplify.Web API hosted inside Simplify.Scheduler application</Description>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Simplify.Scheduler" Version="1.3.*" />
-		<PackageReference Include="Simplify.Web.Json" Version="2.3.*" />
+		<PackageReference Include="Simplify.Scheduler" Version="1.5.*" />
+		<PackageReference Include="Simplify.Web" Version="5.0-pre01" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Update="appsettings.Development.json">
diff --git a/src/templates/MyProject.SchedulerApi/Program.cs b/src/templates/MyProject.SchedulerApi/Program.cs
@@ -9,4 +9,4 @@
 
 using var handler = new BasicScheduler<WebApplicationStartup>(startupArgs: args);
 
-handler.Start(args);
+await handler.StartAsync(args);
diff --git a/src/templates/MyProject.SchedulerApi/Settings/WebApplicationStartupSettings.cs b/src/templates/MyProject.SchedulerApi/Settings/WebApplicationStartupSettings.cs
@@ -25,4 +25,4 @@ public WebApplicationStartupSettings(IConfiguration configuration, string config
 
 	public string BindHostName { get; set; } = "*";
 	public int WorkingPort { get; set; } = 5000;
-}
+}
diff --git a/src/templates/MyProject.SchedulerApi/Setup/IocRegistrations.cs b/src/templates/MyProject.SchedulerApi/Setup/IocRegistrations.cs
@@ -1,7 +1,6 @@
 ﻿using MyProject.SchedulerApi.Settings;
 using Simplify.DI;
 using Simplify.Web;
-using Simplify.Web.Json;
 
 namespace MyProject.SchedulerApi.Setup;
 
@@ -10,11 +9,10 @@ public static class IocRegistrations
 	public static IDIContainerProvider RegisterAll(this IDIContainerProvider provider)
 	{
 		provider.RegisterSimplifyWeb()
-			.RegisterJsonModelBinder()
 
 		.Register(r => new WebApplicationStartupSettings(r.Resolve<IConfiguration>()), LifetimeType.Singleton)
 		.Register<WebApplicationStartup>(LifetimeType.Singleton);
 
 		return provider;
 	}
-}
+}
diff --git a/src/templates/MyProject.SchedulerApi/WebApplicationStartup.cs b/src/templates/MyProject.SchedulerApi/WebApplicationStartup.cs
@@ -1,31 +1,24 @@
 ﻿using MyProject.SchedulerApi.Settings;
 using Simplify.Scheduler.Jobs;
 using Simplify.Web;
-using Simplify.Web.Json.Model.Binding;
-using Simplify.Web.Model;
 
 namespace MyProject.SchedulerApi;
 
 public class WebApplicationStartup(WebApplicationStartupSettings settings)
 {
-	private readonly WebApplicationStartupSettings _settings = settings;
-
-	public void Run(IJobArgs args)
+	public async Task Run(IJobArgs args)
 	{
 		var builder = WebApplication.CreateBuilder((string[])args.StartupArgs!);
 
-		builder.WebHost.UseUrls($"http://{_settings.BindHostName}:{_settings.WorkingPort}");
+		builder.WebHost.UseUrls($"http://{settings.BindHostName}:{settings.WorkingPort}");
 
 		var app = builder.Build();
 
 		if (app.Environment.IsDevelopment())
 			app.UseDeveloperExceptionPage();
 
-		// Enabling Simplify.Web JSON requests handling
-		HttpModelHandler.RegisterModelBinder<JsonModelBinder>();
-
-		app.UseSimplifyWebWithoutRegistrations();
+		app.UseSimplifyWeb();
 
-		app.Run();
+		await app.RunAsync();
 	}
-}
+}
diff --git a/src/templates/MyProject.WindowsServiceApi/Controllers/StatusController.cs b/src/templates/MyProject.WindowsServiceApi/Controllers/StatusController.cs
@@ -4,7 +4,7 @@
 namespace MyProject.WindowsServiceApi.Controllers;
 
 [Get("status")]
-public class StatusController : Controller
+public class StatusController : Controller2
 {
-	public override ControllerResponse Invoke() => Content("Service is running!");
-}
+	public ControllerResponse Invoke() => Content("Service is running!");
+}
diff --git a/src/templates/MyProject.WindowsServiceApi/MyProject.WindowsServiceApi.csproj b/src/templates/MyProject.WindowsServiceApi/MyProject.WindowsServiceApi.csproj
diff --git a/src/templates/MyProject.WindowsServiceApi/Program.cs b/src/templates/MyProject.WindowsServiceApi/Program.cs
diff --git a/src/templates/MyProject.WindowsServiceApi/Settings/WebApplicationStartupSettings.cs b/src/templates/MyProject.WindowsServiceApi/Settings/WebApplicationStartupSettings.cs
diff --git a/src/templates/MyProject.WindowsServiceApi/Setup/IocRegistrations.cs b/src/templates/MyProject.WindowsServiceApi/Setup/IocRegistrations.cs
diff --git a/src/templates/MyProject.WindowsServiceApi/Startup.cs b/src/templates/MyProject.WindowsServiceApi/Startup.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`"ASPNETCORE",`
`4`	`4`	`"HOSTINGSTARTUPASSEMBLIES",`
`5`	`5`	`"HSTS",`
`6`		`- "Krylkov",`
`7`	`6`	`"proxying"`
`8`	`7`	`]`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`	`namespace MyProject.Api.Controllers.Api.v1;`
`7`	`7`
`8`	`8`	`[Post("/api/v1/sampleIn")]`
`9`		`-public class SampleInController : AsyncController<SampleModel>`
	`9`	`+public class SampleInController : Controller2<SampleModel>`
`10`	`10`	`{`
`11`		`- public override async Task<ControllerResponse> Invoke()`
	`11`	`+ public async Task<ControllerResponse> Invoke()`
`12`	`12`	`{`
`13`	`13`	`try`
`14`	`14`	`{`
`15`	`15`	`await ReadModelAsync();`
`16`	`16`
`17`		`- Trace.WriteLine($"Object with message received: {Model.Message}");`
	`17`	`+ Trace.TraceInformation($"Object with message received: {Model.Message}");`
`18`	`18`
`19`	`19`	`return NoContent();`
`20`	`20`	`}`
`@@ -23,4 +23,4 @@ public override async Task<ControllerResponse> Invoke()`
`23`	`23`	`return StatusCode(500, e.Message);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`-}`
	`26`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,21 @@`
`1`	`1`	`using MyProject.Api.ViewModels;`
`2`	`2`	`using Simplify.Web;`
`3`	`3`	`using Simplify.Web.Attributes;`
`4`		`-using Simplify.Web.Json.Responses;`
`5`	`4`
`6`	`5`	`namespace MyProject.Api.Controllers.Api.v1;`
`7`	`6`
`8`	`7`	`[Get("/api/v1/sampleOut")]`
`9`		`-public class SampleOutController(SampleModelFactory modelFactory) : Controller`
	`8`	`+public class SampleOutController(SampleModelFactory modelFactory) : Controller2`
`10`	`9`	`{`
`11`		`- private readonly SampleModelFactory _modelFactory = modelFactory;`
`12`		`-`
`13`		`- public override ControllerResponse Invoke()`
	`10`	`+ public ControllerResponse Invoke()`
`14`	`11`	`{`
`15`	`12`	`try`
`16`	`13`	`{`
`17`		`- return new Json(_modelFactory.Create("Hello from Simplify.Web API example application"));`
	`14`	`+ return Json(modelFactory.Create("Hello from Simplify.Web API example application"));`
`18`	`15`	`}`
`19`	`16`	`catch (Exception e)`
`20`	`17`	`{`
`21`	`18`	`return StatusCode(500, e.Message);`
`22`	`19`	`}`
`23`	`20`	`}`
`24`		`-}`
	`21`	`+}`