diff --git a/Revo.Core/Collections/Extensions.cs b/Revo.Core/Collections/Extensions.cs index ccfc50fa..324cc7a4 100644 --- a/Revo.Core/Collections/Extensions.cs +++ b/Revo.Core/Collections/Extensions.cs @@ -21,9 +21,7 @@ public static string ToSeparatedString(this IEnumerable source, char separator) return sb.ToString(); } - public static IEnumerable AsNotNull(this IEnumerable original) - { - return original ?? Enumerable.Empty(); - } + public static IEnumerable AsNotNull(this IEnumerable original) => + original ?? Enumerable.Empty(); } } diff --git a/Revo.Core/Collections/MultiValueDictionary.cs b/Revo.Core/Collections/MultiValueDictionary.cs index a2006b0c..ba117af9 100644 --- a/Revo.Core/Collections/MultiValueDictionary.cs +++ b/Revo.Core/Collections/MultiValueDictionary.cs @@ -7,47 +7,28 @@ namespace Revo.Core.Collections public class MultiValueDictionary : IReadOnlyDictionary> { private readonly Dictionary> dictionary; - public MultiValueDictionary() - { + public MultiValueDictionary() => dictionary = new Dictionary>(); - } - public MultiValueDictionary(IEqualityComparer comparer) - { + public MultiValueDictionary(IEqualityComparer comparer) => dictionary = new Dictionary>(comparer); - } - public MultiValueDictionary(int capacity) - { + public MultiValueDictionary(int capacity) => dictionary = new Dictionary>(capacity); - } - public MultiValueDictionary(int capacity, IEqualityComparer comparer) - { + public MultiValueDictionary(int capacity, IEqualityComparer comparer) => dictionary = new Dictionary>(capacity, comparer); - } - public MultiValueDictionary(IEnumerable>> enumerable) : this() - { + public MultiValueDictionary(IEnumerable>> enumerable) : this() => AddRange(enumerable); - } public MultiValueDictionary(IEnumerable>> enumerable, - IEqualityComparer comparer) : this(comparer) - { - AddRange(enumerable); - } + IEqualityComparer comparer) : this(comparer) => AddRange(enumerable); - public MultiValueDictionary(IEnumerable> values) : this() - { - AddRange(values); - } + public MultiValueDictionary(IEnumerable> values) : this() => AddRange(values); public MultiValueDictionary(IEnumerable> values, - IEqualityComparer comparer) : this(comparer) - { - AddRange(values); - } + IEqualityComparer comparer) : this(comparer) => AddRange(values); public IReadOnlyCollection this[TKey key] { @@ -112,21 +93,13 @@ public void AddRange(IEnumerable> values) } } - public void Clear() - { - dictionary.Clear(); - } + public void Clear() => dictionary.Clear(); - public bool ContainsKey(TKey key) - { - return dictionary.ContainsKey(key); - } + public bool ContainsKey(TKey key) => dictionary.ContainsKey(key); + + public IEnumerator>> GetEnumerator() => + new Enumerator(dictionary.GetEnumerator()); - public IEnumerator>> GetEnumerator() - { - return new Enumerator(dictionary.GetEnumerator()); - } - public bool TryGetValue(TKey key, out IReadOnlyCollection value) { bool result = dictionary.TryGetValue(key, out var listValue); @@ -134,10 +107,7 @@ public bool TryGetValue(TKey key, out IReadOnlyCollection value) return result; } - public bool Remove(TKey key) - { - return dictionary.Remove(key); - } + public bool Remove(TKey key) => dictionary.Remove(key); public bool Remove(TKey key, TValue value) { @@ -153,30 +123,16 @@ public bool Remove(TKey key, TValue value) return false; } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - private class Enumerator : IEnumerator>> - { - private readonly IEnumerator>> enumerator; + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - public Enumerator(IEnumerator>> enumerator) - { - this.enumerator = enumerator; - } + private class Enumerator(IEnumerator>> enumerator) : IEnumerator>> + { + private readonly IEnumerator>> enumerator = enumerator; - public bool MoveNext() - { - return enumerator.MoveNext(); - } + public bool MoveNext() => enumerator.MoveNext(); - public void Reset() - { - enumerator.Reset(); - } + public void Reset() => enumerator.Reset(); public KeyValuePair> Current => new KeyValuePair>( @@ -185,10 +141,7 @@ public void Reset() object IEnumerator.Current => ((IEnumerator)enumerator).Current; - public void Dispose() - { - enumerator.Dispose(); - } + public void Dispose() => enumerator.Dispose(); } } } diff --git a/Revo.Core/Commands/CommandBusMiddlewareFactory.cs b/Revo.Core/Commands/CommandBusMiddlewareFactory.cs index ec4c4227..8832c23a 100644 --- a/Revo.Core/Commands/CommandBusMiddlewareFactory.cs +++ b/Revo.Core/Commands/CommandBusMiddlewareFactory.cs @@ -3,20 +3,13 @@ namespace Revo.Core.Commands { - public class CommandBusMiddlewareFactory : ICommandBusMiddlewareFactory + public class CommandBusMiddlewareFactory(IServiceLocator serviceLocator) : ICommandBusMiddlewareFactory { - private readonly IServiceLocator serviceLocator; - - public CommandBusMiddlewareFactory(IServiceLocator serviceLocator) - { - this.serviceLocator = serviceLocator; - } + private readonly IServiceLocator serviceLocator = serviceLocator; public ICommandBusMiddleware[] CreateMiddlewares(ICommandBus commandBus) - where TCommand : class, ICommandBase - { - return serviceLocator.GetAll>() - .ToArray(); - } + where TCommand : class, ICommandBase => + serviceLocator.GetAll>() + .ToArray(); } } \ No newline at end of file diff --git a/Revo.Core/Commands/CommandBusPipeline.cs b/Revo.Core/Commands/CommandBusPipeline.cs index ec0e3cf7..ce460fa3 100644 --- a/Revo.Core/Commands/CommandBusPipeline.cs +++ b/Revo.Core/Commands/CommandBusPipeline.cs @@ -12,15 +12,10 @@ namespace Revo.Core.Commands /// and filters. /// /// - public class CommandBusPipeline : ICommandBusPipeline + public class CommandBusPipeline(ICommandBusMiddlewareFactory middlewareFactory) : ICommandBusPipeline { - private readonly ICommandBusMiddlewareFactory middlewareFactory; + private readonly ICommandBusMiddlewareFactory middlewareFactory = middlewareFactory; - public CommandBusPipeline(ICommandBusMiddlewareFactory middlewareFactory) - { - this.middlewareFactory = middlewareFactory; - } - public Task ProcessAsync(ICommandBase command, CommandBusMiddlewareDelegate executionHandler, ICommandBus commandBus, CommandExecutionOptions executionOptions, CancellationToken cancellationToken) { diff --git a/Revo.Core/Commands/CommandContext.cs b/Revo.Core/Commands/CommandContext.cs index 349ee685..431dee52 100644 --- a/Revo.Core/Commands/CommandContext.cs +++ b/Revo.Core/Commands/CommandContext.cs @@ -2,15 +2,9 @@ namespace Revo.Core.Commands { - public class CommandContext : ICommandContext + public class CommandContext(ICommandBase currentCommand, IUnitOfWork unitOfWork) : ICommandContext { - public CommandContext(ICommandBase currentCommand, IUnitOfWork unitOfWork) - { - CurrentCommand = currentCommand; - UnitOfWork = unitOfWork; - } - - public ICommandBase CurrentCommand { get; } - public IUnitOfWork UnitOfWork { get; } + public ICommandBase CurrentCommand { get; } = currentCommand; + public IUnitOfWork UnitOfWork { get; } = unitOfWork; } } diff --git a/Revo.Core/Commands/CommandContextStack.cs b/Revo.Core/Commands/CommandContextStack.cs index c41a1ebe..eda34906 100644 --- a/Revo.Core/Commands/CommandContextStack.cs +++ b/Revo.Core/Commands/CommandContextStack.cs @@ -11,14 +11,8 @@ public class CommandContextStack : ICommandContext, IUnitOfWorkAccessor public IUnitOfWork UnitOfWork => contexts.Count > 0 ? contexts.Peek().UnitOfWork : null; public ICommandContext PeekOrDefault => contexts.Count > 0 ? contexts.Peek() : null; - public void Push(ICommandContext context) - { - contexts.Push(context); - } + public void Push(ICommandContext context) => contexts.Push(context); - public ICommandContext Pop() - { - return contexts.Pop(); - } + public ICommandContext Pop() => contexts.Pop(); } } diff --git a/Revo.Core/Commands/CommandExecutionOptions.cs b/Revo.Core/Commands/CommandExecutionOptions.cs index d73affcd..3884260f 100644 --- a/Revo.Core/Commands/CommandExecutionOptions.cs +++ b/Revo.Core/Commands/CommandExecutionOptions.cs @@ -6,28 +6,20 @@ /// Note that some of the options may actually be used only if command is handled /// using a command handler with local command handler pipeline (e.g. they may have no /// significance if a remote command handler is registered for the command). - public class CommandExecutionOptions + public class CommandExecutionOptions(bool? autoCommitUnitOfWork = null, + CommandTenantContextOverride tenantContext = null) { public static readonly CommandExecutionOptions Default = new CommandExecutionOptions(null, null); - public CommandExecutionOptions(bool? autoCommitUnitOfWork = null, - CommandTenantContextOverride tenantContext = null) - { - AutoCommitUnitOfWork = autoCommitUnitOfWork; - TenantContext = tenantContext; - } - /// /// Should the command handle middleware automatically start new unit of work and commit it upon /// its successful completion? Default to null, which implicitly enables this behavior for ICommand /// commands (not IQuery queries). /// - public bool? AutoCommitUnitOfWork { get; } - public CommandTenantContextOverride TenantContext { get; } + public bool? AutoCommitUnitOfWork { get; } = autoCommitUnitOfWork; + public CommandTenantContextOverride TenantContext { get; } = tenantContext; - public CommandExecutionOptions WithTenantContext(CommandTenantContextOverride tenantContextOverride) - { - return new CommandExecutionOptions(AutoCommitUnitOfWork, tenantContextOverride); - } + public CommandExecutionOptions WithTenantContext(CommandTenantContextOverride tenantContextOverride) => + new CommandExecutionOptions(AutoCommitUnitOfWork, tenantContextOverride); } } \ No newline at end of file diff --git a/Revo.Core/Commands/CommandGateway.cs b/Revo.Core/Commands/CommandGateway.cs index 58067a0d..fed5ea49 100644 --- a/Revo.Core/Commands/CommandGateway.cs +++ b/Revo.Core/Commands/CommandGateway.cs @@ -4,14 +4,9 @@ namespace Revo.Core.Commands { - public class CommandGateway : ICommandGateway + public class CommandGateway(ICommandRouter commandRouter) : ICommandGateway { - private readonly ICommandRouter commandRouter; - - public CommandGateway(ICommandRouter commandRouter) - { - this.commandRouter = commandRouter; - } + private readonly ICommandRouter commandRouter = commandRouter; public Task SendAsync(ICommandBase command, CommandExecutionOptions executionOptions, CancellationToken cancellationToken = default(CancellationToken)) @@ -21,10 +16,8 @@ public Task SendAsync(ICommandBase command, CommandExecutionOptions executionOpt return commandBus.SendAsync(command, executionOptions, cancellationToken); } - public Task SendAsync(ICommand command, CancellationToken cancellationToken = default(CancellationToken)) - { - return SendAsync(command, CommandExecutionOptions.Default, cancellationToken); - } + public Task SendAsync(ICommand command, CancellationToken cancellationToken = default(CancellationToken)) => + SendAsync(command, CommandExecutionOptions.Default, cancellationToken); public Task SendAsync(ICommand command, CommandExecutionOptions executionOptions, CancellationToken cancellationToken = default(CancellationToken)) @@ -34,9 +27,7 @@ public Task SendAsync(ICommand command, CommandExecut return commandBus.SendAsync(command, executionOptions, cancellationToken); } - public Task SendAsync(ICommandBase command, CancellationToken cancellationToken = default(CancellationToken)) - { - return SendAsync(command, CommandExecutionOptions.Default, cancellationToken); - } + public Task SendAsync(ICommandBase command, CancellationToken cancellationToken = default(CancellationToken)) => + SendAsync(command, CommandExecutionOptions.Default, cancellationToken); } } \ No newline at end of file diff --git a/Revo.Core/Commands/CommandHandlerBindingExtensions.cs b/Revo.Core/Commands/CommandHandlerBindingExtensions.cs index d5193261..74189e0f 100644 --- a/Revo.Core/Commands/CommandHandlerBindingExtensions.cs +++ b/Revo.Core/Commands/CommandHandlerBindingExtensions.cs @@ -64,13 +64,11 @@ public static IBindingNamedWithOrOnSyntax BindCommandHandler( .InTaskScope(); } - public static Type[] GetCommandHandlerInterfaces(Type commandHandlerType) - { - return commandHandlerType.GetInterfaces() + public static Type[] GetCommandHandlerInterfaces(Type commandHandlerType) => + commandHandlerType.GetInterfaces() .Where(x => x.IsGenericType - && new[] {typeof(ICommandHandler<>), typeof(ICommandHandler<,>)} + && new[] { typeof(ICommandHandler<>), typeof(ICommandHandler<,>) } .Contains(x.GetGenericTypeDefinition())) .ToArray(); - } } } diff --git a/Revo.Core/Commands/CommandHandlerDiscovery.cs b/Revo.Core/Commands/CommandHandlerDiscovery.cs index 43c1c5e7..d110c720 100644 --- a/Revo.Core/Commands/CommandHandlerDiscovery.cs +++ b/Revo.Core/Commands/CommandHandlerDiscovery.cs @@ -9,26 +9,15 @@ namespace Revo.Core.Commands { - public class CommandHandlerDiscovery : IApplicationConfigurer + public class CommandHandlerDiscovery(ITypeExplorer typeExplorer, StandardKernel kernel, + ICommandRouter commandRouter, ILogger logger) : IApplicationConfigurer { - private readonly ITypeExplorer typeExplorer; - private readonly StandardKernel kernel; - private readonly ICommandRouter commandRouter; - private readonly ILogger logger; + private readonly ITypeExplorer typeExplorer = typeExplorer; + private readonly StandardKernel kernel = kernel; + private readonly ICommandRouter commandRouter = commandRouter; + private readonly ILogger logger = logger; - public CommandHandlerDiscovery(ITypeExplorer typeExplorer, StandardKernel kernel, - ICommandRouter commandRouter, ILogger logger) - { - this.typeExplorer = typeExplorer; - this.kernel = kernel; - this.commandRouter = commandRouter; - this.logger = logger; - } - - public void Configure() - { - DiscoverCommandHandlers(); - } + public void Configure() => DiscoverCommandHandlers(); private void DiscoverCommandHandlers() { diff --git a/Revo.Core/Commands/CommandRouter.cs b/Revo.Core/Commands/CommandRouter.cs index 787b2a60..055b99b9 100644 --- a/Revo.Core/Commands/CommandRouter.cs +++ b/Revo.Core/Commands/CommandRouter.cs @@ -4,17 +4,12 @@ namespace Revo.Core.Commands { - public class CommandRouter : ICommandRouter + public class CommandRouter(ILogger logger) : ICommandRouter { - private readonly ILogger logger; + private readonly ILogger logger = logger; private readonly Dictionary> routes = new Dictionary>(); - public CommandRouter(ILogger logger) - { - this.logger = logger; - } - public void AddRoute(Type commandType, Func commandBus) { if (!typeof(ICommandBase).IsAssignableFrom(commandType)) diff --git a/Revo.Core/Commands/CommandTenantContextOverride.cs b/Revo.Core/Commands/CommandTenantContextOverride.cs index 106c4769..db3f0c94 100644 --- a/Revo.Core/Commands/CommandTenantContextOverride.cs +++ b/Revo.Core/Commands/CommandTenantContextOverride.cs @@ -2,13 +2,8 @@ namespace Revo.Core.Commands { - public class CommandTenantContextOverride + public class CommandTenantContextOverride(ITenant tenant) { - public CommandTenantContextOverride(ITenant tenant) - { - Tenant = tenant; - } - - public ITenant Tenant { get; } + public ITenant Tenant { get; } = tenant; } } \ No newline at end of file diff --git a/Revo.Core/Commands/CommandTypeDiscovery.cs b/Revo.Core/Commands/CommandTypeDiscovery.cs index ed16d2a4..95ea448d 100644 --- a/Revo.Core/Commands/CommandTypeDiscovery.cs +++ b/Revo.Core/Commands/CommandTypeDiscovery.cs @@ -5,21 +5,14 @@ namespace Revo.Core.Commands { - public class CommandTypeDiscovery : ICommandTypeDiscovery + public class CommandTypeDiscovery(ITypeExplorer typeExplorer) : ICommandTypeDiscovery { - private readonly ITypeExplorer typeExplorer; + private readonly ITypeExplorer typeExplorer = typeExplorer; - public CommandTypeDiscovery(ITypeExplorer typeExplorer) - { - this.typeExplorer = typeExplorer; - } - - public IEnumerable DiscoverCommandTypes() - { - return typeExplorer + public IEnumerable DiscoverCommandTypes() => + typeExplorer .GetAllTypes() .Where(x => x.IsClass && !x.IsAbstract) .Where(x => typeof(ICommandBase).IsAssignableFrom(x)); - } } } \ No newline at end of file diff --git a/Revo.Core/Commands/CommandsConfiguration.cs b/Revo.Core/Commands/CommandsConfiguration.cs index 2cf47314..d7d36634 100644 --- a/Revo.Core/Commands/CommandsConfiguration.cs +++ b/Revo.Core/Commands/CommandsConfiguration.cs @@ -13,10 +13,8 @@ public class CommandsConfiguration public bool AutoDiscoverCommandHandlers { get; set; } = true; public IReadOnlyDictionary> CommandRoutes => commandBusRoutes; - public CommandsConfiguration AddCommandRoute(Func commandBusFunc) where TCommand : ICommandBase - { - return AddCommandRoute(commandBusFunc, typeof(TCommand)); - } + public CommandsConfiguration AddCommandRoute(Func commandBusFunc) where TCommand : ICommandBase => + AddCommandRoute(commandBusFunc, typeof(TCommand)); public CommandsConfiguration AddCommandRoute(Func commandBusFunc, params Type[] commandTypes) { diff --git a/Revo.Core/Commands/CommandsModule.cs b/Revo.Core/Commands/CommandsModule.cs index 023eb5b5..f3a5c77f 100644 --- a/Revo.Core/Commands/CommandsModule.cs +++ b/Revo.Core/Commands/CommandsModule.cs @@ -6,14 +6,9 @@ namespace Revo.Core.Commands { [AutoLoadModule(false)] - public class CommandsModule : NinjectModule + public class CommandsModule(CommandsConfiguration configurationSection) : NinjectModule { - private readonly CommandsConfiguration configurationSection; - - public CommandsModule(CommandsConfiguration configurationSection) - { - this.configurationSection = configurationSection; - } + private readonly CommandsConfiguration configurationSection = configurationSection; public override void Load() { diff --git a/Revo.Core/Commands/FilterCommandBusMiddleware.cs b/Revo.Core/Commands/FilterCommandBusMiddleware.cs index 38d75fa8..afa90196 100644 --- a/Revo.Core/Commands/FilterCommandBusMiddleware.cs +++ b/Revo.Core/Commands/FilterCommandBusMiddleware.cs @@ -4,21 +4,14 @@ namespace Revo.Core.Commands { - public class FilterCommandBusMiddleware : ICommandBusMiddleware + public class FilterCommandBusMiddleware(Func[]> preCommandFiltersFunc, + Func[]> postCommandFiltersFunc, + Func[]> exceptionCommandFiltersFunc) : ICommandBusMiddleware where T : class, ICommandBase { - private readonly Func[]> preCommandFiltersFunc; - private readonly Func[]> postCommandFiltersFunc; - private readonly Func[]> exceptionCommandFiltersFunc; - - public FilterCommandBusMiddleware(Func[]> preCommandFiltersFunc, - Func[]> postCommandFiltersFunc, - Func[]> exceptionCommandFiltersFunc) - { - this.preCommandFiltersFunc = preCommandFiltersFunc; - this.postCommandFiltersFunc = postCommandFiltersFunc; - this.exceptionCommandFiltersFunc = exceptionCommandFiltersFunc; - } + private readonly Func[]> preCommandFiltersFunc = preCommandFiltersFunc; + private readonly Func[]> postCommandFiltersFunc = postCommandFiltersFunc; + private readonly Func[]> exceptionCommandFiltersFunc = exceptionCommandFiltersFunc; public int Order { get; set; } = -1000; diff --git a/Revo.Core/Commands/Lambda/LambdaCommand.cs b/Revo.Core/Commands/Lambda/LambdaCommand.cs index ef7d18e2..4898d8a0 100644 --- a/Revo.Core/Commands/Lambda/LambdaCommand.cs +++ b/Revo.Core/Commands/Lambda/LambdaCommand.cs @@ -2,13 +2,8 @@ namespace Revo.Core.Commands.Lambda { - public class LambdaCommand : ICommand + public class LambdaCommand(Delegate @delegate) : ICommand { - public LambdaCommand(Delegate @delegate) - { - Delegate = @delegate; - } - - public Delegate Delegate { get; } + public Delegate Delegate { get; } = @delegate; } } \ No newline at end of file diff --git a/Revo.Core/Commands/Lambda/LambdaCommandBusExtensions.cs b/Revo.Core/Commands/Lambda/LambdaCommandBusExtensions.cs index ecd67d81..e61390c2 100644 --- a/Revo.Core/Commands/Lambda/LambdaCommandBusExtensions.cs +++ b/Revo.Core/Commands/Lambda/LambdaCommandBusExtensions.cs @@ -13,20 +13,16 @@ public static class LambdaCommandBusExtensions /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); /// @@ -34,10 +30,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func< /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); /// @@ -45,50 +39,40 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBus, F /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } - + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); + /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } - + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); + /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), cancellationToken); #endregion @@ -100,10 +84,8 @@ public static Task SendLambdaCommandAsync(this IComm /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -111,10 +93,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -122,10 +102,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func< /// public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -134,10 +112,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBus, F public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -146,10 +122,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus commandBu public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -158,10 +132,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus comma public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -170,10 +142,8 @@ public static Task SendLambdaCommandAsync(this ICommandBus c public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -182,10 +152,8 @@ public static Task SendLambdaCommandAsync(this ICommandB public static Task SendLambdaCommandAsync(this ICommandBus commandBus, Func command, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + commandBus.SendAsync(new LambdaCommand(command), executionOptions, cancellationToken); #endregion @@ -196,50 +164,40 @@ public static Task SendLambdaCommandAsync(this IComm /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. /// This includes scoped resolution of its parameter dependencies, committing the unit of work, etc. /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -247,10 +205,8 @@ public static async Task SendLambdaCommandAsync public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -258,10 +214,8 @@ public static async Task SendLambdaCommandAsync public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -269,10 +223,8 @@ public static async Task SendLambdaCommandAsync public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), cancellationToken); #endregion @@ -284,10 +236,8 @@ public static async Task SendLambdaCommandAsync public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -295,10 +245,8 @@ public static async Task SendLambdaCommandAsync(this ICommandB /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -306,10 +254,8 @@ public static async Task SendLambdaCommandAsync(this IComm /// public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -318,10 +264,8 @@ public static async Task SendLambdaCommandAsync(this I public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -330,10 +274,8 @@ public static async Task SendLambdaCommandAsync(th public static async Task SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -342,10 +284,8 @@ public static async Task SendLambdaCommandAsync SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -354,10 +294,8 @@ public static async Task SendLambdaCommandAsync SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); /// /// Executes specified lambda function like it was performed by any regular command handler. @@ -366,10 +304,8 @@ public static async Task SendLambdaCommandAsync SendLambdaCommandAsync(this ICommandBus commandBus, Func> query, CommandExecutionOptions executionOptions, - CancellationToken cancellationToken = default(CancellationToken)) - { - return (TResult) await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); - } + CancellationToken cancellationToken = default(CancellationToken)) => + (TResult)await commandBus.SendAsync(new LambdaResultCommand(query, typeof(TResult)), executionOptions, cancellationToken); #endregion } diff --git a/Revo.Core/Commands/Lambda/LambdaCommandHandler.cs b/Revo.Core/Commands/Lambda/LambdaCommandHandler.cs index cbdd1994..5c78fb63 100644 --- a/Revo.Core/Commands/Lambda/LambdaCommandHandler.cs +++ b/Revo.Core/Commands/Lambda/LambdaCommandHandler.cs @@ -5,16 +5,11 @@ namespace Revo.Core.Commands.Lambda { - public class LambdaCommandHandler : + public class LambdaCommandHandler(IServiceLocator serviceLocator) : ICommandHandler, ICommandHandler { - private readonly IServiceLocator serviceLocator; - - public LambdaCommandHandler(IServiceLocator serviceLocator) - { - this.serviceLocator = serviceLocator; - } + private readonly IServiceLocator serviceLocator = serviceLocator; public async Task HandleAsync(LambdaCommand command, CancellationToken cancellationToken) { diff --git a/Revo.Core/Commands/Lambda/LambdaResultCommand.cs b/Revo.Core/Commands/Lambda/LambdaResultCommand.cs index 4f25ad94..1ebfc006 100644 --- a/Revo.Core/Commands/Lambda/LambdaResultCommand.cs +++ b/Revo.Core/Commands/Lambda/LambdaResultCommand.cs @@ -2,15 +2,9 @@ namespace Revo.Core.Commands.Lambda { - public class LambdaResultCommand : ICommand + public class LambdaResultCommand(Delegate @delegate, Type resultType) : ICommand { - public LambdaResultCommand(Delegate @delegate, Type resultType) - { - Delegate = @delegate; - ResultType = resultType; - } - - public Delegate Delegate { get; } - public Type ResultType { get; } + public Delegate Delegate { get; } = @delegate; + public Type ResultType { get; } = resultType; } } \ No newline at end of file diff --git a/Revo.Core/Commands/LocalCommandBus.cs b/Revo.Core/Commands/LocalCommandBus.cs index 5c950901..96cf17e9 100644 --- a/Revo.Core/Commands/LocalCommandBus.cs +++ b/Revo.Core/Commands/LocalCommandBus.cs @@ -7,16 +7,10 @@ namespace Revo.Core.Commands { - public class LocalCommandBus : ILocalCommandBus + public class LocalCommandBus(IServiceLocator serviceLocator, ICommandBusPipeline pipeline) : ILocalCommandBus { - private readonly IServiceLocator serviceLocator; - private readonly ICommandBusPipeline pipeline; - - public LocalCommandBus(IServiceLocator serviceLocator, ICommandBusPipeline pipeline) - { - this.serviceLocator = serviceLocator; - this.pipeline = pipeline; - } + private readonly IServiceLocator serviceLocator = serviceLocator; + private readonly ICommandBusPipeline pipeline = pipeline; public async Task SendAsync(ICommand command, CommandExecutionOptions executionOptions, CancellationToken cancellationToken) @@ -26,10 +20,8 @@ public async Task SendAsync(ICommand command, Command return result; } - public Task SendAsync(ICommandBase command, CancellationToken cancellationToken) - { - return SendAsync(command, CommandExecutionOptions.Default, cancellationToken); - } + public Task SendAsync(ICommandBase command, CancellationToken cancellationToken) => + SendAsync(command, CommandExecutionOptions.Default, cancellationToken); public Task SendAsync(ICommandBase command, CommandExecutionOptions executionOptions, CancellationToken cancellationToken) @@ -49,10 +41,8 @@ public Task SendAsync(ICommandBase command, CommandExecutionOptions executionOpt return InvokeHandleAsync(handlerType, command, executionOptions, cancellationToken); } - public Task SendAsync(ICommand command, CancellationToken cancellationToken) - { - return SendAsync(command, CommandExecutionOptions.Default, cancellationToken); - } + public Task SendAsync(ICommand command, CancellationToken cancellationToken) => + SendAsync(command, CommandExecutionOptions.Default, cancellationToken); private async Task InvokeHandleAsync(Type handlerType, ICommandBase command, CommandExecutionOptions executionOptions, CancellationToken cancellationToken) @@ -76,7 +66,7 @@ private async Task InvokeHandleAsync(Type handlerType, IComman .GetRuntimeMethod(nameof(ICommandHandler.HandleAsync), new[] { commandType, typeof(CancellationToken) }); - var resultTask = (Task) handleMethod.Invoke(listener, new object[] {command, cancellationToken}); + var resultTask = (Task)handleMethod.Invoke(listener, new object[] { command, cancellationToken }); if (resultTask is Task resultObjectTask) { @@ -91,7 +81,8 @@ private async Task InvokeHandleAsync(Type handlerType, IComman object result = await pipeline.ProcessAsync(command, executionHandler, this, executionOptions, cancellationToken); - return (TResult) result; + + return (TResult)result; // TODO test with contravariant handlers } } diff --git a/Revo.Core/Commands/UnitOfWorkCommandBusMiddleware.cs b/Revo.Core/Commands/UnitOfWorkCommandBusMiddleware.cs index 66894da9..a93a0e98 100644 --- a/Revo.Core/Commands/UnitOfWorkCommandBusMiddleware.cs +++ b/Revo.Core/Commands/UnitOfWorkCommandBusMiddleware.cs @@ -6,17 +6,11 @@ namespace Revo.Core.Commands { - public class UnitOfWorkCommandBusMiddleware : ICommandBusMiddleware + public class UnitOfWorkCommandBusMiddleware(IUnitOfWorkFactory unitOfWorkFactory, + CommandContextStack commandContextStack) : ICommandBusMiddleware { - private readonly IUnitOfWorkFactory unitOfWorkFactory; - private readonly CommandContextStack commandContextStack; - - public UnitOfWorkCommandBusMiddleware(IUnitOfWorkFactory unitOfWorkFactory, - CommandContextStack commandContextStack) - { - this.unitOfWorkFactory = unitOfWorkFactory; - this.commandContextStack = commandContextStack; - } + private readonly IUnitOfWorkFactory unitOfWorkFactory = unitOfWorkFactory; + private readonly CommandContextStack commandContextStack = commandContextStack; public int Order { get; set; } = -2000; @@ -62,10 +56,8 @@ private async Task HandleNext(ICommandBase command, CommandBusMiddleware } } - private bool IsQuery(ICommandBase command) - { - return command.GetType().GetInterfaces().Any( + private bool IsQuery(ICommandBase command) => + command.GetType().GetInterfaces().Any( x => x.IsConstructedGenericType && x.GetGenericTypeDefinition() == typeof(IQuery<>)); - } } } diff --git a/Revo.Core/Configuration/KernelBootstrapper.cs b/Revo.Core/Configuration/KernelBootstrapper.cs index b3e21d6d..8a957a01 100644 --- a/Revo.Core/Configuration/KernelBootstrapper.cs +++ b/Revo.Core/Configuration/KernelBootstrapper.cs @@ -10,19 +10,12 @@ namespace Revo.Core.Configuration { - public class KernelBootstrapper + public class KernelBootstrapper(IKernel kernel, IRevoConfiguration configuration, ILogger logger) { - private readonly IKernel kernel; - private readonly IRevoConfiguration configuration; + private readonly IKernel kernel = kernel; + private readonly IRevoConfiguration configuration = configuration; private readonly HashSet loadedAssemblies = new HashSet(); - private readonly ILogger logger; - - public KernelBootstrapper(IKernel kernel, IRevoConfiguration configuration, ILogger logger) - { - this.kernel = kernel; - this.configuration = configuration; - this.logger = logger; - } + private readonly ILogger logger = logger; public void Configure() { @@ -74,14 +67,12 @@ public void RunAppStopListeners() initializer.NotifyStopping(); } - private INinjectModule[] GetNinjectModules(Assembly assembly) - { - return assembly.IsDynamic + private INinjectModule[] GetNinjectModules(Assembly assembly) => + assembly.IsDynamic ? new INinjectModule[0] : assembly.ExportedTypes.Where(IsLoadableModule) .Select(type => Activator.CreateInstance(type) as INinjectModule) .ToArray(); - } private bool IsModuleEnabled(Type type) { diff --git a/Revo.Core/Configuration/KernelConfigurationContext.cs b/Revo.Core/Configuration/KernelConfigurationContext.cs index 8a8b518d..56cb5156 100644 --- a/Revo.Core/Configuration/KernelConfigurationContext.cs +++ b/Revo.Core/Configuration/KernelConfigurationContext.cs @@ -4,16 +4,10 @@ namespace Revo.Core.Configuration { - public class KernelConfigurationContext : IKernelConfigurationContext + public class KernelConfigurationContext(IKernel kernel, KernelConfigurationSection kernelConfigurationSection) : IKernelConfigurationContext { - public KernelConfigurationContext(IKernel kernel, KernelConfigurationSection kernelConfigurationSection) - { - Kernel = kernel; - KernelConfigurationSection = kernelConfigurationSection; - } - - public IKernel Kernel { get; } - public KernelConfigurationSection KernelConfigurationSection { get; } + public IKernel Kernel { get; } = kernel; + public KernelConfigurationSection KernelConfigurationSection { get; } = kernelConfigurationSection; public void LoadModule() where TModule : class, INinjectModule, new() { diff --git a/Revo.Core/Configuration/KernelConfigurationExtensions.cs b/Revo.Core/Configuration/KernelConfigurationExtensions.cs index 7aaf188f..f31a4c02 100644 --- a/Revo.Core/Configuration/KernelConfigurationExtensions.cs +++ b/Revo.Core/Configuration/KernelConfigurationExtensions.cs @@ -31,9 +31,7 @@ public static IRevoConfiguration OverrideModuleLoading(this IRevoConfiguration c public static IRevoConfiguration OverrideModuleLoading(this IRevoConfiguration configuration, bool isLoaded, - Action advancedAction = null) where TModule : INinjectModule - { - return OverrideModuleLoading(configuration, typeof(TModule), isLoaded, advancedAction); - } + Action advancedAction = null) where TModule : INinjectModule => + OverrideModuleLoading(configuration, typeof(TModule), isLoaded, advancedAction); } } diff --git a/Revo.Core/Configuration/KernelConfigurationSection.cs b/Revo.Core/Configuration/KernelConfigurationSection.cs index ded20bdb..5a9fef8f 100644 --- a/Revo.Core/Configuration/KernelConfigurationSection.cs +++ b/Revo.Core/Configuration/KernelConfigurationSection.cs @@ -16,10 +16,7 @@ public KernelConfigurationSection() public IReadOnlyDictionary LoadedModuleOverrides => loadedModuleOverrides; public IReadOnlyCollection> KernelActions => kernelActions; - public void AddAction(Action kernelAction) - { - kernelActions.Add(kernelAction); - } + public void AddAction(Action kernelAction) => kernelActions.Add(kernelAction); public void OverrideModuleLoading(Type moduleType, bool isLoaded) { diff --git a/Revo.Core/Configuration/RevoConfiguration.cs b/Revo.Core/Configuration/RevoConfiguration.cs index 3f7978ba..af305d36 100644 --- a/Revo.Core/Configuration/RevoConfiguration.cs +++ b/Revo.Core/Configuration/RevoConfiguration.cs @@ -12,11 +12,12 @@ public class RevoConfiguration : IRevoConfiguration { if (sections.TryGetValue(typeof(T), out var section)) { - return (T) section; + return (T)section; } var newSection = new T(); sections[typeof(T)] = newSection; + return newSection; } } diff --git a/Revo.Core/Core/AutoLoadModuleAttribute.cs b/Revo.Core/Core/AutoLoadModuleAttribute.cs index 215a1f1e..ae88ea13 100644 --- a/Revo.Core/Core/AutoLoadModuleAttribute.cs +++ b/Revo.Core/Core/AutoLoadModuleAttribute.cs @@ -3,13 +3,8 @@ namespace Revo.Core.Core { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)] - public class AutoLoadModuleAttribute : Attribute + public class AutoLoadModuleAttribute(bool autoLoad) : Attribute { - public AutoLoadModuleAttribute(bool autoLoad) - { - AutoLoad = autoLoad; - } - - public bool AutoLoad { get; } + public bool AutoLoad { get; } = autoLoad; } } diff --git a/Revo.Core/Core/Clock.cs b/Revo.Core/Core/Clock.cs index db0cdf52..ff0d75a0 100644 --- a/Revo.Core/Core/Clock.cs +++ b/Revo.Core/Core/Clock.cs @@ -13,10 +13,7 @@ static Clock() SystemClock sc = new SystemClock(); currentFunc = () => sc; } - - public static void SetClock(Func clock) - { - currentFunc = clock; - } + + public static void SetClock(Func clock) => currentFunc = clock; } } diff --git a/Revo.Core/Core/CoreModule.cs b/Revo.Core/Core/CoreModule.cs index ac80c27f..fdbd71dd 100644 --- a/Revo.Core/Core/CoreModule.cs +++ b/Revo.Core/Core/CoreModule.cs @@ -13,14 +13,9 @@ namespace Revo.Core.Core { [AutoLoadModule(false)] - public class CoreModule : NinjectModule + public class CoreModule(CoreConfigurationSection coreConfigurationSection) : NinjectModule { - private readonly CoreConfigurationSection coreConfigurationSection; - - public CoreModule(CoreConfigurationSection coreConfigurationSection) - { - this.coreConfigurationSection = coreConfigurationSection; - } + private readonly CoreConfigurationSection coreConfigurationSection = coreConfigurationSection; public override void Load() { diff --git a/Revo.Core/Core/Environment.cs b/Revo.Core/Core/Environment.cs index 97479801..6aa1f5b6 100644 --- a/Revo.Core/Core/Environment.cs +++ b/Revo.Core/Core/Environment.cs @@ -2,23 +2,13 @@ namespace Revo.Core.Core { - public class Environment : IEnvironment + public class Environment(IEnvironmentProvider[] environmentProviders) : IEnvironment { - private readonly IEnvironmentProvider[] environmentProviders; + private readonly IEnvironmentProvider[] environmentProviders = environmentProviders; - public Environment(IEnvironmentProvider[] environmentProviders) - { - this.environmentProviders = environmentProviders; - } - - public bool IsDevelopment - { - get - { - return IsDevelopmentOverride + public bool IsDevelopment => + IsDevelopmentOverride ?? environmentProviders.Any(x => x.IsDevelopment == true); - } - } public bool? IsDevelopmentOverride { get; set; } } diff --git a/Revo.Core/Core/MemoryUtils.cs b/Revo.Core/Core/MemoryUtils.cs index ca677dc0..a8d17d0b 100644 --- a/Revo.Core/Core/MemoryUtils.cs +++ b/Revo.Core/Core/MemoryUtils.cs @@ -8,14 +8,9 @@ public static class MemoryUtils [DllImport("msvcrt.dll", CallingConvention = CallingConvention.Cdecl)] public static extern int memcmp(byte[] b1, byte[] b2, IntPtr count); - public static bool Memcpm(this byte[] b1, byte[] b2) - { - return Memcpm(b1, b2); - } + public static bool Memcpm(this byte[] b1, byte[] b2) => Memcpm(b1, b2); - public static bool Memcmp(byte[] b1, byte[] b2) - { - return b1.Length == b2.Length && memcmp(b1, b2, (IntPtr)b1.Length) == 0; - } + public static bool Memcmp(byte[] b1, byte[] b2) => + b1.Length == b2.Length && memcmp(b1, b2, (IntPtr)b1.Length) == 0; } } diff --git a/Revo.Core/Core/NinjectBindingExtensions.cs b/Revo.Core/Core/NinjectBindingExtensions.cs index b07f4fe0..42364de7 100644 --- a/Revo.Core/Core/NinjectBindingExtensions.cs +++ b/Revo.Core/Core/NinjectBindingExtensions.cs @@ -16,39 +16,27 @@ public static class NinjectBindingExtensions /// If there is no active request (e.g. run from a job), might fall back to using a different suitable scope /// (e.g. Task with a context, ). /// - public static IBindingNamedWithOrOnSyntax InRequestScope(this IBindingInSyntax syntax) - { - return Current.InRequestScope(syntax); - } + public static IBindingNamedWithOrOnSyntax InRequestScope(this IBindingInSyntax syntax) => + Current.InRequestScope(syntax); /// /// Registers a service in a scope of a closest parent Task that was started with /// a context via TaskFactoryExtensions.StartNewWithContext which is flown across async calls. /// If there is no parent Task with a context, might fall back to using a different suitable scope (e.g. request or thread). /// - public static IBindingNamedWithOrOnSyntax InTaskScope(this IBindingInSyntax syntax) - { - return Current.InTaskScope(syntax); - } + public static IBindingNamedWithOrOnSyntax InTaskScope(this IBindingInSyntax syntax) => + Current.InTaskScope(syntax); [Obsolete("Use InTaskScope or InRequestScope instead.")] - public static IBindingNamedWithOrOnSyntax InRequestOrJobScope(this IBindingInSyntax syntax) - { - return Current.InTaskScope(syntax); - } + public static IBindingNamedWithOrOnSyntax InRequestOrJobScope(this IBindingInSyntax syntax) => + Current.InTaskScope(syntax); private class TaskNinjectBindingExtension : INinjectBindingExtension { - public IBindingNamedWithOrOnSyntax InRequestScope(IBindingInSyntax syntax) - { - return InTaskScope(syntax); - } + public IBindingNamedWithOrOnSyntax InRequestScope(IBindingInSyntax syntax) => InTaskScope(syntax); - public IBindingNamedWithOrOnSyntax InTaskScope(IBindingInSyntax syntax) - { - return syntax - .InScope(context => TaskContext.Current ?? StandardScopeCallbacks.Thread(context)); - } + public IBindingNamedWithOrOnSyntax InTaskScope(IBindingInSyntax syntax) => + syntax.InScope(context => TaskContext.Current ?? StandardScopeCallbacks.Thread(context)); } } } diff --git a/Revo.Core/Core/NinjectServiceLocator.cs b/Revo.Core/Core/NinjectServiceLocator.cs index 9b0809cc..54d4ee3a 100644 --- a/Revo.Core/Core/NinjectServiceLocator.cs +++ b/Revo.Core/Core/NinjectServiceLocator.cs @@ -4,33 +4,16 @@ namespace Revo.Core.Core { - public class NinjectServiceLocator : IServiceLocator + public class NinjectServiceLocator(IKernel kernel) : IServiceLocator { - private readonly IKernel kernel; + private readonly IKernel kernel = kernel; - public NinjectServiceLocator(IKernel kernel) - { - this.kernel = kernel; - } + public object Get(Type serviceType) => kernel.Get(serviceType); - public object Get(Type serviceType) - { - return kernel.Get(serviceType); - } + public T Get() => kernel.Get(); - public T Get() - { - return kernel.Get(); - } + public IEnumerable GetAll(Type serviceType) => kernel.GetAll(serviceType); - public IEnumerable GetAll(Type serviceType) - { - return kernel.GetAll(serviceType); - } - - public IEnumerable GetAll() - { - return kernel.GetAll(); - } + public IEnumerable GetAll() => kernel.GetAll(); } } diff --git a/Revo.Core/Core/Sleep.cs b/Revo.Core/Core/Sleep.cs index 53f3898b..87299d5d 100644 --- a/Revo.Core/Core/Sleep.cs +++ b/Revo.Core/Core/Sleep.cs @@ -14,9 +14,6 @@ static Sleep() currentFunc = () => ts; } - public static void SetSleep(Func sleep) - { - currentFunc = sleep; - } + public static void SetSleep(Func sleep) => currentFunc = sleep; } } diff --git a/Revo.Core/Core/StringExtensions.cs b/Revo.Core/Core/StringExtensions.cs index c13ae47c..1d679d1e 100644 --- a/Revo.Core/Core/StringExtensions.cs +++ b/Revo.Core/Core/StringExtensions.cs @@ -6,25 +6,17 @@ namespace Revo.Core.Core { public static class StringExtensions { - public static int IndexOfI(this string haystack, string needle) - { - return haystack.IndexOf(needle, StringComparison.Ordinal); - } + public static int IndexOfI(this string haystack, string needle) => + haystack.IndexOf(needle, StringComparison.Ordinal); - public static int IndexOfI(this string haystack, string needle, int startIndex) - { - return haystack.IndexOf(needle, startIndex, StringComparison.Ordinal); - } + public static int IndexOfI(this string haystack, string needle, int startIndex) => + haystack.IndexOf(needle, startIndex, StringComparison.Ordinal); - public static int IndexOfI(this string haystack, string needle, int startIndex, int count) - { - return haystack.IndexOf(needle, startIndex, count, StringComparison.Ordinal); - } + public static int IndexOfI(this string haystack, string needle, int startIndex, int count) => + haystack.IndexOf(needle, startIndex, count, StringComparison.Ordinal); - public static int LastIndexOfI(this string haystack, string needle) - { - return haystack.LastIndexOf(needle, StringComparison.Ordinal); - } + public static int LastIndexOfI(this string haystack, string needle) => + haystack.LastIndexOf(needle, StringComparison.Ordinal); /// /// It the last character of given string is a backslash, result is the string without this backslash. Otherwise result is the input string. @@ -50,8 +42,8 @@ public static string RemoveDiacritics(this string s) { if (CharUnicodeInfo.GetUnicodeCategory(s[i]) != UnicodeCategory.NonSpacingMark) sb.Append(s[i]); - } - return sb.ToString(); + } + return sb.ToString(); } } } diff --git a/Revo.Core/Core/ThreadSleep.cs b/Revo.Core/Core/ThreadSleep.cs index 2aa7e245..182fd8cc 100644 --- a/Revo.Core/Core/ThreadSleep.cs +++ b/Revo.Core/Core/ThreadSleep.cs @@ -6,14 +6,8 @@ namespace Revo.Core.Core { public class ThreadSleep : ISleep { - public void Sleep(TimeSpan timeout) - { - Thread.Sleep(timeout); - } + public void Sleep(TimeSpan timeout) => Thread.Sleep(timeout); - public Task SleepAsync(TimeSpan timeout) - { - return Task.Delay(timeout); - } + public Task SleepAsync(TimeSpan timeout) => Task.Delay(timeout); } } diff --git a/Revo.Core/Events/EventBus.cs b/Revo.Core/Events/EventBus.cs index 20711a0d..b888d7f9 100644 --- a/Revo.Core/Events/EventBus.cs +++ b/Revo.Core/Events/EventBus.cs @@ -6,14 +6,9 @@ namespace Revo.Core.Events { - public class EventBus : IEventBus + public class EventBus(IServiceLocator serviceLocator) : IEventBus { - private readonly IServiceLocator serviceLocator; - - public EventBus(IServiceLocator serviceLocator) - { - this.serviceLocator = serviceLocator; - } + private readonly IServiceLocator serviceLocator = serviceLocator; public async Task PublishAsync(IEventMessage message, CancellationToken cancellationToken) { diff --git a/Revo.Core/Events/EventMessage.cs b/Revo.Core/Events/EventMessage.cs index c54529e9..0d1e9ed9 100644 --- a/Revo.Core/Events/EventMessage.cs +++ b/Revo.Core/Events/EventMessage.cs @@ -8,24 +8,19 @@ public static class EventMessage public static IEventMessage FromEvent(IEvent @event, IReadOnlyDictionary metadata) { Type messageType = typeof(EventMessage<>).MakeGenericType(@event.GetType()); + return (IEventMessage)messageType.GetConstructor(new[] {@event.GetType(), typeof(IReadOnlyDictionary)}) .Invoke(new object[] { @event, metadata }); } } - public class EventMessage : IEventMessage + public class EventMessage(TEvent @event, IReadOnlyDictionary metadata) : IEventMessage where TEvent : IEvent { - public EventMessage(TEvent @event, IReadOnlyDictionary metadata) - { - Event = @event; - Metadata = metadata; - } - IEvent IEventMessage.Event => Event; - public TEvent Event { get; } - public IReadOnlyDictionary Metadata { get; } + public TEvent Event { get; } = @event; + public IReadOnlyDictionary Metadata { get; } = metadata; } } diff --git a/Revo.Core/Events/EventMessageDraft.cs b/Revo.Core/Events/EventMessageDraft.cs index 34cc2b62..6c73571d 100644 --- a/Revo.Core/Events/EventMessageDraft.cs +++ b/Revo.Core/Events/EventMessageDraft.cs @@ -10,6 +10,7 @@ public static IEventMessageDraft FromEvent(TEvent @event) where TEvent : IEvent { Type messageType = typeof(EventMessageDraft<>).MakeGenericType(@event.GetType()); + return (IEventMessageDraft)messageType.GetConstructor(new[] {@event.GetType()}) .Invoke(new object[] { @event }); } diff --git a/Revo.Core/Events/EventMessageDraftExtensions.cs b/Revo.Core/Events/EventMessageDraftExtensions.cs index d313c438..b3270f5d 100644 --- a/Revo.Core/Events/EventMessageDraftExtensions.cs +++ b/Revo.Core/Events/EventMessageDraftExtensions.cs @@ -8,14 +8,13 @@ public static class EventMessageDraftExtensions public static IEventMessageDraft Clone(this IEventMessage message) { Type messageType = typeof(EventMessageDraft<>).MakeGenericType(message.Event.GetType()); + return (IEventMessageDraft)messageType.GetConstructor( new[] { message.Event.GetType(), typeof(IReadOnlyDictionary) }) .Invoke(new object[] { message.Event, message.Metadata }); } - public static IEventMessageDraft SetId(this IEventMessageDraft message, Guid id) - { - return message.SetMetadata(BasicEventMetadataNames.EventId, id.ToString()); - } + public static IEventMessageDraft SetId(this IEventMessageDraft message, Guid id) => + message.SetMetadata(BasicEventMetadataNames.EventId, id.ToString()); } } \ No newline at end of file diff --git a/Revo.Core/Events/FilteringMetadata.cs b/Revo.Core/Events/FilteringMetadata.cs index 4ffe6ce5..50334b4b 100644 --- a/Revo.Core/Events/FilteringMetadata.cs +++ b/Revo.Core/Events/FilteringMetadata.cs @@ -4,17 +4,11 @@ namespace Revo.Core.Events { - public class FilteringMetadata : IReadOnlyDictionary + public class FilteringMetadata(IReadOnlyDictionary metadata, + params string[] removedKeys) : IReadOnlyDictionary { - private readonly IReadOnlyDictionary metadata; - private readonly string[] removedKeys; - - public FilteringMetadata(IReadOnlyDictionary metadata, - params string[] removedKeys) - { - this.metadata = metadata; - this.removedKeys = removedKeys; - } + private readonly IReadOnlyDictionary metadata = metadata; + private readonly string[] removedKeys = removedKeys; public IEnumerator> GetEnumerator() { @@ -27,18 +21,12 @@ public IEnumerator> GetEnumerator() } } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public int Count => metadata.Count - removedKeys.Length; - public bool ContainsKey(string key) - { - return !removedKeys.Contains(key) - && metadata.ContainsKey(key); - } + public bool ContainsKey(string key) => + !removedKeys.Contains(key) && metadata.ContainsKey(key); public bool TryGetValue(string key, out string value) { diff --git a/Revo.Core/Events/JsonMetadata.cs b/Revo.Core/Events/JsonMetadata.cs index 5fdf1bf8..6c6331ac 100644 --- a/Revo.Core/Events/JsonMetadata.cs +++ b/Revo.Core/Events/JsonMetadata.cs @@ -6,14 +6,9 @@ namespace Revo.Core.Events { - public class JsonMetadata : IReadOnlyDictionary + public class JsonMetadata(JObject jsonMetadata) : IReadOnlyDictionary { - private readonly JObject jsonMetadata; - - public JsonMetadata(JObject jsonMetadata) - { - this.jsonMetadata = jsonMetadata; - } + private readonly JObject jsonMetadata = jsonMetadata; public IEnumerator> GetEnumerator() { @@ -23,16 +18,10 @@ public IEnumerator> GetEnumerator() } } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public int Count => jsonMetadata.Count; - public bool ContainsKey(string key) - { - return jsonMetadata[key] != null; - } + public bool ContainsKey(string key) => jsonMetadata[key] != null; public bool TryGetValue(string key, out string value) { @@ -46,7 +35,8 @@ public bool TryGetValue(string key, out string value) return false; } - public string this[string key] => jsonMetadata[key]?.ToString() ?? throw new ArgumentException($"JSON metadata key not found: {key}"); + public string this[string key] => + jsonMetadata[key]?.ToString() ?? throw new ArgumentException($"JSON metadata key not found: {key}"); public IEnumerable Keys => jsonMetadata.Properties().Select(x => x.Name); public IEnumerable Values => jsonMetadata.PropertyValues().Select(x => x.ToString()); diff --git a/Revo.Core/Events/LayeredMetadata.cs b/Revo.Core/Events/LayeredMetadata.cs index 6021f504..ad12a23b 100644 --- a/Revo.Core/Events/LayeredMetadata.cs +++ b/Revo.Core/Events/LayeredMetadata.cs @@ -5,16 +5,10 @@ namespace Revo.Core.Events { - public class LayeredMetadata : IReadOnlyDictionary + public class LayeredMetadata(IReadOnlyDictionary values, IReadOnlyDictionary> getters) : IReadOnlyDictionary { - private readonly IReadOnlyDictionary values; - private readonly IReadOnlyDictionary> getters; - - public LayeredMetadata(IReadOnlyDictionary values, IReadOnlyDictionary> getters) - { - this.values = values; - this.getters = getters; - } + private readonly IReadOnlyDictionary values = values; + private readonly IReadOnlyDictionary> getters = getters; public IEnumerator> GetEnumerator() { @@ -32,10 +26,7 @@ public IEnumerator> GetEnumerator() } } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); public int Count => values.Keys.Concat(getters.Keys).Distinct().Count(); @@ -78,11 +69,8 @@ public IEnumerable Values } } } - - public bool ContainsKey(string key) - { - return getters.ContainsKey(key) || values.ContainsKey(key); - } + + public bool ContainsKey(string key) => getters.ContainsKey(key) || values.ContainsKey(key); public bool TryGetValue(string key, out string value) { diff --git a/Revo.Core/Events/PublishEventBuffer.cs b/Revo.Core/Events/PublishEventBuffer.cs index 78d23740..34457a17 100644 --- a/Revo.Core/Events/PublishEventBuffer.cs +++ b/Revo.Core/Events/PublishEventBuffer.cs @@ -4,16 +4,11 @@ namespace Revo.Core.Events { - public class PublishEventBuffer : IPublishEventBuffer + public class PublishEventBuffer(IEventBus eventBus) : IPublishEventBuffer { - private readonly IEventBus eventBus; + private readonly IEventBus eventBus = eventBus; private readonly List messages = new List(); - public PublishEventBuffer(IEventBus eventBus) - { - this.eventBus = eventBus; - } - public IReadOnlyCollection Events => messages; public async Task FlushAsync(CancellationToken cancellationToken) @@ -26,9 +21,6 @@ public async Task FlushAsync(CancellationToken cancellationToken) messages.Clear(); } - public void PushEvent(IEventMessage message) - { - messages.Add(message); - } + public void PushEvent(IEventMessage message) => messages.Add(message); } } diff --git a/Revo.Core/Events/PublishEventBufferFactory.cs b/Revo.Core/Events/PublishEventBufferFactory.cs index 2c296cf5..34c4c52b 100644 --- a/Revo.Core/Events/PublishEventBufferFactory.cs +++ b/Revo.Core/Events/PublishEventBufferFactory.cs @@ -1,17 +1,9 @@ namespace Revo.Core.Events { - public class PublishEventBufferFactory : IPublishEventBufferFactory + public class PublishEventBufferFactory(IEventBus eventBus) : IPublishEventBufferFactory { - private readonly IEventBus eventBus; + private readonly IEventBus eventBus = eventBus; - public PublishEventBufferFactory(IEventBus eventBus) - { - this.eventBus = eventBus; - } - - public IPublishEventBuffer CreateEventBuffer() - { - return new PublishEventBuffer(eventBus); - } + public IPublishEventBuffer CreateEventBuffer() => new PublishEventBuffer(eventBus); } } diff --git a/Revo.Core/Lifecycle/ApplicationConfigurerInitializer.cs b/Revo.Core/Lifecycle/ApplicationConfigurerInitializer.cs index 8064f502..849bd553 100644 --- a/Revo.Core/Lifecycle/ApplicationConfigurerInitializer.cs +++ b/Revo.Core/Lifecycle/ApplicationConfigurerInitializer.cs @@ -2,14 +2,9 @@ namespace Revo.Core.Lifecycle { - public class ApplicationConfigurerInitializer : IApplicationConfigurerInitializer + public class ApplicationConfigurerInitializer(Func configurersFunc) : IApplicationConfigurerInitializer { - private readonly Func configurersFunc; - - public ApplicationConfigurerInitializer(Func configurersFunc) - { - this.configurersFunc = configurersFunc; - } + private readonly Func configurersFunc = configurersFunc; public void ConfigureAll() { diff --git a/Revo.Core/Lifecycle/ApplicationLifecycleNotifier.cs b/Revo.Core/Lifecycle/ApplicationLifecycleNotifier.cs index fabc4fab..77c28d00 100644 --- a/Revo.Core/Lifecycle/ApplicationLifecycleNotifier.cs +++ b/Revo.Core/Lifecycle/ApplicationLifecycleNotifier.cs @@ -2,20 +2,13 @@ namespace Revo.Core.Lifecycle { - public class ApplicationLifecycleNotifier : IApplicationLifecycleNotifier + public class ApplicationLifecycleNotifier(Func startingListenersFunc, + Func startedListenersFunc, + Func stoppingListenersFunc) : IApplicationLifecycleNotifier { - private readonly Func startingListenersFunc; - private readonly Func startedListenersFunc; - private readonly Func stoppingListenersFunc; - - public ApplicationLifecycleNotifier(Func startingListenersFunc, - Func startedListenersFunc, - Func stoppingListenersFunc) - { - this.startingListenersFunc = startingListenersFunc; - this.startedListenersFunc = startedListenersFunc; - this.stoppingListenersFunc = stoppingListenersFunc; - } + private readonly Func startingListenersFunc = startingListenersFunc; + private readonly Func startedListenersFunc = startedListenersFunc; + private readonly Func stoppingListenersFunc = stoppingListenersFunc; public void NotifyStarting() { diff --git a/Revo.Core/Logging/GenericLoggerFactory.cs b/Revo.Core/Logging/GenericLoggerFactory.cs index 9a306d13..843032e6 100644 --- a/Revo.Core/Logging/GenericLoggerFactory.cs +++ b/Revo.Core/Logging/GenericLoggerFactory.cs @@ -13,6 +13,7 @@ public static ILogger CreateGenericLogger(this ILoggerFactory loggerFactory, Typ { var loggerConstructorInfo = typeof(Logger<>).MakeGenericType(type) .GetConstructor(BindingFlags.Public | BindingFlags.Instance, new[] { typeof(ILoggerFactory) }); + return (ILogger)loggerConstructorInfo.Invoke(new[] { loggerFactory }); } } \ No newline at end of file diff --git a/Revo.Core/Security/ClaimBased/NullClaimsPrincipalUserResolver.cs b/Revo.Core/Security/ClaimBased/NullClaimsPrincipalUserResolver.cs index 70e11398..d7514220 100644 --- a/Revo.Core/Security/ClaimBased/NullClaimsPrincipalUserResolver.cs +++ b/Revo.Core/Security/ClaimBased/NullClaimsPrincipalUserResolver.cs @@ -6,14 +6,9 @@ namespace Revo.Core.Security.ClaimBased { public class NullClaimsPrincipalUserResolver : IClaimsPrincipalUserResolver { - public Guid? TryGetUserId(ClaimsPrincipal principal) - { - return null; - } + public Guid? TryGetUserId(ClaimsPrincipal principal) => null; - public Task GetUserAsync(ClaimsPrincipal principal) - { + public Task GetUserAsync(ClaimsPrincipal principal) => throw new NotImplementedException("Cannot determine authentication using the default NullUserResolver, please use a real implementation."); - } } } diff --git a/Revo.Core/Security/NullUserPermissionResolver.cs b/Revo.Core/Security/NullUserPermissionResolver.cs index 19c6efb3..6602b0bf 100644 --- a/Revo.Core/Security/NullUserPermissionResolver.cs +++ b/Revo.Core/Security/NullUserPermissionResolver.cs @@ -5,9 +5,7 @@ namespace Revo.Core.Security { public class NullUserPermissionResolver : IUserPermissionResolver { - public Task> GetUserPermissionsAsync(IUser user) - { - return Task.FromResult((IReadOnlyCollection) new List()); - } + public Task> GetUserPermissionsAsync(IUser user) => + Task.FromResult((IReadOnlyCollection)new List()); } } diff --git a/Revo.Core/Security/PermissionType.cs b/Revo.Core/Security/PermissionType.cs index 2b85b9eb..66c3b7ab 100644 --- a/Revo.Core/Security/PermissionType.cs +++ b/Revo.Core/Security/PermissionType.cs @@ -4,16 +4,10 @@ namespace Revo.Core.Security { - public class PermissionType : ValueObject + public class PermissionType(Guid id, string name) : ValueObject { - public PermissionType(Guid id, string name) - { - Id = id; - Name = name; - } - - public Guid Id { get; } - public string Name { get; } + public Guid Id { get; } = id; + public string Name { get; } = name; protected override IEnumerable<(string Name, object Value)> GetValueComponents() { diff --git a/Revo.Core/Security/PermissionTypeCatalogAttribute.cs b/Revo.Core/Security/PermissionTypeCatalogAttribute.cs index d11b7d26..3a6249e9 100644 --- a/Revo.Core/Security/PermissionTypeCatalogAttribute.cs +++ b/Revo.Core/Security/PermissionTypeCatalogAttribute.cs @@ -2,13 +2,8 @@ namespace Revo.Core.Security { - public class PermissionTypeCatalogAttribute : Attribute + public class PermissionTypeCatalogAttribute(string catalogName) : Attribute { - public PermissionTypeCatalogAttribute(string catalogName) - { - CatalogName = catalogName; - } - - public string CatalogName { get; } + public string CatalogName { get; } = catalogName; } } diff --git a/Revo.Core/Security/PermissionTypeIndexer.cs b/Revo.Core/Security/PermissionTypeIndexer.cs index f1f1577b..1ee24438 100644 --- a/Revo.Core/Security/PermissionTypeIndexer.cs +++ b/Revo.Core/Security/PermissionTypeIndexer.cs @@ -6,23 +6,14 @@ namespace Revo.Core.Security { - public class PermissionTypeIndexer : IApplicationStartedListener, IPermissionTypeIndexer + public class PermissionTypeIndexer(ITypeExplorer typeExplorer, + IPermissionTypeRegistry permissionTypeRegistry) : IApplicationStartedListener, IPermissionTypeIndexer { - private readonly IPermissionTypeRegistry permissionTypeRegistry; - private readonly ITypeExplorer typeExplorer; + private readonly IPermissionTypeRegistry permissionTypeRegistry = permissionTypeRegistry; + private readonly ITypeExplorer typeExplorer = typeExplorer; private readonly HashSet registeredCatalogTypes = new HashSet(); - public PermissionTypeIndexer(ITypeExplorer typeExplorer, - IPermissionTypeRegistry permissionTypeRegistry) - { - this.typeExplorer = typeExplorer; - this.permissionTypeRegistry = permissionTypeRegistry; - } - - public void OnApplicationStarted() - { - Index(); - } + public void OnApplicationStarted() => Index(); public void EnsureIndexed() { diff --git a/Revo.Core/Security/UserPermissionAuthorizer.cs b/Revo.Core/Security/UserPermissionAuthorizer.cs index 61ccc34b..00e5a1bf 100644 --- a/Revo.Core/Security/UserPermissionAuthorizer.cs +++ b/Revo.Core/Security/UserPermissionAuthorizer.cs @@ -4,24 +4,18 @@ namespace Revo.Core.Security { - public class UserPermissionAuthorizer : IUserPermissionAuthorizer + public class UserPermissionAuthorizer(IUserContext userContext, + IPermissionAuthorizationMatcher permissionAuthorizationMatcher, + IUserPermissionResolver userPermissionResolver) : IUserPermissionAuthorizer { - private readonly IUserContext userContext; - private readonly IPermissionAuthorizationMatcher permissionAuthorizationMatcher; - private readonly IUserPermissionResolver userPermissionResolver; - - public UserPermissionAuthorizer(IUserContext userContext, - IPermissionAuthorizationMatcher permissionAuthorizationMatcher, - IUserPermissionResolver userPermissionResolver) - { - this.userContext = userContext; - this.permissionAuthorizationMatcher = permissionAuthorizationMatcher; - this.userPermissionResolver = userPermissionResolver; - } + private readonly IUserContext userContext = userContext; + private readonly IPermissionAuthorizationMatcher permissionAuthorizationMatcher = permissionAuthorizationMatcher; + private readonly IUserPermissionResolver userPermissionResolver = userPermissionResolver; public async Task CheckAuthorizationAsync(IUser user, Guid permissionId, string resourceId = null, string contextId = null) { var userPermissions = await userPermissionResolver.GetUserPermissionsAsync(user); + return permissionAuthorizationMatcher.CheckAuthorization(userPermissions, new[] { GetPermission(permissionId, resourceId, contextId) }); } @@ -29,13 +23,14 @@ public async Task CheckAuthorizationAsync(IUser user, Guid permissionId, s public async Task CheckAuthorizationAsync(IUser user, IEnumerable permissions) { var userPermissions = await userPermissionResolver.GetUserPermissionsAsync(user); - return permissionAuthorizationMatcher.CheckAuthorization(userPermissions, - permissions); + + return permissionAuthorizationMatcher.CheckAuthorization(userPermissions, permissions); } public async Task CheckCurrentUserAuthorizationAsync(Guid permissionId, string resourceId = null, string contextId = null) { var userPermissions = await userContext.GetPermissionsAsync(); + return permissionAuthorizationMatcher.CheckAuthorization(userPermissions, new[] { GetPermission(permissionId, resourceId, contextId) }); } @@ -43,13 +38,12 @@ public async Task CheckCurrentUserAuthorizationAsync(Guid permissionId, st public async Task CheckCurrentUserAuthorizationAsync(IEnumerable permissions) { var userPermissions = await userContext.GetPermissionsAsync(); + return permissionAuthorizationMatcher.CheckAuthorization(userPermissions, permissions); } - private Permission GetPermission(Guid permissionId, string resourceId, string contextId) - { - return new Permission(permissionId, resourceId, contextId); - } + private Permission GetPermission(Guid permissionId, string resourceId, string contextId) => + new Permission(permissionId, resourceId, contextId); } } diff --git a/Revo.Core/Transactions/CoordinatedTransaction.cs b/Revo.Core/Transactions/CoordinatedTransaction.cs index f000d7a3..bbb05ffe 100644 --- a/Revo.Core/Transactions/CoordinatedTransaction.cs +++ b/Revo.Core/Transactions/CoordinatedTransaction.cs @@ -9,17 +9,11 @@ public class CoordinatedTransaction : ITransactionCoordinator, ITransaction private readonly ITransaction innerTransaction; private int transactionCounter = 0; - public CoordinatedTransaction(ITransaction innerTransaction) - { - this.innerTransaction = innerTransaction; - } + public CoordinatedTransaction(ITransaction innerTransaction) => this.innerTransaction = innerTransaction; protected List Participants { get; set; } = new List(); - public void AddTransactionParticipant(ITransactionParticipant participant) - { - Participants.Add(participant); - } + public void AddTransactionParticipant(ITransactionParticipant participant) => Participants.Add(participant); public async Task CommitAsync() { diff --git a/Revo.Core/Transactions/UnitOfWork.cs b/Revo.Core/Transactions/UnitOfWork.cs index e3374525..9ae0f2f4 100644 --- a/Revo.Core/Transactions/UnitOfWork.cs +++ b/Revo.Core/Transactions/UnitOfWork.cs @@ -6,20 +6,13 @@ namespace Revo.Core.Transactions { - public class UnitOfWork : IUnitOfWork + public class UnitOfWork(Lazy unitOfWorkListeners, + IPublishEventBuffer publishEventBuffer) : IUnitOfWork { private readonly List innerTransactions = new List(); - private readonly Lazy unitOfWorkListeners; - - public UnitOfWork(Lazy unitOfWorkListeners, - IPublishEventBuffer publishEventBuffer) - { - this.unitOfWorkListeners = unitOfWorkListeners; + private readonly Lazy unitOfWorkListeners = unitOfWorkListeners; - EventBuffer = publishEventBuffer; - } - - public IPublishEventBuffer EventBuffer { get; } + public IPublishEventBuffer EventBuffer { get; } = publishEventBuffer; public bool IsWorkBegun { get; private set; } public void Begin() diff --git a/Revo.Core/Transactions/UnitOfWorkFactory.cs b/Revo.Core/Transactions/UnitOfWorkFactory.cs index 1a869f15..ba7e4125 100644 --- a/Revo.Core/Transactions/UnitOfWorkFactory.cs +++ b/Revo.Core/Transactions/UnitOfWorkFactory.cs @@ -3,20 +3,15 @@ namespace Revo.Core.Transactions { - public class UnitOfWorkFactory : IUnitOfWorkFactory + public class UnitOfWorkFactory(Func> unitOfWorkListenersLazyFunc, IPublishEventBufferFactory publishEventBufferFactory) : IUnitOfWorkFactory { - private readonly Func> unitOfWorkListenersLazyFunc; - private readonly IPublishEventBufferFactory publishEventBufferFactory; - - public UnitOfWorkFactory(Func> unitOfWorkListenersLazyFunc, IPublishEventBufferFactory publishEventBufferFactory) - { - this.unitOfWorkListenersLazyFunc = unitOfWorkListenersLazyFunc; - this.publishEventBufferFactory = publishEventBufferFactory; - } + private readonly Func> unitOfWorkListenersLazyFunc = unitOfWorkListenersLazyFunc; + private readonly IPublishEventBufferFactory publishEventBufferFactory = publishEventBufferFactory; public IUnitOfWork CreateUnitOfWork() { var tx = new UnitOfWork(unitOfWorkListenersLazyFunc(), publishEventBufferFactory.CreateEventBuffer()); + return tx; } } diff --git a/Revo.Core/Types/TypeExplorer.cs b/Revo.Core/Types/TypeExplorer.cs index af622a98..48f6e8d7 100644 --- a/Revo.Core/Types/TypeExplorer.cs +++ b/Revo.Core/Types/TypeExplorer.cs @@ -6,23 +6,16 @@ namespace Revo.Core.Types { - public class TypeExplorer : ITypeExplorer + public class TypeExplorer(ILogger logger) : ITypeExplorer { - private readonly ILogger logger; + private readonly ILogger logger = logger; - public TypeExplorer(ILogger logger) - { - this.logger = logger; - } - - public virtual IEnumerable GetAllReferencedAssemblies() - { - return AppDomain.CurrentDomain.GetAssemblies(); - } + public virtual IEnumerable GetAllReferencedAssemblies() => AppDomain.CurrentDomain.GetAssemblies(); public IEnumerable GetAllTypes() { var assemblies = GetAllReferencedAssemblies(); + return assemblies.SelectMany(x => { try @@ -44,6 +37,7 @@ public Type FindType(string typeName) if (type.FullName == typeName) return type; } + return null; } } diff --git a/Revo.Core/Types/TypeIndexer.cs b/Revo.Core/Types/TypeIndexer.cs index bf2b3c92..876240b2 100644 --- a/Revo.Core/Types/TypeIndexer.cs +++ b/Revo.Core/Types/TypeIndexer.cs @@ -4,14 +4,9 @@ namespace Revo.Core.Types { - public class TypeIndexer : ITypeIndexer + public class TypeIndexer(ITypeExplorer typeExplorer) : ITypeIndexer { - private readonly ITypeExplorer typeExplorer; - - public TypeIndexer(ITypeExplorer typeExplorer) - { - this.typeExplorer = typeExplorer; - } + private readonly ITypeExplorer typeExplorer = typeExplorer; public IEnumerable IndexTypes() { diff --git a/Revo.Core/Types/TypeVersionAttribute.cs b/Revo.Core/Types/TypeVersionAttribute.cs index a95841a4..49e9bbd4 100644 --- a/Revo.Core/Types/TypeVersionAttribute.cs +++ b/Revo.Core/Types/TypeVersionAttribute.cs @@ -10,10 +10,7 @@ public TypeVersionAttribute(string name, int version) Version = version; } - public TypeVersionAttribute(int version) - { - Version = version; - } + public TypeVersionAttribute(int version) => Version = version; public string Name { get; } public int Version { get; } diff --git a/Revo.Core/Types/VersionedType.cs b/Revo.Core/Types/VersionedType.cs index f46c5cf2..de627686 100644 --- a/Revo.Core/Types/VersionedType.cs +++ b/Revo.Core/Types/VersionedType.cs @@ -2,32 +2,18 @@ namespace Revo.Core.Types { - public class VersionedType + public class VersionedType(VersionedTypeId id, Type clrType) { - public VersionedType(VersionedTypeId id, Type clrType) - { - Id = id; - ClrType = clrType; - } + public VersionedTypeId Id { get; } = id; + public Type ClrType { get; } = clrType; - public VersionedTypeId Id { get; } - public Type ClrType { get; } + public override string ToString() => $"VersionedType {{ Id = {Id}, ClrType = {ClrType.FullName} }}"; - public override string ToString() - { - return $"VersionedType {{ Id = {Id}, ClrType = {ClrType.FullName} }}"; - } - - public override bool Equals(object obj) - { - return obj is VersionedType other + public override bool Equals(object obj) => + obj is VersionedType other && other.Id.Equals(Id) && other.ClrType == ClrType; - } - public override int GetHashCode() - { - return (Id.GetHashCode() * 397) ^ ClrType.GetHashCode(); - } + public override int GetHashCode() => (Id.GetHashCode() * 397) ^ ClrType.GetHashCode(); } } diff --git a/Revo.Core/Types/VersionedTypeId.cs b/Revo.Core/Types/VersionedTypeId.cs index 734d2ae7..5b57f244 100644 --- a/Revo.Core/Types/VersionedTypeId.cs +++ b/Revo.Core/Types/VersionedTypeId.cs @@ -3,17 +3,11 @@ namespace Revo.Core.Types { - public class VersionedTypeId : ValueObject + public class VersionedTypeId(string name, int version) : ValueObject { - public VersionedTypeId(string name, int version) - { - Name = name; - Version = version; - } + public string Name { get; } = name; + public int Version { get; } = version; - public string Name { get; } - public int Version { get; } - protected override IEnumerable<(string Name, object Value)> GetValueComponents() { yield return (nameof(Name), Name); diff --git a/Revo.Core/Types/VersionedTypeRegistry.cs b/Revo.Core/Types/VersionedTypeRegistry.cs index c414b1df..ac1440ef 100644 --- a/Revo.Core/Types/VersionedTypeRegistry.cs +++ b/Revo.Core/Types/VersionedTypeRegistry.cs @@ -6,21 +6,13 @@ namespace Revo.Core.Types { - public class VersionedTypeRegistry : IVersionedTypeRegistry + public class VersionedTypeRegistry(ITypeIndexer typeIndexer) : IVersionedTypeRegistry { - private readonly ITypeIndexer typeIndexer; + private readonly ITypeIndexer typeIndexer = typeIndexer; private readonly ConcurrentDictionary registries = new ConcurrentDictionary(); - public VersionedTypeRegistry(ITypeIndexer typeIndexer) - { - this.typeIndexer = typeIndexer; - } - - public IEnumerable GetAllTypes() - { - return GetSubtypeRegistry().Ids.Values; - } + public IEnumerable GetAllTypes() => GetSubtypeRegistry().Ids.Values; public VersionedType GetTypeInfo(VersionedTypeId id) { @@ -55,37 +47,26 @@ public IReadOnlyCollection GetTypeVersions(string name) return typeVersions; } - public void ClearCache() - { - registries.TryRemove(typeof(TBase), out var _); - } + public void ClearCache() => registries.TryRemove(typeof(TBase), out var _); - private SubtypeRegistry GetSubtypeRegistry() - { - return registries.GetOrAdd(typeof(TBase), type => + private SubtypeRegistry GetSubtypeRegistry() => + registries.GetOrAdd(typeof(TBase), type => { var ids = typeIndexer.IndexTypes().ToImmutableDictionary(x => x.Id, x => x); var types = ids.Values.ToImmutableDictionary(x => x.ClrType, x => x); var typeVersions = ids.Values.GroupBy(x => x.Id.Name) .ToImmutableDictionary(x => x.Key, x => x.ToImmutableList()); + return new SubtypeRegistry(ids, types, typeVersions); }); - } - private class SubtypeRegistry + private class SubtypeRegistry(ImmutableDictionary ids, + ImmutableDictionary types, + ImmutableDictionary> typeVersions) { - public SubtypeRegistry(ImmutableDictionary ids, - ImmutableDictionary types, - ImmutableDictionary> typeVersions) - { - Ids = ids; - Types = types; - TypeVersions = typeVersions; - } - - public ImmutableDictionary Ids { get; } - public ImmutableDictionary Types { get; } - public ImmutableDictionary> TypeVersions { get; } + public ImmutableDictionary Ids { get; } = ids; + public ImmutableDictionary Types { get; } = types; + public ImmutableDictionary> TypeVersions { get; } = typeVersions; } } } diff --git a/Revo.Core/ValueObjects/CollectionAsValueExtensions.cs b/Revo.Core/ValueObjects/CollectionAsValueExtensions.cs index cdd8ae40..0bcd315c 100644 --- a/Revo.Core/ValueObjects/CollectionAsValueExtensions.cs +++ b/Revo.Core/ValueObjects/CollectionAsValueExtensions.cs @@ -9,36 +9,25 @@ public static class CollectionAsValueExtensions /// Wraps an immutable list for use in ValueObject<T>.GetValueComponents /// with a decorator that correctly implements value object semantics for lists. /// - public static IEnumerable AsValueObject(this IImmutableList list) - { - return new ListAsValue(list); - } + public static IEnumerable AsValueObject(this IImmutableList list) => new ListAsValue(list); /// /// Wraps an immutable array for use in ValueObject<T>.GetValueComponents /// with a decorator that correctly implements value object semantics for arrays. /// - public static IEnumerable AsValueObject(this ImmutableArray array) - { - return new ListAsValue(array); - } + public static IEnumerable AsValueObject(this ImmutableArray array) => new ListAsValue(array); /// /// Wraps an immutable set for use in ValueObject<T>.GetValueComponents /// with a decorator that correctly implements value object semantics for sets. /// - public static IEnumerable AsValueObject(this IImmutableSet set) - { - return new SetAsValue(set); - } + public static IEnumerable AsValueObject(this IImmutableSet set) => new SetAsValue(set); /// /// Wraps an immutable dictionary for use in ValueObject<T>.GetValueComponents /// with a decorator that correctly implements value object semantics for dictionaries. /// - public static IReadOnlyDictionary AsValueObject(this IImmutableDictionary dictionary) - { - return new DictionaryAsValue(dictionary); - } + public static IReadOnlyDictionary AsValueObject(this IImmutableDictionary dictionary) => + new DictionaryAsValue(dictionary); } } diff --git a/Revo.Core/ValueObjects/DictionaryAsValue.cs b/Revo.Core/ValueObjects/DictionaryAsValue.cs index 63eff65a..1323930b 100644 --- a/Revo.Core/ValueObjects/DictionaryAsValue.cs +++ b/Revo.Core/ValueObjects/DictionaryAsValue.cs @@ -8,10 +8,7 @@ namespace Revo.Core.ValueObjects { public class DictionaryAsValue : ValueObject>, IReadOnlyDictionary { - public DictionaryAsValue(IImmutableDictionary dictionary) - { - Dictionary = dictionary; - } + public DictionaryAsValue(IImmutableDictionary dictionary) => Dictionary = dictionary; public IReadOnlyDictionary Dictionary { get; } public int Count => Dictionary.Count; @@ -66,9 +63,7 @@ protected override bool EqualsInternal(DictionaryAsValue other) return true; } - protected override IEnumerable<(string Name, object Value)> GetValueComponents() - { - return Dictionary.Select(x => (x.Key.ToString(), (object)x.Value)); - } + protected override IEnumerable<(string Name, object Value)> GetValueComponents() => + Dictionary.Select(x => (x.Key.ToString(), (object)x.Value)); } } diff --git a/Revo.Core/ValueObjects/ListAsValue.cs b/Revo.Core/ValueObjects/ListAsValue.cs index 91147125..16febc09 100644 --- a/Revo.Core/ValueObjects/ListAsValue.cs +++ b/Revo.Core/ValueObjects/ListAsValue.cs @@ -7,15 +7,9 @@ namespace Revo.Core.ValueObjects { public class ListAsValue : ValueObject>, IEnumerable { - public ListAsValue(ImmutableArray list) - { - List = list; - } + public ListAsValue(ImmutableArray list) => List = list; - public ListAsValue(IImmutableList list) - { - List = list; - } + public ListAsValue(IImmutableList list) => List = list; public IReadOnlyList List { get; } diff --git a/Revo.Core/ValueObjects/SetAsValue.cs b/Revo.Core/ValueObjects/SetAsValue.cs index 1ea5f7e8..b3b41690 100644 --- a/Revo.Core/ValueObjects/SetAsValue.cs +++ b/Revo.Core/ValueObjects/SetAsValue.cs @@ -6,14 +6,9 @@ namespace Revo.Core.ValueObjects { - public class SetAsValue : ValueObject>, IEnumerable + public class SetAsValue(IImmutableSet set) : ValueObject>, IEnumerable { - public SetAsValue(IImmutableSet set) - { - Set = set; - } - - public IReadOnlyCollection Set { get; } + public IReadOnlyCollection Set { get; } = set; public IEnumerator GetEnumerator() => Set.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)Set).GetEnumerator(); @@ -59,9 +54,7 @@ protected override bool EqualsInternal(SetAsValue other) return true; } - protected override IEnumerable<(string Name, object Value)> GetValueComponents() - { - return Set.Select(x => ((string)null, (object)x)); - } + protected override IEnumerable<(string Name, object Value)> GetValueComponents() => + Set.Select(x => ((string)null, (object)x)); } } diff --git a/Revo.Core/ValueObjects/SingleValueObject.cs b/Revo.Core/ValueObjects/SingleValueObject.cs index 1b132351..7897a0be 100644 --- a/Revo.Core/ValueObjects/SingleValueObject.cs +++ b/Revo.Core/ValueObjects/SingleValueObject.cs @@ -4,15 +4,10 @@ namespace Revo.Core.ValueObjects { [JsonConverter(typeof(SingleValueObjectJsonConverter))] - public abstract class SingleValueObject : ValueObject, ISingleValueObject + public abstract class SingleValueObject(TValue value) : ValueObject, ISingleValueObject where T : SingleValueObject { - public SingleValueObject(TValue value) - { - Value = value; - } - - public TValue Value { get; private set; } + public TValue Value { get; private set; } = value; object ISingleValueObject.Value => Value; protected override IEnumerable<(string Name, object Value)> GetValueComponents() diff --git a/Revo.Core/ValueObjects/SingleValueObjectJsonConverter.cs b/Revo.Core/ValueObjects/SingleValueObjectJsonConverter.cs index 2e5ff61b..389589f1 100644 --- a/Revo.Core/ValueObjects/SingleValueObjectJsonConverter.cs +++ b/Revo.Core/ValueObjects/SingleValueObjectJsonConverter.cs @@ -42,13 +42,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist }); object value = serializer.Deserialize(reader, parameterType); + return Activator.CreateInstance(objectType, value); } - public override bool CanConvert(Type objectType) - { - return typeof(ISingleValueObject).IsAssignableFrom(objectType) + public override bool CanConvert(Type objectType) => + typeof(ISingleValueObject).IsAssignableFrom(objectType) && objectType.IsClass && !objectType.IsAbstract && !objectType.IsGenericTypeDefinition; - } } } diff --git a/Revo.Core/ValueObjects/ValueObject.cs b/Revo.Core/ValueObjects/ValueObject.cs index eb21bd99..d726c8f2 100644 --- a/Revo.Core/ValueObjects/ValueObject.cs +++ b/Revo.Core/ValueObjects/ValueObject.cs @@ -20,10 +20,7 @@ public abstract class ValueObject : IEquatable private WeakReference<(string Name, object Value)[]> cachedValueMembers; private int? hashCode; - public ValueObject() - { - Debug.Assert(typeof(T).IsAssignableFrom(GetType())); - } + public ValueObject() => Debug.Assert(typeof(T).IsAssignableFrom(GetType())); /// /// Gets the components that define the value of this objects. @@ -87,6 +84,7 @@ public override int GetHashCode() public override string ToString() { var valueMembers = GetValueComponentsWithCache(); + return $"{typeof(T).Name} {{ {string.Join(", ", valueMembers.Select(x => (x.Name != null ? x.Name + " = " : "") + (x.Value?.ToString() ?? "null")))} }}"; }