[up] to Simplify.Web 5.0

[r] to new asp.net project structure
[up] Tester app to .NET 8
[edit] swithc to new internal Json impl
[r] C# style
[edit] some controllers switch to v2

Author: i4004

src/Simplify.Web.Postman/Assembly/Collection/CollectionBuilder.cs

@@ -16,8 +16,8 @@ public class CollectionBuilder
 	/// </summary>
 	/// <param name="partBuilders">The part builders.</param>
 	/// <exception cref="ArgumentNullException">partBuilders</exception>
-	public CollectionBuilder(IList<ICollectionPartBuilder> partBuilders) => _partBuilders = partBuilders ??
-	                                                                                        throw new ArgumentNullException(nameof(partBuilders));
+	public CollectionBuilder(IList<ICollectionPartBuilder> partBuilders) =>
+		_partBuilders = partBuilders ?? throw new ArgumentNullException(nameof(partBuilders));
 
 	/// <summary>
 	/// Builds the collection model.

src/Simplify.Web.Postman/Assembly/Collection/PartBuilders/CollectionHeaderBuilder.cs

@@ -7,23 +7,19 @@ namespace Simplify.Web.Postman.Assembly.Collection.PartBuilders;
 /// Provides CollectionHeader builder
 /// </summary>
 /// <seealso cref="ICollectionPartBuilder" />
-public class CollectionHeaderBuilder : ICollectionPartBuilder
+/// <remarks>
+/// Initializes a new instance of the <see cref="CollectionHeaderBuilder"/> class.
+/// </remarks>
+/// <param name="settings">The settings.</param>
+public class CollectionHeaderBuilder(IPostmanGenerationSettings settings) : ICollectionPartBuilder
 {
-	private readonly IPostmanGenerationSettings _settings;
-
-	/// <summary>
-	/// Initializes a new instance of the <see cref="CollectionHeaderBuilder"/> class.
-	/// </summary>
-	/// <param name="settings">The settings.</param>
-	public CollectionHeaderBuilder(IPostmanGenerationSettings settings) => _settings = settings;
-
 	/// <summary>
 	/// Builds the specified model part.
 	/// </summary>
 	/// <param name="model">The model.</param>
 	public void Build(CollectionModel model) =>
 		model.Header = new CollectionHeader
 		{
-			Name = _settings.ProjectName
+			Name = settings.ProjectName
 		};
 }

src/Simplify.Web.Postman/Assembly/Collection/PartBuilders/CollectionItemsBuilder.cs

@@ -1,7 +1,10 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Simplify.Web.Meta;
+using Simplify.Web.Controllers.Meta;
+using Simplify.Web.Controllers.Meta.MetaStore;
+using Simplify.Web.Controllers.Meta.Routing;
+using Simplify.Web.Http;
 using Simplify.Web.Postman.Models;
 
 namespace Simplify.Web.Postman.Assembly.Collection.PartBuilders;
@@ -18,60 +21,57 @@ public class CollectionItemsBuilder : ICollectionPartBuilder
 	/// <param name="model">The model.</param>
 	public void Build(CollectionModel model)
 	{
-		foreach (var item in ControllersMetaStore.Current.ControllersMetaData)
+		foreach (var item in ControllersMetaStore.Current.RoutedControllers)
 		{
-			// Skip any route controllers
-			if (item.ExecParameters == null)
-				continue;
-
 			foreach (var route in item.ExecParameters!.Routes)
 				BuildCollectionItems(model, 0, BuildRequestCollectionItem(item, route));
 		}
 	}
 
 	private static void BuildCollectionItems(CollectionItem currentLevelContainer, int currentLevel, CollectionItem item)
 	{
-		var path = item.Request.Url.Path;
-
-		// If recursion reached request level or reached route parameter
-		if (currentLevel == path.Count || path[currentLevel].StartsWith("{"))
+		while (true)
 		{
-			if (currentLevelContainer.Items == null)
-				currentLevelContainer.Items = new List<CollectionItem>();
+			var path = item.Request.Url.Path;
 
-			currentLevelContainer.Items.Add(item);
-			return;
-		}
+			// If recursion reached request level or reached route parameter
+			if (currentLevel == path.Count || path[currentLevel].StartsWith("{"))
+			{
+				currentLevelContainer.Items ??= [];
 
-		// If path recursion not reached request level
+				currentLevelContainer.Items.Add(item);
+				return;
+			}
 
-		var containerName = BuildContainerName(path[currentLevel]);
+			// If path recursion not reached request level
 
-		var container = currentLevelContainer.Items?.FirstOrDefault(x => x.Name == containerName);
+			var containerName = BuildContainerName(path[currentLevel]);
 
-		if (container == null)
-		{
-			if (currentLevelContainer.Items == null)
-				currentLevelContainer.Items = new List<CollectionItem>();
+			var container = currentLevelContainer.Items?.FirstOrDefault(x => x.Name == containerName);
 
-			currentLevelContainer.Items.Add(container = new CollectionItem
+			if (container == null)
 			{
-				Name = containerName,
-				Items = new List<CollectionItem>()
-			});
-		}
+				currentLevelContainer.Items ??= [];
+
+				container = new CollectionItem { Name = containerName, Items = [] };
+
+				currentLevelContainer.Items.Add(container);
+			}
 
-		BuildCollectionItems(container, currentLevel + 1, item);
+			currentLevelContainer = container;
+			currentLevel += 1;
+		}
 	}
 
-	private static CollectionItem BuildRequestCollectionItem(IControllerMetaData metaData, KeyValuePair<HttpMethod, string> route) =>
+	private static CollectionItem BuildRequestCollectionItem(IControllerMetadata metaData, KeyValuePair<HttpMethod, IControllerRoute> route) =>
 		new()
 		{
 			Name = BuildRequestName(metaData),
 			Request = RequestBuilder.Build(metaData, route),
-			Event = new List<Models.Event> { BasicTestsBuilder.Build() }
+			Event = [BasicTestsBuilder.Build()]
 		};
 
-	private static string BuildRequestName(IControllerMetaData metaData) => metaData.ControllerType.Name.Replace("Controller", "");
+	private static string BuildRequestName(IControllerMetadata metaData) => metaData.ControllerType.Name.Replace("Controller", "");
+
 	private static string BuildContainerName(string urlPart) => CultureInfo.CurrentCulture.TextInfo.ToTitleCase(urlPart.ToLower());
 }

src/Simplify.Web.Postman/Assembly/Collection/PartBuilders/RequestBuilder.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
-using Simplify.Web.Meta;
+using Simplify.Web.Controllers.Meta;
+using Simplify.Web.Controllers.Meta.Routing;
+using Simplify.Web.Http;
 using Simplify.Web.Postman.Models;
 
 namespace Simplify.Web.Postman.Assembly.Collection.PartBuilders;
@@ -33,21 +35,21 @@ public static string BaseUrlPath
 	/// </summary>
 	/// <param name="metaData">The meta data.</param>
 	/// <param name="route">The route.</param>
-	public static Request Build(IControllerMetaData metaData, KeyValuePair<HttpMethod, string> route) =>
+	public static Request Build(IControllerMetadata metaData, KeyValuePair<HttpMethod, IControllerRoute> route) =>
 		new()
 		{
 			Url = new Url
 			{
 				Host = BaseUrlPath,
-				Path = BuildPath(route.Value)
+				Path = BuildPath(route.Value.Path)
 			},
 			Method = route.Key.ToString().ToUpper(),
 			Body = TryBuildBody(metaData)
 		};
 
 	private static IList<string> BuildPath(string controllerRoute) => controllerRoute.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
-	private static Body? TryBuildBody(IControllerMetaData metaData)
+	private static Body? TryBuildBody(IControllerMetadata metaData)
 	{
 		if (metaData.ControllerType.BaseType!.GenericTypeArguments.Length == 0)
 			return null;
@@ -56,9 +58,9 @@ public static Request Build(IControllerMetaData metaData, KeyValuePair<HttpMetho
 		{
 			Mode = "raw",
 			Raw = BuildRequestJsonData(metaData.ControllerType.BaseType.GenericTypeArguments[0]),
-			Options = new()
+			Options = new BodyOptions
 			{
-				Raw = new()
+				Raw = new BodyRawOptions
 				{
 					Language = "json"
 				}
@@ -94,7 +96,7 @@ private static Type ConstructGenericListTypeFromGenericIList(Type sourceListType
 	{
 		var type = typeof(List<>);
 
-		Type[] typeArgs = { sourceListType.GetGenericArguments()[0] };
+		Type[] typeArgs = [sourceListType.GetGenericArguments()[0]];
 
 		return type.MakeGenericType(typeArgs);
 	}
@@ -114,7 +116,7 @@ private static void InitializeListsSingleEmptyValues(object model)
 			var emptyList = Activator.CreateInstance(emptyListType);
 			var emptyItem = Activator.CreateInstance(listObjectType);
 
-			emptyListType.GetMethod("Add")!.Invoke(emptyList, new[] { emptyItem });
+			emptyListType.GetMethod("Add")!.Invoke(emptyList, [emptyItem]);
 
 			propertyInfo.SetValue(model, emptyList);
 		}

src/Simplify.Web.Postman/Assembly/Environment/EnvironmentBuilder.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Simplify.Web.Postman.Models;
 using Simplify.Web.Postman.Settings;
 
@@ -25,13 +24,13 @@ public EnvironmentModel Create() =>
 		new()
 		{
 			Name = _settings.ProjectName,
-			Values = new List<PostmanValue>
-			{
+			Values =
+			[
 				new PostmanValue
 				{
 					Key = "BaseUrl",
 					Value = "http://localhost:5000"
 				}
-			}
+			]
 		};
 }

src/Simplify.Web.Postman/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.2] - Unreleased
+
+### Dependencies
+
+- Simplify.Web bump to 5.0
+
 ## [1.1] - 2023-11-07
 
 ### Fixed

src/Simplify.Web.Postman/IO/ModelToFileExporter.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using Simplify.Web.Modules;
+using Simplify.Web.Modules.ApplicationEnvironment;
 using Simplify.Web.Postman.Json;
 
 namespace Simplify.Web.Postman.IO;
@@ -44,5 +44,5 @@ public void Export(object model, string fileName)
 
 	private static string GenerateCollectionFilePath(string folderPath, string fileName) => Path.Combine(folderPath, fileName);
 
-	private string GenerateExportFolderPath() => Path.Combine(_environment.SitePhysicalPath, _generationFolderPath);
+	private string GenerateExportFolderPath() => Path.Combine(_environment.AppPhysicalPath, _generationFolderPath);
 }

src/Simplify.Web.Postman/Setup/SimplifyDIRegistratorExtensions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Simplify.DI;
-using Simplify.Web.Modules;
+using Simplify.Web.Modules.ApplicationEnvironment;
 using Simplify.Web.Postman.Assembly.Collection;
 using Simplify.Web.Postman.Assembly.Collection.PartBuilders;
 using Simplify.Web.Postman.Assembly.Environment;

src/Simplify.Web.Postman/Simplify.Web.Postman.csproj

@@ -8,11 +8,11 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Version>1.1</Version>
+		<Version>2.0-pre01</Version>
 
 		<Description>Postman collection and environment generation extension for Simplify.Web</Description>
 		<Product>Simplify</Product>
-		<Authors>Alexander Krylkov</Authors>
+		<Authors>Simplify community</Authors>
 		<Copyright>Licensed under LGPL</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageProjectUrl>https://github.com/SimplifyNet/Simplify.Web.Postman</PackageProjectUrl>
@@ -24,8 +24,7 @@
 		<PackageReleaseNotes>See https://github.com/SimplifyNet/Simplify.Web.Postman/blob/master/src/Simplify.Web.Postman/CHANGELOG.md for details</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Simplify.Web" Version="4.7.1" />
-		<PackageReference Include="System.Text.Json" Version="7.0.3" />
+		<PackageReference Include="Simplify.Web" Version="5.0-pre01" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\..\images\icon.png" Pack="true" Visible="false" PackagePath="" />

src/TesterApp/Controllers/Api/v1/Groups/GetMultipleController.cs

@@ -2,32 +2,30 @@
 using Microsoft.AspNetCore.Mvc;
 using Simplify.Web;
 using Simplify.Web.Attributes;
-using Simplify.Web.Json.Responses;
-using TesterApp.ViewModels;
 using TesterApp.ViewModels.Groups;
 
 namespace TesterApp.Controllers.Api.v1.Groups;
 
 [Produces("application/json")]
 [Get("/api/v1/groups")]
-public class GetMultipleController : Simplify.Web.Controller
+public class GetMultipleController : Controller2
 {
-	public override ControllerResponse Invoke()
+	public ControllerResponse Invoke()
 	{
 		var items = new List<GroupViewModel>
 		{
-			new GroupViewModel
+			new()
 			{
 				Name = "Group 1"
 			},
-			new GroupViewModel
+			new()
 			{
 				Name = "Group 2"
 			}
 		};
 
 		// Items retrieve
 
-		return new Json(items);
+		return Json(items);
 	}
 }