diff --git a/Squidex.sln.DotSettings b/Squidex.sln.DotSettings index 93827d8dd..48f31adfc 100644 --- a/Squidex.sln.DotSettings +++ b/Squidex.sln.DotSettings @@ -3,18 +3,24 @@ True False True - True + False + True - True - True + False + True + False + True - True - True + False + True + False + True - True + False + True + + True - False - True diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs index 2c9967d09..403dff845 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Apps/AppClient.cs @@ -13,8 +13,8 @@ namespace Squidex.Domain.Apps.Core.Apps public sealed class AppClient { private readonly string secret; - private string name; - private AppClientPermission permission; + private readonly string name; + private readonly AppClientPermission permission; public string Name { diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs index fd7e0dc09..f5c262640 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs @@ -85,7 +85,7 @@ namespace Squidex.Domain.Apps.Core.Apps public static LanguagesConfig Build(params Language[] languages) { - return Build(languages?.Select(x => new LanguageConfig(x, false))?.ToList()); + return Build(languages?.Select(x => new LanguageConfig(x)).ToList()); } public LanguagesConfig MakeMaster(Language language) diff --git a/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleActionVisitor.cs b/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleActionVisitor.cs index 8c999b7ae..3b4d284bd 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleActionVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleActionVisitor.cs @@ -10,7 +10,7 @@ using Squidex.Domain.Apps.Core.Rules.Actions; namespace Squidex.Domain.Apps.Core.Rules { - public interface IRuleActionVisitor + public interface IRuleActionVisitor { T Visit(WebhookAction action); } diff --git a/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleTriggerVisitor.cs b/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleTriggerVisitor.cs index b91c7e604..ccbb1c4c6 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleTriggerVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Rules/IRuleTriggerVisitor.cs @@ -10,7 +10,7 @@ using Squidex.Domain.Apps.Core.Rules.Triggers; namespace Squidex.Domain.Apps.Core.Rules { - public interface IRuleTriggerVisitor + public interface IRuleTriggerVisitor { T Visit(ContentChangedTrigger trigger); } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs index f70c8b9f0..86c6c1781 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs @@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds public static IEnumerable Visit(AssetsField field, JToken value) { - IEnumerable result = null; + IEnumerable result; try { result = value?.ToObject>(); @@ -47,7 +47,7 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds private static IEnumerable Visit(ReferencesField field, JToken value) { - IEnumerable result = null; + IEnumerable result; try { result = value?.ToObject>() ?? Enumerable.Empty(); diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Actions/WebhookActionHandler.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Actions/WebhookActionHandler.cs index aae33d8ca..afc865466 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Actions/WebhookActionHandler.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Actions/WebhookActionHandler.cs @@ -20,7 +20,7 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.Http; -namespace Squidex.Domain.Apps.Core.HandleRules.ActionHandlers +namespace Squidex.Domain.Apps.Core.HandleRules.Actions { public sealed class WebhookActionHandler : RuleActionHandler { diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index 6ab62dc73..70f1db7d9 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -116,11 +116,11 @@ namespace Squidex.Domain.Apps.Core.Scripting } catch (ParserException ex) { - throw new ValidationException($"Failed to execute script with javascript syntaxs error.", new ValidationError(ex.Message)); + throw new ValidationException("Failed to execute script with javascript syntaxs error.", new ValidationError(ex.Message)); } catch (JavaScriptException ex) { - throw new ValidationException($"Failed to execute script with javascript error.", new ValidationError(ex.Message)); + throw new ValidationException("Failed to execute script with javascript error.", new ValidationError(ex.Message)); } } @@ -171,7 +171,7 @@ namespace Squidex.Domain.Apps.Core.Scripting { var errors = !string.IsNullOrWhiteSpace(message) ? new[] { new ValidationError(message) } : null; - throw new ValidationException($"Script rejected the operation.", errors); + throw new ValidationException("Script rejected the operation.", errors); })); } } diff --git a/src/Squidex.Domain.Apps.Read.MongoDb/MongoCollectionExtensions.cs b/src/Squidex.Domain.Apps.Read.MongoDb/MongoCollectionExtensions.cs index e2121e71a..4a15254dc 100644 --- a/src/Squidex.Domain.Apps.Read.MongoDb/MongoCollectionExtensions.cs +++ b/src/Squidex.Domain.Apps.Read.MongoDb/MongoCollectionExtensions.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Read.MongoDb { public static Task CreateAsync(this IMongoCollection collection, SquidexEvent @event, EnvelopeHeaders headers, Action updater) where T : class, IEntity, new() { - var entity = EntityMapper.Create(@event, headers, updater); + var entity = EntityMapper.Create(@event, headers, updater); return collection.InsertOneIfNotExistsAsync(entity); } diff --git a/src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs b/src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs index 92ecd5e16..9121b027a 100644 --- a/src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs +++ b/src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs @@ -15,7 +15,7 @@ namespace Squidex.Infrastructure.CQRS.Events { public sealed class RetrySubscription : IEventSubscription, IEventSubscriber { - private readonly SingleThreadedDispatcher dispatcher = new SingleThreadedDispatcher(10); + private readonly SingleThreadedDispatcher dispatcher = new SingleThreadedDispatcher(); private readonly CancellationTokenSource disposeCts = new CancellationTokenSource(); private readonly RetryWindow retryWindow = new RetryWindow(TimeSpan.FromMinutes(5), 5); private readonly IEventStore eventStore; diff --git a/src/Squidex.Infrastructure/Cloneable{T}.cs b/src/Squidex.Infrastructure/Cloneable{T}.cs index 7c1c12b7c..56877f04d 100644 --- a/src/Squidex.Infrastructure/Cloneable{T}.cs +++ b/src/Squidex.Infrastructure/Cloneable{T}.cs @@ -14,7 +14,7 @@ namespace Squidex.Infrastructure { protected T Clone(Action updater) { - return base.Clone(updater); + return base.Clone(updater); } } } diff --git a/src/Squidex.Infrastructure/Reflection/SimpleCopier.cs b/src/Squidex.Infrastructure/Reflection/SimpleCopier.cs index d4609dfbe..25ddf162c 100644 --- a/src/Squidex.Infrastructure/Reflection/SimpleCopier.cs +++ b/src/Squidex.Infrastructure/Reflection/SimpleCopier.cs @@ -53,7 +53,7 @@ namespace Squidex.Infrastructure.Reflection if (property.PropertyType.Implements()) { - Mappers.Add(new PropertyMapper(accessor, x => x == null ? x : ((ICloneable)x).Clone())); + Mappers.Add(new PropertyMapper(accessor, x => ((ICloneable)x)?.Clone())); } else { diff --git a/src/Squidex.Infrastructure/StringExtensions.cs b/src/Squidex.Infrastructure/StringExtensions.cs index 8279a401a..8fd004668 100644 --- a/src/Squidex.Infrastructure/StringExtensions.cs +++ b/src/Squidex.Infrastructure/StringExtensions.cs @@ -328,7 +328,7 @@ namespace Squidex.Infrastructure { var sb = new StringBuilder(); - foreach (var part in value.Split(new[] { '-', '_', ' ' })) + foreach (var part in value.Split('-', '_', ' ')) { if (part.Length < 2) { diff --git a/src/Squidex/Config/Orleans/CustomJsonSerializer.cs b/src/Squidex/Config/Orleans/CustomJsonSerializer.cs index 7fd8334ce..8fe2e5e3f 100644 --- a/src/Squidex/Config/Orleans/CustomJsonSerializer.cs +++ b/src/Squidex/Config/Orleans/CustomJsonSerializer.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json; using Squidex.Config.Domain; +using Squidex.Infrastructure.CQRS.Events; using Squidex.Infrastructure.Json.Orleans; namespace Squidex.Config.Orleans @@ -15,7 +16,8 @@ namespace Squidex.Config.Orleans public class CustomJsonSerializer : JsonExternalSerializer { public CustomJsonSerializer() - : base(JsonSerializer.Create(SerializationServices.DefaultJsonSettings)) + : base(JsonSerializer.Create(SerializationServices.DefaultJsonSettings), + typeof(Envelope)) { } } diff --git a/src/Squidex/Config/ServiceExtensions.cs b/src/Squidex/Config/ServiceExtensions.cs index d669bb64a..431d0705a 100644 --- a/src/Squidex/Config/ServiceExtensions.cs +++ b/src/Squidex/Config/ServiceExtensions.cs @@ -62,7 +62,7 @@ namespace Squidex.Config public static T GetOptionalValue(this IConfiguration config, string path, T defaultValue = default(T)) { - var value = config.GetValue(path, defaultValue); + var value = config.GetValue(path, defaultValue); return value; } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs index 25d2eb738..54f1e7dfc 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs @@ -351,7 +351,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent var fallbackConfig = LanguagesConfig.Build( new LanguageConfig(Language.EN), - new LanguageConfig(Language.DE, false, new[] { Language.EN })); + new LanguageConfig(Language.DE, false, Language.EN)); var output = (Dictionary)data.ToLanguageModel(fallbackConfig, new List { Language.DE }); diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs index b4c329856..fd21711ca 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs @@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules.Triggers { var trigger = new ContentChangedTrigger { - Schemas = ImmutableList.Create( + Schemas = ImmutableList.Create( new ContentChangedTriggerSchema { SendCreate = sendCreate == 1, diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs index d144ffff9..b88c83903 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaFieldTests.cs @@ -15,7 +15,7 @@ using Xunit; #pragma warning disable SA1310 // Field names must not contain underscore -namespace Squidex.Domain.Apps.Write.Schemas +namespace Squidex.Domain.Apps.Write.Schemas.Guards { public class GuardSchemaFieldTests { diff --git a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaTests.cs b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaTests.cs index d02f7efeb..3b9ac5b4b 100644 --- a/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaTests.cs +++ b/tests/Squidex.Domain.Apps.Write.Tests/Schemas/Guards/GuardSchemaTests.cs @@ -70,13 +70,13 @@ namespace Squidex.Domain.Apps.Write.Schemas.Guards { Name = null, Properties = null, - Partitioning = "invalid", + Partitioning = "invalid" }, new CreateSchemaField { Name = null, Properties = InvalidProperties(), - Partitioning = "invalid", + Partitioning = "invalid" } }, Name = "new-schema" diff --git a/tests/Squidex.Infrastructure.Tests/CQRS/Events/Grains/EventConsumerGrainTests.cs b/tests/Squidex.Infrastructure.Tests/CQRS/Events/Grains/EventConsumerGrainTests.cs index 7cfc09960..79f631a4c 100644 --- a/tests/Squidex.Infrastructure.Tests/CQRS/Events/Grains/EventConsumerGrainTests.cs +++ b/tests/Squidex.Infrastructure.Tests/CQRS/Events/Grains/EventConsumerGrainTests.cs @@ -59,7 +59,7 @@ namespace Squidex.Infrastructure.CQRS.Events.Grains public EventConsumerGrainTests() { - factory = new EventConsumerFactory(x => eventConsumer); + factory = x => eventConsumer; state.Position = Guid.NewGuid().ToString(); consumerName = eventConsumer.GetType().Name; diff --git a/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs b/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs index 727c7e2c6..ba944b302 100644 --- a/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs @@ -25,14 +25,14 @@ namespace Squidex.Infrastructure.Json new[] { new Claim("email", "me@email.de"), - new Claim("username", "me@email.de"), + new Claim("username", "me@email.de") }, "Cookie"), new ClaimsIdentity( new[] { new Claim("user_id", "12345"), - new Claim("login", "me"), + new Claim("login", "me") }, "Google") });