From 16ccc26a22efc52fbe9e7e3e95f065acbca30170 Mon Sep 17 00:00:00 2001 From: Slava Vedernikov Date: Thu, 3 Oct 2024 11:30:06 +0100 Subject: [PATCH 1/2] Simplified C# AaC by making it stronly-typed throughout --- .../Writers/CSharpCodeWriter.cs | 23 +++++++++-------- C4InterFlow/Structures/Component.cs | 21 +++++++++++++++- C4InterFlow/Structures/Container.cs | 21 +++++++++++++++- C4InterFlow/Structures/Entity.cs | 25 ++++++++++++++++++- C4InterFlow/Structures/Flow.cs | 5 ++++ C4InterFlow/Structures/Interface.cs | 21 +++++++++++++++- C4InterFlow/Structures/SoftwareSystem.cs | 21 +++++++++++++++- C4InterFlow/Utils.cs | 7 +++++- .../DotNetEShop/SoftwareSystems/BasketApi.cs | 2 +- .../BasketApi/Containers/Data.cs | 2 +- .../Data/Components/RedisBasketRepository.cs | 2 +- .../Interfaces/DeleteBasketAsync.cs | 8 +++--- .../Interfaces/GetBasketAsync.cs | 8 +++--- .../Interfaces/GetBasketKey.cs | 4 +-- .../Interfaces/UpdateBasketAsync.cs | 10 ++++---- .../Data/Components/RedisDatabase.cs | 2 +- .../Interfaces/KeyDeleteAsync.cs | 4 +-- .../Interfaces/StringGetLeaseAsync.cs | 4 +-- .../Interfaces/StringSetAsync.cs | 4 +-- .../BasketApi/Containers/Grpc.cs | 2 +- .../Grpc/Components/BasketService.cs | 2 +- .../BasketService/Interfaces/DeleteBasket.cs | 8 +++--- .../BasketService/Interfaces/GetBasket.cs | 8 +++--- .../Interfaces/MapToCustomerBasket.cs | 4 +-- .../Interfaces/MapToCustomerBasketResponse.cs | 4 +-- .../Interfaces/ThrowBasketDoesNotExist.cs | 4 +-- .../Interfaces/ThrowNotAuthenticated.cs | 4 +-- .../BasketService/Interfaces/UpdateBasket.cs | 14 +++++------ .../DotNetEShop/SoftwareSystems/CatalogApi.cs | 2 +- .../CatalogApi/Containers/Api.cs | 2 +- .../Containers/Api/Components/CatalogApi.cs | 2 +- .../CatalogApi/Interfaces/CreateItem.cs | 8 +++--- .../CatalogApi/Interfaces/DeleteItemById.cs | 10 ++++---- .../CatalogApi/Interfaces/GetAllItems.cs | 6 ++--- .../CatalogApi/Interfaces/GetFullPath.cs | 4 +-- .../GetImageMimeTypeFromImageFileExtension.cs | 4 +-- .../CatalogApi/Interfaces/GetItemById.cs | 4 +-- .../Interfaces/GetItemPictureById.cs | 8 +++--- .../Interfaces/GetItemsByBrandAndTypeId.cs | 4 +-- .../Interfaces/GetItemsByBrandId.cs | 4 +-- .../CatalogApi/Interfaces/GetItemsByIds.cs | 6 ++--- .../CatalogApi/Interfaces/GetItemsByName.cs | 6 ++--- .../Interfaces/GetItemsBySemanticRelevance.cs | 10 ++++---- .../CatalogApi/Interfaces/MapCatalogApiV1.cs | 4 +-- .../CatalogApi/Interfaces/UpdateItem.cs | 6 ++--- .../CatalogApi/Containers/Infrastructure.cs | 2 +- .../Components/CatalogContext.cs | 2 +- .../Interfaces/CatalogBrandsAdd.cs | 4 +-- .../Interfaces/CatalogBrandsAnyAsync.cs | 4 +-- .../Interfaces/CatalogBrandsAsQueryable.cs | 4 +-- .../Interfaces/CatalogBrandsFindAsync.cs | 4 +-- .../CatalogBrandsFirstOrDefaultAsync.cs | 4 +-- .../Interfaces/CatalogBrandsRemove.cs | 4 +-- .../CatalogBrandsSingleOrDefault.cs | 4 +-- .../Interfaces/CatalogBrandsToListAsync.cs | 4 +-- .../Interfaces/CatalogItemsAdd.cs | 4 +-- .../Interfaces/CatalogItemsAnyAsync.cs | 4 +-- .../Interfaces/CatalogItemsAsQueryable.cs | 4 +-- .../Interfaces/CatalogItemsFindAsync.cs | 4 +-- .../CatalogItemsFirstOrDefaultAsync.cs | 4 +-- .../Interfaces/CatalogItemsRemove.cs | 4 +-- .../Interfaces/CatalogItemsSingleOrDefault.cs | 4 +-- .../Interfaces/CatalogItemsToListAsync.cs | 4 +-- .../Interfaces/CatalogTypesAdd.cs | 4 +-- .../Interfaces/CatalogTypesAnyAsync.cs | 4 +-- .../Interfaces/CatalogTypesAsQueryable.cs | 4 +-- .../Interfaces/CatalogTypesFindAsync.cs | 4 +-- .../CatalogTypesFirstOrDefaultAsync.cs | 4 +-- .../Interfaces/CatalogTypesRemove.cs | 4 +-- .../Interfaces/CatalogTypesSingleOrDefault.cs | 4 +-- .../Interfaces/CatalogTypesToListAsync.cs | 4 +-- .../Interfaces/SaveChangesAsync.cs | 4 +-- Samples/dotnet.eShop/draw-diagrams.bat | 2 +- Samples/dotnet.eShop/execute-aac-strategy.bat | 2 +- 74 files changed, 276 insertions(+), 166 deletions(-) diff --git a/C4InterFlow.Automation/Writers/CSharpCodeWriter.cs b/C4InterFlow.Automation/Writers/CSharpCodeWriter.cs index 8142d9fc0..4cccc45f9 100644 --- a/C4InterFlow.Automation/Writers/CSharpCodeWriter.cs +++ b/C4InterFlow.Automation/Writers/CSharpCodeWriter.cs @@ -1,5 +1,6 @@ using C4InterFlow.Structures; using System.Text; +using YamlDotNet.Core; namespace C4InterFlow.Automation.Writers { @@ -23,7 +24,7 @@ public partial class Containers public partial class {containerName} : IContainerInstance {{ public static Container Instance => new Container( - Utils.GetStructureAlias<{AnyCodeWriter.GetName(containerName)}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({containerName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ ContainerType = ContainerType.{(!string.IsNullOrEmpty(type) ? type : "None")}, Description = {(!string.IsNullOrEmpty(description) ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, @@ -102,7 +103,7 @@ public string GetSoftwareSystemCode(string architectureNamespace, string name, s public partial class {softwareSystemName} : ISoftwareSystemInstance {{ public static SoftwareSystem Instance => new SoftwareSystem( - Utils.GetStructureAlias<{AnyCodeWriter.GetName(softwareSystemName)}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({softwareSystemName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ Description = {(!string.IsNullOrEmpty(description) ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, Boundary = Boundary.{(!string.IsNullOrEmpty(boundary) ? boundary : "Internal")} @@ -130,7 +131,7 @@ public string GetActorCode(string architectureNamespace, string type, string nam public class {actorName} : I{type}Instance {{ public static {type} Instance => new {type}( - Utils.GetStructureAlias<{AnyCodeWriter.GetName(actorName)}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({actorName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ Description = {(description != null ? description : "\"\"")}, }}; @@ -159,7 +160,7 @@ public partial class Components public partial class {componentName} : IComponentInstance {{ public static Component Instance => new Component( - Utils.GetStructureAlias<{componentName}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({componentName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ ComponentType = ComponentType.{componentType}, Description = {(!string.IsNullOrEmpty(description) ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, @@ -236,13 +237,13 @@ public partial class Interfaces public partial class {componentInterfaceName} : IInterfaceInstance {{ public static Interface Instance => new Interface( - Utils.GetStructureAlias<{componentInterfaceName}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({componentInterfaceName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ Description = {(description != null ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, Path = {(path != null ? AnyCodeWriter.EnsureDoubleQuotes(path) : "\"\"")}, IsPrivate = {(isPrivate != null ? isPrivate.ToString().ToLower() : "false")}, Protocol = {(protocol != null ? AnyCodeWriter.EnsureDoubleQuotes(protocol) : "\"\"")}, - Flow = new Flow(Utils.GetStructureAlias<{componentInterfaceName}>()), + Flow = new Flow(Interface.GetAlias<{componentInterfaceName}>()), Input = {(input != null ? input : "\"\"")}, InputTemplate = {(inputTemplate != null ? inputTemplate : "\"\"")}, Output = {(output != null ? output : "\"\"")}, @@ -278,10 +279,10 @@ public partial class Interfaces public partial class {containerInterfaceName} : IInterfaceInstance {{ public static Interface Instance => new Interface( - Utils.GetStructureAlias<{containerInterfaceName}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({containerInterfaceName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ Description = {(description != null ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, - Flow = new Flow(Utils.GetStructureAlias<{containerInterfaceName}>()), + Flow = new Flow(Interface.GetAlias<{containerInterfaceName}>()), Protocol = {(protocol != null ? AnyCodeWriter.EnsureDoubleQuotes(protocol) : "\"\"")}, Input = {(input != null ? input : "\"\"")}, InputTemplate = {(inputTemplate != null ? inputTemplate : "\"\"")}, @@ -312,10 +313,10 @@ public partial class Interfaces public partial class {softwareSystemInterfaceName} : IInterfaceInstance {{ public static Interface Instance => new Interface( - Utils.GetStructureAlias<{softwareSystemInterfaceName}>(), {AnyCodeWriter.EnsureDoubleQuotes(label)}) + typeof({softwareSystemInterfaceName}), {AnyCodeWriter.EnsureDoubleQuotes(label)}) {{ Description = {(description != null ? AnyCodeWriter.EnsureDoubleQuotes(description) : "\"\"")}, - Flow = new Flow(Utils.GetStructureAlias<{softwareSystemInterfaceName}>()), + Flow = new Flow(Interface.GetAlias<{softwareSystemInterfaceName}>()), Protocol = {(protocol != null ? AnyCodeWriter.EnsureDoubleQuotes(protocol) : "\"\"")}, Input = {(input != null ? input : "\"\"")}, InputTemplate = {(inputTemplate != null ? inputTemplate : "\"\"")}, @@ -493,7 +494,7 @@ private string GetFormattedParams(string @params) public string GetUseFlowCode(string alias) { - return $"\t.Use(\"{alias}\")"; + return $"\t.Use<{alias}>()"; } public string GetBusinessProcessCode(string architectureNamespace, string name, string label, string businessActivitiesCode, string? description = null) diff --git a/C4InterFlow/Structures/Component.cs b/C4InterFlow/Structures/Component.cs index d8becf4f9..b32e45e1c 100644 --- a/C4InterFlow/Structures/Component.cs +++ b/C4InterFlow/Structures/Component.cs @@ -1,4 +1,6 @@ -namespace C4InterFlow.Structures; +using C4InterFlow.Structures.Interfaces; + +namespace C4InterFlow.Structures; /// /// The word "component" is a hugely overloaded term in the software development industry, but in this context a @@ -17,6 +19,10 @@ public record Component : Structure public string Container { get; init; } public Note[]? Notes { get; init; } + public Component(Type type) : this(GetAlias(type), Utils.GetLabelFromAlias(GetAlias(type))) + { } + public Component(Type type, string label) : this(GetAlias(type), label) + { } public Component(string alias) : this(alias, Utils.GetLabelFromAlias(alias)) { } public Component(string alias, string label) : this(Utils.GetContainerAlias(alias), alias, label) @@ -27,4 +33,17 @@ public Component(string container, string alias, string label) : base(alias, lab ComponentType = ComponentType.None; } + public static string GetAlias() where T : IComponentInstance + { + return Utils.GetStructureAlias(); + } + + public static string GetAlias(Type type) + { + if (!typeof(IComponentInstance).IsAssignableFrom(type)) + throw new ArgumentException($"Expected '{typeof(IComponentInstance).FullName}' type, but '{type.FullName}' type provided.", nameof(type)); + + return Utils.GetStructureAlias(type); + } + } diff --git a/C4InterFlow/Structures/Container.cs b/C4InterFlow/Structures/Container.cs index 04d24da58..122c7b5f5 100644 --- a/C4InterFlow/Structures/Container.cs +++ b/C4InterFlow/Structures/Container.cs @@ -1,4 +1,6 @@ -namespace C4InterFlow.Structures; +using C4InterFlow.Structures.Interfaces; + +namespace C4InterFlow.Structures; /// /// Not Docker! In the C4 model, a container represents an application or a data store. A container is something @@ -17,6 +19,10 @@ public record Container : Structure public string? Technology { get; init; } public string SoftwareSystem { get; init; } + public Container(Type type) : this(GetAlias(type), Utils.GetLabelFromAlias(GetAlias(type))) + { } + public Container(Type type, string label) : this(GetAlias(type), label) + { } public Container(string alias) : this(alias, Utils.GetLabelFromAlias(alias)) { } public Container(string alias, string label) : this(Utils.GetSoftwareSystemAlias(alias), alias, label) @@ -26,4 +32,17 @@ public Container(string system, string alias, string label) : base(alias, label) SoftwareSystem = system; ContainerType = ContainerType.None; } + + public static string GetAlias() where T : IContainerInstance + { + return Utils.GetStructureAlias(); + } + + public static string GetAlias(Type type) + { + if (!typeof(IContainerInstance).IsAssignableFrom(type)) + throw new ArgumentException($"Expected '{typeof(IContainerInstance).FullName}' type, but '{type.FullName}' type provided.", nameof(type)); + + return Utils.GetStructureAlias(type); + } } \ No newline at end of file diff --git a/C4InterFlow/Structures/Entity.cs b/C4InterFlow/Structures/Entity.cs index 1573f8707..8486b0548 100644 --- a/C4InterFlow/Structures/Entity.cs +++ b/C4InterFlow/Structures/Entity.cs @@ -1,4 +1,5 @@ -using System.ComponentModel; +using C4InterFlow.Structures.Interfaces; +using System.ComponentModel; namespace C4InterFlow.Structures { @@ -22,12 +23,34 @@ public enum EntityType public record Entity : Structure { + public Entity(Type type, EntityType entityType) : this(GetAlias(type), Utils.GetLabelFromAlias(GetAlias(type)), entityType) + { } + public Entity(Type type, string label, EntityType entityType) : this(GetAlias(type), label, entityType) + { } + public Entity(string alias, EntityType entityType) : this(alias, Utils.GetLabelFromAlias(alias), entityType) + { } + public Entity(string alias, string label, EntityType entityType) : this(Utils.GetContainerAlias(alias), alias, label, entityType) + { } public Entity(string container, string alias, string label, EntityType entityType) : base(alias, label) { EntityType = entityType; Container = container; } + + public static string GetAlias() where T : IEntityInstance + { + return Utils.GetStructureAlias(); + } + + public static string GetAlias(Type type) + { + if (!typeof(IEntityInstance).IsAssignableFrom(type)) + throw new ArgumentException($"Expected '{typeof(IEntityInstance).FullName}' type, but '{type.FullName}' type provided.", nameof(type)); + + return Utils.GetStructureAlias(type); + } + public EntityType EntityType { get; init; } public string Container { get; init; } public string[] ComposedOfMany { get; init; } diff --git a/C4InterFlow/Structures/Flow.cs b/C4InterFlow/Structures/Flow.cs index 232860434..8728dd9bc 100644 --- a/C4InterFlow/Structures/Flow.cs +++ b/C4InterFlow/Structures/Flow.cs @@ -1,4 +1,5 @@  +using C4InterFlow.Structures.Interfaces; using System.Text.RegularExpressions; namespace C4InterFlow.Structures @@ -513,6 +514,10 @@ public Flow Return(string value) return this; } + public Flow Use() where T : IInterfaceInstance + { + return Use(Interface.GetAlias()); + } public Flow Use(string interfaceAlias) { var flowType = FlowType.Use; diff --git a/C4InterFlow/Structures/Interface.cs b/C4InterFlow/Structures/Interface.cs index 9fe00c39f..4ff7b95bd 100644 --- a/C4InterFlow/Structures/Interface.cs +++ b/C4InterFlow/Structures/Interface.cs @@ -1,7 +1,13 @@ -namespace C4InterFlow.Structures +using C4InterFlow.Structures.Interfaces; + +namespace C4InterFlow.Structures { public record Interface : Structure { + public Interface(Type type) : this(GetAlias(type), Utils.GetLabelFromAlias(GetAlias(type))) + { } + public Interface(Type type, string label) : this(GetAlias(type), label) + { } public Interface(string alias) : this(alias, Utils.GetLabelFromAlias(alias)) { } public Interface(string alias, string label) : this(Utils.GetInterfaceOwnerAlias(alias), alias, label) @@ -11,6 +17,19 @@ public Interface(string owner, string alias, string label) : base(alias, label) Owner = owner; } + public static string GetAlias() where T : IInterfaceInstance + { + return Utils.GetStructureAlias(); + } + + public static string GetAlias(Type type) + { + if (!typeof(IInterfaceInstance).IsAssignableFrom(type)) + throw new ArgumentException($"Expected '{typeof(IInterfaceInstance).FullName}' type, but '{type.FullName}' type provided.", nameof(type)); + + return Utils.GetStructureAlias(type); + } + public string Protocol { get; init; } public bool IsPrivate { get; init; } public string Path { get; init; } diff --git a/C4InterFlow/Structures/SoftwareSystem.cs b/C4InterFlow/Structures/SoftwareSystem.cs index e212e8673..f85fe2fa4 100644 --- a/C4InterFlow/Structures/SoftwareSystem.cs +++ b/C4InterFlow/Structures/SoftwareSystem.cs @@ -1,4 +1,6 @@ -namespace C4InterFlow.Structures; +using C4InterFlow.Structures.Interfaces; + +namespace C4InterFlow.Structures; /// /// A software system is the highest level of abstraction and describes something that delivers value to its users, @@ -9,6 +11,10 @@ /// public sealed record SoftwareSystem : Structure { + public SoftwareSystem(Type type) : this(GetAlias(type), Utils.GetLabelFromAlias(GetAlias(type))) + { } + public SoftwareSystem(Type type, string label) : this(GetAlias(type), label) + { } public SoftwareSystem(string alias) : this(alias, Utils.GetLabelFromAlias(alias)) { } public SoftwareSystem(string alias, string label) : base(alias, label) @@ -24,4 +30,17 @@ public SoftwareSystem(string alias, string label, string description, Boundary b Description = description; Boundary = boundary; } + + public static string GetAlias() where T : ISoftwareSystemInstance + { + return Utils.GetStructureAlias(); + } + + public static string GetAlias(Type type) + { + if (!typeof(ISoftwareSystemInstance).IsAssignableFrom(type)) + throw new ArgumentException($"Expected '{typeof(ISoftwareSystemInstance).FullName}' type, but '{type.FullName}' type provided.", nameof(type)); + + return Utils.GetStructureAlias(type); + } } diff --git a/C4InterFlow/Utils.cs b/C4InterFlow/Utils.cs index d281b2014..909ecb017 100644 --- a/C4InterFlow/Utils.cs +++ b/C4InterFlow/Utils.cs @@ -53,7 +53,12 @@ public static string GetContainerAlias(string alias) public static string GetStructureAlias() { - return typeof(T).FullName?.Replace('+', '.') ?? string.Empty; + return GetStructureAlias(typeof(T)); + } + + public static string GetStructureAlias(Type type) + { + return type.FullName?.Replace('+', '.') ?? string.Empty; } public static string GetSoftwareSystemAlias(string alias) diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi.cs index d04644ba1..835b87d03 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi.cs @@ -7,7 +7,7 @@ namespace DotNetEShop.SoftwareSystems { public partial class BasketApi : ISoftwareSystemInstance { - public static SoftwareSystem Instance => new SoftwareSystem(Utils.GetStructureAlias(), "Basket Api") + public static SoftwareSystem Instance => new SoftwareSystem(typeof(BasketApi), "Basket Api") { Description = "", Boundary = Boundary.Internal diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data.cs index e049a3463..b0ced5228 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data.cs @@ -11,7 +11,7 @@ public partial class Containers { public partial class Data : IContainerInstance { - public static Container Instance => new Container(Utils.GetStructureAlias(), "Data") + public static Container Instance => new Container(typeof(Data), "Data") { ContainerType = ContainerType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository.cs index 913ff96ab..b0dff59c5 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository.cs @@ -15,7 +15,7 @@ public partial class Components { public partial class RedisBasketRepository : IComponentInstance { - public static Component Instance => new Component(Utils.GetStructureAlias(), "Redis Basket Repository") + public static Component Instance => new Component(typeof(RedisBasketRepository), "Redis Basket Repository") { ComponentType = ComponentType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/DeleteBasketAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/DeleteBasketAsync.cs index 618f62f72..53c6b6663 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/DeleteBasketAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/DeleteBasketAsync.cs @@ -19,15 +19,15 @@ public partial class Interfaces { public partial class DeleteBasketAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Delete Basket Async") + public static Interface Instance => new Interface(typeof(DeleteBasketAsync), "Delete Basket Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.GetBasketKey") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisDatabase.Interfaces.KeyDeleteAsync"), + Flow = new Flow(Interface.GetAlias()) + .Use() + .Use(), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketAsync.cs index 0f4469a23..0104b1a4e 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketAsync.cs @@ -19,15 +19,15 @@ public partial class Interfaces { public partial class GetBasketAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Basket Async") + public static Interface Instance => new Interface(typeof(GetBasketAsync), "Get Basket Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.GetBasketKey") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisDatabase.Interfaces.StringGetLeaseAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() + .Use() .Return(@"JsonSerializer.Deserialize"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketKey.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketKey.cs index dc7c445f1..70ade69cd 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketKey.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/GetBasketKey.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetBasketKey : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Basket Key") + public static Interface Instance => new Interface(typeof(GetBasketKey), "Get Basket Key") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/UpdateBasketAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/UpdateBasketAsync.cs index e05f4e305..9bcdbf382 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/UpdateBasketAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisBasketRepository/Interfaces/UpdateBasketAsync.cs @@ -19,16 +19,16 @@ public partial class Interfaces { public partial class UpdateBasketAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Update Basket Async") + public static Interface Instance => new Interface(typeof(UpdateBasketAsync), "Update Basket Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.GetBasketKey") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisDatabase.Interfaces.StringSetAsync") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.GetBasketAsync"), + Flow = new Flow(Interface.GetAlias()) + .Use() + .Use() + .Use(), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase.cs index 8592e54da..d044f42ad 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase.cs @@ -15,7 +15,7 @@ public partial class Components { public partial class RedisDatabase : IComponentInstance { - public static Component Instance => new Component(Utils.GetStructureAlias(), "Redis Database") + public static Component Instance => new Component(typeof(RedisDatabase), "Redis Database") { ComponentType = ComponentType.Database, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/KeyDeleteAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/KeyDeleteAsync.cs index 0f21742c5..468322e41 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/KeyDeleteAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/KeyDeleteAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class KeyDeleteAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Key Delete Async") + public static Interface Instance => new Interface(typeof(KeyDeleteAsync), "Key Delete Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringGetLeaseAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringGetLeaseAsync.cs index c7876e3ed..2f27a6f0e 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringGetLeaseAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringGetLeaseAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class StringGetLeaseAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "String Get Lease Async") + public static Interface Instance => new Interface(typeof(StringGetLeaseAsync), "String Get Lease Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringSetAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringSetAsync.cs index 6ffbb9566..c1ac3c407 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringSetAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Data/Components/RedisDatabase/Interfaces/StringSetAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class StringSetAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "String Set Async") + public static Interface Instance => new Interface(typeof(StringSetAsync), "String Set Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc.cs index 88feeb347..ac67e54d1 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc.cs @@ -11,7 +11,7 @@ public partial class Containers { public partial class Grpc : IContainerInstance { - public static Container Instance => new Container(Utils.GetStructureAlias(), "Grpc") + public static Container Instance => new Container(typeof(Grpc), "Grpc") { ContainerType = ContainerType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService.cs index d27d1f0b3..a9282502f 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService.cs @@ -15,7 +15,7 @@ public partial class Components { public partial class BasketService : IComponentInstance { - public static Component Instance => new Component(Utils.GetStructureAlias(), "Basket Service") + public static Component Instance => new Component(typeof(BasketService), "Basket Service") { ComponentType = ComponentType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/DeleteBasket.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/DeleteBasket.cs index 8c2736b2e..bcc694b76 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/DeleteBasket.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/DeleteBasket.cs @@ -19,17 +19,17 @@ public partial class Interfaces { public partial class DeleteBasket : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Delete Basket") + public static Interface Instance => new Interface(typeof(DeleteBasket), "Delete Basket") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"string.IsNullOrEmpty(userId)") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.ThrowNotAuthenticated") + .Use() .EndIf() - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.DeleteBasketAsync"), + .Use(), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/GetBasket.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/GetBasket.cs index 116f7d615..de252b182 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/GetBasket.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/GetBasket.cs @@ -19,16 +19,16 @@ public partial class Interfaces { public partial class GetBasket : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Basket") + public static Interface Instance => new Interface(typeof(GetBasket), "Get Basket") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.GetBasketAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() .If(@"data is not null") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.MapToCustomerBasketResponse") + .Use() .EndIf(), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasket.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasket.cs index 1651952a5..e662daf74 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasket.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasket.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class MapToCustomerBasket : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Map To Customer Basket") + public static Interface Instance => new Interface(typeof(MapToCustomerBasket), "Map To Customer Basket") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .Return(@"response"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasketResponse.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasketResponse.cs index 6fc54bb8d..73cba9dfc 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasketResponse.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/MapToCustomerBasketResponse.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class MapToCustomerBasketResponse : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Map To Customer Basket Response") + public static Interface Instance => new Interface(typeof(MapToCustomerBasketResponse), "Map To Customer Basket Response") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .Return(@"response"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowBasketDoesNotExist.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowBasketDoesNotExist.cs index 1d8af12c4..c3daa3547 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowBasketDoesNotExist.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowBasketDoesNotExist.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class ThrowBasketDoesNotExist : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Throw Basket Does Not Exist") + public static Interface Instance => new Interface(typeof(ThrowBasketDoesNotExist), "Throw Basket Does Not Exist") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowNotAuthenticated.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowNotAuthenticated.cs index c1b01fe00..f304b6fc6 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowNotAuthenticated.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/ThrowNotAuthenticated.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class ThrowNotAuthenticated : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Throw Not Authenticated") + public static Interface Instance => new Interface(typeof(ThrowNotAuthenticated), "Throw Not Authenticated") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/UpdateBasket.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/UpdateBasket.cs index fe48ee047..0fe0923cd 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/UpdateBasket.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/BasketApi/Containers/Grpc/Components/BasketService/Interfaces/UpdateBasket.cs @@ -19,22 +19,22 @@ public partial class Interfaces { public partial class UpdateBasket : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Update Basket") + public static Interface Instance => new Interface(typeof(UpdateBasket), "Update Basket") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"string.IsNullOrEmpty(userId)") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.ThrowNotAuthenticated") + .Use() .EndIf() - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.MapToCustomerBasket") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Data.Components.RedisBasketRepository.Interfaces.UpdateBasketAsync") + .Use() + .Use() .If(@"response is null") - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.ThrowBasketDoesNotExist") + .Use() .EndIf() - .Use("DotNetEShop.SoftwareSystems.BasketApi.Containers.Grpc.Components.BasketService.Interfaces.MapToCustomerBasketResponse"), + .Use(), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi.cs index 89c457127..4153ba35c 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi.cs @@ -7,7 +7,7 @@ namespace DotNetEShop.SoftwareSystems { public partial class CatalogApi : ISoftwareSystemInstance { - public static SoftwareSystem Instance => new SoftwareSystem(Utils.GetStructureAlias(), "Catalog Api") + public static SoftwareSystem Instance => new SoftwareSystem(typeof(CatalogApi), "Catalog Api") { Description = "", Boundary = Boundary.Internal diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api.cs index 26d17941b..577f02518 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api.cs @@ -11,7 +11,7 @@ public partial class Containers { public partial class Api : IContainerInstance { - public static Container Instance => new Container(Utils.GetStructureAlias(), "Api") + public static Container Instance => new Container(typeof(Api), "Api") { ContainerType = ContainerType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi.cs index d74b1fd3e..a96123aa5 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi.cs @@ -15,7 +15,7 @@ public partial class Components { public partial class CatalogApi : IComponentInstance { - public static Component Instance => new Component(Utils.GetStructureAlias(), "Catalog Api") + public static Component Instance => new Component(typeof(CatalogApi), "Catalog Api") { ComponentType = ComponentType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/CreateItem.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/CreateItem.cs index c041953e4..37ca999a7 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/CreateItem.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/CreateItem.cs @@ -19,15 +19,15 @@ public partial class Interfaces { public partial class CreateItem : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Create Item") + public static Interface Instance => new Interface(typeof(CreateItem), "Create Item") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsAdd") - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.SaveChangesAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() + .Use() .Return(@"TypedResults.Created"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/DeleteItemById.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/DeleteItemById.cs index ea380711c..86f5a7082 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/DeleteItemById.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/DeleteItemById.cs @@ -19,19 +19,19 @@ public partial class Interfaces { public partial class DeleteItemById : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Delete Item By Id") + public static Interface Instance => new Interface(typeof(DeleteItemById), "Delete Item By Id") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsSingleOrDefault") + Flow = new Flow(Interface.GetAlias()) + .Use() .If(@"item is null") .Return(@"TypedResults.NotFound") .EndIf() - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsRemove") - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.SaveChangesAsync") + .Use() + .Use() .Return(@"TypedResults.NoContent"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetAllItems.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetAllItems.cs index 873cf56d2..20ce857aa 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetAllItems.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetAllItems.cs @@ -19,14 +19,14 @@ public partial class Interfaces { public partial class GetAllItems : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get All Items") + public static Interface Instance => new Interface(typeof(GetAllItems), "Get All Items") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsToListAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() .Return(@"TypedResults.Ok"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetFullPath.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetFullPath.cs index 996053479..765d60b9e 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetFullPath.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetFullPath.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetFullPath : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Full Path") + public static Interface Instance => new Interface(typeof(GetFullPath), "Get Full Path") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetImageMimeTypeFromImageFileExtension.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetImageMimeTypeFromImageFileExtension.cs index 61b3bfb5f..ee87b7d91 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetImageMimeTypeFromImageFileExtension.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetImageMimeTypeFromImageFileExtension.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetImageMimeTypeFromImageFileExtension : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Image Mime Type From Image File Extension") + public static Interface Instance => new Interface(typeof(GetImageMimeTypeFromImageFileExtension), "Get Image Mime Type From Image File Extension") { Description = "", Path = "", IsPrivate = true, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemById.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemById.cs index 4108d96cc..29a44f289 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemById.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemById.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetItemById : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Item By Id") + public static Interface Instance => new Interface(typeof(GetItemById), "Get Item By Id") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"id <= 0") .Return(@"TypedResults.BadRequest") .EndIf() diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemPictureById.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemPictureById.cs index 6c41a7fbe..831821a0d 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemPictureById.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemPictureById.cs @@ -19,18 +19,18 @@ public partial class Interfaces { public partial class GetItemPictureById : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Item Picture By Id") + public static Interface Instance => new Interface(typeof(GetItemPictureById), "Get Item Picture By Id") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"item is null") .Return(@"TypedResults.NotFound") .EndIf() - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Api.Components.CatalogApi.Interfaces.GetFullPath") - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Api.Components.CatalogApi.Interfaces.GetImageMimeTypeFromImageFileExtension") + .Use() + .Use() .Return(@"TypedResults.PhysicalFile"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandAndTypeId.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandAndTypeId.cs index 0bea245e1..91adceba1 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandAndTypeId.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandAndTypeId.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetItemsByBrandAndTypeId : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Items By Brand And Type Id") + public static Interface Instance => new Interface(typeof(GetItemsByBrandAndTypeId), "Get Items By Brand And Type Id") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .Return(@"TypedResults.Ok"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandId.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandId.cs index 18b2a3202..692b41ee7 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandId.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByBrandId.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class GetItemsByBrandId : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Items By Brand Id") + public static Interface Instance => new Interface(typeof(GetItemsByBrandId), "Get Items By Brand Id") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .Return(@"TypedResults.Ok"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByIds.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByIds.cs index ce51108bc..7fc9ebe09 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByIds.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByIds.cs @@ -19,14 +19,14 @@ public partial class Interfaces { public partial class GetItemsByIds : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Items By Ids") + public static Interface Instance => new Interface(typeof(GetItemsByIds), "Get Items By Ids") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsToListAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() .Return(@"TypedResults.Ok"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByName.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByName.cs index 11e3894f1..8d313c4fd 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByName.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsByName.cs @@ -19,14 +19,14 @@ public partial class Interfaces { public partial class GetItemsByName : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Items By Name") + public static Interface Instance => new Interface(typeof(GetItemsByName), "Get Items By Name") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsToListAsync") + Flow = new Flow(Interface.GetAlias()) + .Use() .Return(@"TypedResults.Ok"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsBySemanticRelevance.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsBySemanticRelevance.cs index 7e561ecb2..405b4b642 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsBySemanticRelevance.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/GetItemsBySemanticRelevance.cs @@ -19,20 +19,20 @@ public partial class Interfaces { public partial class GetItemsBySemanticRelevance : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Get Items By Semantic Relevance") + public static Interface Instance => new Interface(typeof(GetItemsBySemanticRelevance), "Get Items By Semantic Relevance") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"!services.CatalogAI.IsEnabled") - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Api.Components.CatalogApi.Interfaces.GetItemsByName") + .Use() .EndIf() .If(@"services.Logger.IsEnabled(LogLevel.Debug)") - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsToListAsync") + .Use() .Else() - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.CatalogItemsToListAsync") + .Use() .EndIf() .Return(@"TypedResults.Ok"), Input = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/MapCatalogApiV1.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/MapCatalogApiV1.cs index ac171f5f1..7349b5745 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/MapCatalogApiV1.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/MapCatalogApiV1.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class MapCatalogApiV1 : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Map Catalog Api V 1") + public static Interface Instance => new Interface(typeof(MapCatalogApiV1), "Map Catalog Api V 1") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .Return(@"app"), Input = "", InputTemplate = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/UpdateItem.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/UpdateItem.cs index b5ab7c6c5..85faa5b09 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/UpdateItem.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Api/Components/CatalogApi/Interfaces/UpdateItem.cs @@ -19,19 +19,19 @@ public partial class Interfaces { public partial class UpdateItem : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Update Item") + public static Interface Instance => new Interface(typeof(UpdateItem), "Update Item") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()) + Flow = new Flow(Interface.GetAlias()) .If(@"catalogItem == null") .Return(@"TypedResults.NotFound") .EndIf() .If(@"priceEntry.IsModified") .Else() - .Use("DotNetEShop.SoftwareSystems.CatalogApi.Containers.Infrastructure.Components.CatalogContext.Interfaces.SaveChangesAsync") + .Use() .EndIf() .Return(@"TypedResults.Created"), Input = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure.cs index 505138d11..f8375ebc1 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure.cs @@ -11,7 +11,7 @@ public partial class Containers { public partial class Infrastructure : IContainerInstance { - public static Container Instance => new Container(Utils.GetStructureAlias(), "Infrastructure") + public static Container Instance => new Container(typeof(Infrastructure), "Infrastructure") { ContainerType = ContainerType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext.cs index 3dbd8ec40..42663e114 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext.cs @@ -15,7 +15,7 @@ public partial class Components { public partial class CatalogContext : IComponentInstance { - public static Component Instance => new Component(Utils.GetStructureAlias(), "Catalog Context") + public static Component Instance => new Component(typeof(CatalogContext), "Catalog Context") { ComponentType = ComponentType.None, Description = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAdd.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAdd.cs index 088f65a5f..76f98f0eb 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAdd.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAdd.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsAdd : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands Add") + public static Interface Instance => new Interface(typeof(CatalogBrandsAdd), "Catalog Brands Add") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAnyAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAnyAsync.cs index 5745c000c..c368decbc 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAnyAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAnyAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsAnyAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands Any Async") + public static Interface Instance => new Interface(typeof(CatalogBrandsAnyAsync), "Catalog Brands Any Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAsQueryable.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAsQueryable.cs index 3759cfedf..504193aea 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAsQueryable.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsAsQueryable.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsAsQueryable : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands As Queryable") + public static Interface Instance => new Interface(typeof(CatalogBrandsAsQueryable), "Catalog Brands As Queryable") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFindAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFindAsync.cs index 5a0d2e692..d9d74686d 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFindAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFindAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsFindAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands Find Async") + public static Interface Instance => new Interface(typeof(CatalogBrandsFindAsync), "Catalog Brands Find Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFirstOrDefaultAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFirstOrDefaultAsync.cs index 24a49ce41..eb8592edc 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFirstOrDefaultAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsFirstOrDefaultAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsFirstOrDefaultAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands First Or Default Async") + public static Interface Instance => new Interface(typeof(CatalogBrandsFirstOrDefaultAsync), "Catalog Brands First Or Default Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsRemove.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsRemove.cs index 30cb34c1a..d72af194f 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsRemove.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsRemove.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsRemove : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands Remove") + public static Interface Instance => new Interface(typeof(CatalogBrandsRemove), "Catalog Brands Remove") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsSingleOrDefault.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsSingleOrDefault.cs index 703eaedbf..9942390c4 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsSingleOrDefault.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsSingleOrDefault.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsSingleOrDefault : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands Single Or Default") + public static Interface Instance => new Interface(typeof(CatalogBrandsSingleOrDefault), "Catalog Brands Single Or Default") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsToListAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsToListAsync.cs index 96fb4103a..3ae9b80d0 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsToListAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogBrandsToListAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogBrandsToListAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Brands To List Async") + public static Interface Instance => new Interface(typeof(CatalogBrandsToListAsync), "Catalog Brands To List Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAdd.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAdd.cs index b1f545a1a..75ad8382e 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAdd.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAdd.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsAdd : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items Add") + public static Interface Instance => new Interface(typeof(CatalogItemsAdd), "Catalog Items Add") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAnyAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAnyAsync.cs index c17be8212..7b8ffe24d 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAnyAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAnyAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsAnyAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items Any Async") + public static Interface Instance => new Interface(typeof(CatalogItemsAnyAsync), "Catalog Items Any Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAsQueryable.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAsQueryable.cs index 91253bb0f..39bb6097f 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAsQueryable.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsAsQueryable.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsAsQueryable : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items As Queryable") + public static Interface Instance => new Interface(typeof(CatalogItemsAsQueryable), "Catalog Items As Queryable") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFindAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFindAsync.cs index 9cf7ddd2c..eee05f82d 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFindAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFindAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsFindAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items Find Async") + public static Interface Instance => new Interface(typeof(CatalogItemsFindAsync), "Catalog Items Find Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFirstOrDefaultAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFirstOrDefaultAsync.cs index 29916bc29..1aa9c3a04 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFirstOrDefaultAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsFirstOrDefaultAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsFirstOrDefaultAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items First Or Default Async") + public static Interface Instance => new Interface(typeof(CatalogItemsFirstOrDefaultAsync), "Catalog Items First Or Default Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsRemove.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsRemove.cs index 605b257a5..eded9455a 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsRemove.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsRemove.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsRemove : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items Remove") + public static Interface Instance => new Interface(typeof(CatalogItemsRemove), "Catalog Items Remove") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsSingleOrDefault.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsSingleOrDefault.cs index d5add80e0..3f4845ade 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsSingleOrDefault.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsSingleOrDefault.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsSingleOrDefault : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items Single Or Default") + public static Interface Instance => new Interface(typeof(CatalogItemsSingleOrDefault), "Catalog Items Single Or Default") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsToListAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsToListAsync.cs index 2afad4106..4de89ceac 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsToListAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogItemsToListAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogItemsToListAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Items To List Async") + public static Interface Instance => new Interface(typeof(CatalogItemsToListAsync), "Catalog Items To List Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAdd.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAdd.cs index a66e081c2..a11249c57 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAdd.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAdd.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesAdd : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types Add") + public static Interface Instance => new Interface(typeof(CatalogTypesAdd), "Catalog Types Add") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAnyAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAnyAsync.cs index 8045aea22..138276263 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAnyAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAnyAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesAnyAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types Any Async") + public static Interface Instance => new Interface(typeof(CatalogTypesAnyAsync), "Catalog Types Any Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAsQueryable.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAsQueryable.cs index c8c2151ff..f6d255339 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAsQueryable.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesAsQueryable.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesAsQueryable : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types As Queryable") + public static Interface Instance => new Interface(typeof(CatalogTypesAsQueryable), "Catalog Types As Queryable") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFindAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFindAsync.cs index eac7249b0..dcfd88adc 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFindAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFindAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesFindAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types Find Async") + public static Interface Instance => new Interface(typeof(CatalogTypesFindAsync), "Catalog Types Find Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFirstOrDefaultAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFirstOrDefaultAsync.cs index f5292e667..f4ebe54a0 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFirstOrDefaultAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesFirstOrDefaultAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesFirstOrDefaultAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types First Or Default Async") + public static Interface Instance => new Interface(typeof(CatalogTypesFirstOrDefaultAsync), "Catalog Types First Or Default Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesRemove.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesRemove.cs index 96e94e8cb..07d0025a8 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesRemove.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesRemove.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesRemove : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types Remove") + public static Interface Instance => new Interface(typeof(CatalogTypesRemove), "Catalog Types Remove") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesSingleOrDefault.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesSingleOrDefault.cs index 8cff5987e..5f5044066 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesSingleOrDefault.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesSingleOrDefault.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesSingleOrDefault : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types Single Or Default") + public static Interface Instance => new Interface(typeof(CatalogTypesSingleOrDefault), "Catalog Types Single Or Default") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesToListAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesToListAsync.cs index 8f0e496a8..5f90ce91f 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesToListAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/CatalogTypesToListAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class CatalogTypesToListAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Catalog Types To List Async") + public static Interface Instance => new Interface(typeof(CatalogTypesToListAsync), "Catalog Types To List Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/SaveChangesAsync.cs b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/SaveChangesAsync.cs index caeac22fb..11f62278d 100644 --- a/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/SaveChangesAsync.cs +++ b/Samples/dotnet.eShop/DotNetEShop/SoftwareSystems/CatalogApi/Containers/Infrastructure/Components/CatalogContext/Interfaces/SaveChangesAsync.cs @@ -19,13 +19,13 @@ public partial class Interfaces { public partial class SaveChangesAsync : IInterfaceInstance { - public static Interface Instance => new Interface(Utils.GetStructureAlias(), "Save Changes Async") + public static Interface Instance => new Interface(typeof(SaveChangesAsync), "Save Changes Async") { Description = "", Path = "", IsPrivate = false, Protocol = "", - Flow = new Flow(Utils.GetStructureAlias()), + Flow = new Flow(Interface.GetAlias()), Input = "", InputTemplate = "", Output = "", diff --git a/Samples/dotnet.eShop/draw-diagrams.bat b/Samples/dotnet.eShop/draw-diagrams.bat index 4a978c46b..222241bed 100644 --- a/Samples/dotnet.eShop/draw-diagrams.bat +++ b/Samples/dotnet.eShop/draw-diagrams.bat @@ -4,7 +4,7 @@ if not defined redraw-all set "redraw-all=FALSE" ::::::::::::::::::::::::::::::: :: Possible values: CSharp, Yaml -if not defined aac-type set "aac-type=Yaml" +if not defined aac-type set "aac-type=CSharp" :::::::::::::::::::::::::::::::: if not defined build-configuration set "build-configuration=Debug" diff --git a/Samples/dotnet.eShop/execute-aac-strategy.bat b/Samples/dotnet.eShop/execute-aac-strategy.bat index a74af62e4..262efce22 100644 --- a/Samples/dotnet.eShop/execute-aac-strategy.bat +++ b/Samples/dotnet.eShop/execute-aac-strategy.bat @@ -5,7 +5,7 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: Possible values: CSharp, Yaml -@IF NOT DEFINED aac-type set "aac-type=Yaml" +@IF NOT DEFINED aac-type set "aac-type=CSharp" :::::::::::::::::::::::::::::::: if not defined build-configuration set "build-configuration=Debug" From f01bbe99a6e449b2b159c830717078a1a093d236 Mon Sep 17 00:00:00 2001 From: Slava Vedernikov Date: Thu, 3 Oct 2024 11:34:38 +0100 Subject: [PATCH 2/2] Up-versioned all projects --- C4InterFlow.Automation/C4InterFlow.Automation.csproj | 4 ++-- C4InterFlow.Cli/C4InterFlow.Cli.csproj | 2 +- C4InterFlow/C4InterFlow.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4InterFlow.Automation/C4InterFlow.Automation.csproj b/C4InterFlow.Automation/C4InterFlow.Automation.csproj index 345fc2a96..993495c74 100644 --- a/C4InterFlow.Automation/C4InterFlow.Automation.csproj +++ b/C4InterFlow.Automation/C4InterFlow.Automation.csproj @@ -7,12 +7,12 @@ true true snupkg - 1.7.3 + 1.7.4 C4InterFlow.Automation - 1.7.3 + 1.7.4 Slava Vedernikov Revolutionise your Application Architecture Documentation with C4InterFlow. Designed for Architects and Engineers, this tool leverages the widely-recognised C4 Model (Architecture Visualisation framework), enhanced with unique features like Interface and Flow, to describe your Application Architecture as Code. Experience an intuitive, efficient way to document complex systems, ensuring clarity and consistency across your teams and products. Copyright 2024 Slava Vedernikov diff --git a/C4InterFlow.Cli/C4InterFlow.Cli.csproj b/C4InterFlow.Cli/C4InterFlow.Cli.csproj index 10aada388..0a74a709b 100644 --- a/C4InterFlow.Cli/C4InterFlow.Cli.csproj +++ b/C4InterFlow.Cli/C4InterFlow.Cli.csproj @@ -5,7 +5,7 @@ net6.0 enable enable - 1.7.3 + 1.7.4 true true win-x64 diff --git a/C4InterFlow/C4InterFlow.csproj b/C4InterFlow/C4InterFlow.csproj index 099308bd0..11d30a80f 100644 --- a/C4InterFlow/C4InterFlow.csproj +++ b/C4InterFlow/C4InterFlow.csproj @@ -7,12 +7,12 @@ true true snupkg - 1.7.3 + 1.7.4 C4InterFlow - 1.7.3 + 1.7.4 Slava Vedernikov Revolutionise your Application Architecture Documentation with C4InterFlow. Designed for Architects and Engineers, this tool leverages the widely-recognised C4 Model (Architecture Visualisation framework), enhanced with unique features like Interface and Flow, to describe your Application Architecture as Code. Experience an intuitive, efficient way to document complex systems, ensuring clarity and consistency across your teams and products. Copyright 2024 Slava Vedernikov