diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs index c4c6627f1a..3e865aeea9 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs @@ -90,7 +90,7 @@ protected override void OnCloned() [Pure] public FieldCollection Remove(long fieldId) { - if (!ById.TryGetValue(fieldId, out var field)) + if (!ById.TryGetValue(fieldId, out _)) { return this; } @@ -150,7 +150,7 @@ public FieldCollection Update(long fieldId, Func updater) return this; } - if (!(newField is T typedField)) + if (!(newField is T)) { throw new InvalidOperationException($"Field must be of type {typeof(T)}"); } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs index 5da91b6a17..570e75aa5e 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs @@ -13,7 +13,7 @@ public static class Fields { public static RootField Array(long id, string name, Partitioning partitioning, params NestedField[] fields) { - return new ArrayField(id, name, partitioning, fields: fields); + return new ArrayField(id, name, partitioning, fields); } public static ArrayField Array(long id, string name, Partitioning partitioning, ArrayFieldProperties properties = null, IFieldSettings settings = null) diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs index d199a2497a..78e3d3f816 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs @@ -8,7 +8,6 @@ using Newtonsoft.Json; using Squidex.Infrastructure; using System; -using System.Linq; using P = Squidex.Domain.Apps.Core.Partitioning; namespace Squidex.Domain.Apps.Core.Schemas.Json diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs index 4b0b9e917b..c3c04c851b 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Linq; using Newtonsoft.Json; using Squidex.Infrastructure; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs index 1052b89410..1d3b67e74a 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs @@ -73,7 +73,7 @@ public static FieldConverter ResolveAssetUrls(IReadOnlyCollection fields return (data, field) => { - if (field is IField assetField && (isAll || fields.Contains(field.Name))) + if (field is IField && (isAll || fields.Contains(field.Name))) { foreach (var partition in data) { diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Triggers/ContentChangedTriggerHandler.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Triggers/ContentChangedTriggerHandler.cs index c27ffc5c20..25bd8ccfba 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Triggers/ContentChangedTriggerHandler.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/Triggers/ContentChangedTriggerHandler.cs @@ -67,9 +67,9 @@ protected override bool Triggers(EnrichedContentEvent @event, ContentChangedTrig return false; } - private bool MatchsSchema(ContentChangedTriggerSchemaV2 schema, NamedId @eventId) + private static bool MatchsSchema(ContentChangedTriggerSchemaV2 schema, NamedId eventId) { - return @eventId.Id == schema.SchemaId; + return eventId.Id == schema.SchemaId; } private bool MatchsCondition(ContentChangedTriggerSchemaV2 schema, EnrichedSchemaEvent @event) diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/CustomProperty.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/CustomProperty.cs index bd12305374..087002eca9 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/CustomProperty.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/CustomProperty.cs @@ -11,7 +11,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper { public abstract class CustomProperty : PropertyDescriptor { - public CustomProperty() + protected CustomProperty() : base(PropertyFlag.CustomJsValue) { Enumerable = true; diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index 35cc085ac7..3b3aa4b5b9 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -229,7 +229,7 @@ private Engine CreateScriptEngine(IReferenceResolver resolver = null, Dictionary private static Func Safe(Func func) { - return new Func(() => + return () => { try { @@ -239,7 +239,7 @@ private static Func Safe(Func func) { return "null"; } - }); + }; } private static JsValue Slugify(JsValue thisObject, JsValue[] arguments) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs index 7e0c8a1626..25e84de3fd 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs @@ -49,7 +49,7 @@ protected override async Task SetupCollectionAsync(IMongoCollection x.DataText) .Ascending(x => x.IndexedSchemaId) .Ascending(x => x.IsDeleted) - .Ascending(x => x.Status)), + .Ascending(x => x.Status)) }, ct); await base.SetupCollectionAsync(collection, ct); diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs index 0f57dacfa8..14195985f7 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs @@ -50,7 +50,7 @@ public static FilterNode AdjustToModel(this FilterNode filterNode, Schema schema private static Func, IReadOnlyList> PathConverter(Schema schema, bool useDraft) { - return new Func, IReadOnlyList>(propertyNames => + return propertyNames => { var result = new List(propertyNames); @@ -91,7 +91,7 @@ public static FilterNode AdjustToModel(this FilterNode filterNode, Schema schema } return result; - }); + }; } public static IFindFluent ContentSort(this IFindFluent cursor, Query query) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs index 6d7e27bf70..a1796a191a 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventRepository.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; using System.Threading.Tasks; using MongoDB.Driver; diff --git a/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs b/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs index 6d7b8e3d62..330014cb88 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs @@ -15,7 +15,6 @@ using Squidex.Domain.Apps.Events.Apps; using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; -using Squidex.Infrastructure.Json; using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Orleans; using Squidex.Shared.Users; @@ -28,7 +27,6 @@ public sealed class BackupApps : BackupHandler private const string SettingsFile = "Settings.json"; private readonly IGrainFactory grainFactory; private readonly IUserResolver userResolver; - private readonly IJsonSerializer serializer; private readonly IAppsByNameIndex appsByNameIndex; private readonly HashSet contributors = new HashSet(); private Dictionary usersWithEmail = new Dictionary(); @@ -38,14 +36,12 @@ public sealed class BackupApps : BackupHandler public override string Name { get; } = "Apps"; - public BackupApps(IGrainFactory grainFactory, IUserResolver userResolver, IJsonSerializer serializer) + public BackupApps(IGrainFactory grainFactory, IUserResolver userResolver) { Guard.NotNull(grainFactory, nameof(grainFactory)); - Guard.NotNull(serializer, nameof(serializer)); Guard.NotNull(userResolver, nameof(userResolver)); this.grainFactory = grainFactory; - this.serializer = serializer; this.userResolver = userResolver; appsByNameIndex = grainFactory.GetGrain(SingleGrain.Id); @@ -83,7 +79,7 @@ public override async Task RestoreEventAsync(Envelope @event, Guid { appName = appCreated.Name; - await ResolveUsersAsync(reader, actor); + await ResolveUsersAsync(reader); await ReserveAppAsync(appId); break; @@ -148,7 +144,7 @@ private RefToken MapUser(string userId, RefToken fallback) return userMapping.GetOrAdd(userId, fallback); } - private async Task ResolveUsersAsync(BackupReader reader, RefToken actor) + private async Task ResolveUsersAsync(BackupReader reader) { await ReadUsersAsync(reader); diff --git a/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs b/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs index ebf79a7900..6e6ca7dae2 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Tags; -using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Assets.State; using Squidex.Domain.Apps.Entities.Backup; using Squidex.Domain.Apps.Events.Assets; @@ -26,23 +25,18 @@ public sealed class BackupAssets : BackupHandlerWithStore private const string TagsFile = "AssetTags.json"; private readonly HashSet assetIds = new HashSet(); private readonly IAssetStore assetStore; - private readonly IAssetRepository assetRepository; private readonly ITagService tagService; public override string Name { get; } = "Assets"; - public BackupAssets(IStore store, - IAssetStore assetStore, - IAssetRepository assetRepository, - ITagService tagService) + public BackupAssets(IStore store, IAssetStore assetStore, ITagService tagService) : base(store) { Guard.NotNull(assetStore, nameof(assetStore)); - Guard.NotNull(assetRepository, nameof(assetRepository)); Guard.NotNull(tagService, nameof(tagService)); this.assetStore = assetStore; - this.assetRepository = assetRepository; + this.tagService = tagService; } diff --git a/src/Squidex.Domain.Apps.Entities/Backup/Model/CompatibleStoredEvent.cs b/src/Squidex.Domain.Apps.Entities/Backup/Model/CompatibleStoredEvent.cs index ac84f1bb7b..b2ea46bed7 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/Model/CompatibleStoredEvent.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/Model/CompatibleStoredEvent.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Globalization; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Squidex.Infrastructure.EventSourcing; @@ -79,7 +80,7 @@ public static CompatibleEventData V1(EventData data) public EventData ToData() { - return new EventData(Type, Metadata, Payload.ToString()); + return new EventData(Type, Metadata, Payload.ToString(CultureInfo.InvariantCulture)); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs index 6613a5276b..ca5c36a381 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs @@ -111,7 +111,7 @@ private static ScriptContext CreateScriptContext(object operation, ContentComman private ValidationContext CreateValidationContext() { - return new ValidationContext(contentId, schemaId, (sid, filterNode) => QueryContentsAsync(sid, filterNode), QueryAssetsAsync); + return new ValidationContext(contentId, schemaId, QueryContentsAsync, QueryAssetsAsync); } private async Task> QueryAssetsAsync(IEnumerable assetIds) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs index 3601cfcec9..89b566f2ce 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs @@ -25,7 +25,6 @@ using Squidex.Infrastructure.Reflection; using Squidex.Shared; using Squidex.Shared.Identity; -using Squidex.Shared.Users; #pragma warning disable RECS0147 @@ -275,7 +274,7 @@ public async Task GetSchemaAsync(QueryContext context, string sch return schema; } - private void CheckPermission(ISchemaEntity schema, ClaimsPrincipal user) + private static void CheckPermission(ISchemaEntity schema, ClaimsPrincipal user) { var permissions = user.Permissions(); var permission = Permissions.ForApp(Permissions.AppContentsRead, schema.AppId.Name, schema.Name); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/EventEnricher.cs b/src/Squidex.Domain.Apps.Entities/Rules/EventEnricher.cs index e49411069f..a9532e97f8 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/EventEnricher.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/EventEnricher.cs @@ -170,7 +170,7 @@ private Task FindUserAsync(RefToken actor) { x.AbsoluteExpirationRelativeToNow = UserCacheDuration; - IUser user = null; + IUser user; try { user = await userResolver.FindByIdOrEmailAsync(actor.Identifier); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/BackupSchemas.cs b/src/Squidex.Domain.Apps.Entities/Schemas/BackupSchemas.cs index dab7c6d85c..371f957c85 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/BackupSchemas.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/BackupSchemas.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Orleans; -using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Backup; using Squidex.Domain.Apps.Entities.Schemas.Indexes; using Squidex.Domain.Apps.Events.Schemas; @@ -22,18 +21,14 @@ namespace Squidex.Domain.Apps.Entities.Schemas public sealed class BackupSchemas : BackupHandler { private readonly Dictionary schemasByName = new Dictionary(); - private readonly FieldRegistry fieldRegistry; private readonly IGrainFactory grainFactory; public override string Name { get; } = "Schemas"; - public BackupSchemas(FieldRegistry fieldRegistry, IGrainFactory grainFactory) + public BackupSchemas(IGrainFactory grainFactory) { - Guard.NotNull(fieldRegistry, nameof(fieldRegistry)); Guard.NotNull(grainFactory, nameof(grainFactory)); - this.fieldRegistry = fieldRegistry; - this.grainFactory = grainFactory; } diff --git a/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs b/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs index 8ce972c1fb..b3ecbee683 100644 --- a/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs +++ b/src/Squidex.Domain.Users.MongoDb/MongoUserStore.cs @@ -141,7 +141,7 @@ public IQueryable Users public bool IsId(string id) { - return ObjectId.TryParse(id, out var _); + return ObjectId.TryParse(id, out _); } public IdentityUser Create(string email) @@ -279,7 +279,7 @@ public Task GetTwoFactorEnabledAsync(IdentityUser user, CancellationToken public Task GetLockoutEndDateAsync(IdentityUser user, CancellationToken cancellationToken) { - return Task.FromResult(((MongoUser)user).LockoutEnd); + return Task.FromResult(((MongoUser)user).LockoutEnd); } public Task GetAccessFailedCountAsync(IdentityUser user, CancellationToken cancellationToken) @@ -309,7 +309,7 @@ public Task HasPasswordAsync(IdentityUser user, CancellationToken cancella public Task CountCodesAsync(IdentityUser user, CancellationToken cancellationToken) { - return Task.FromResult(((MongoUser)user).GetToken(InternalLoginProvider, RecoveryCodeTokenName)?.Split(';')?.Length ?? 0); + return Task.FromResult(((MongoUser)user).GetToken(InternalLoginProvider, RecoveryCodeTokenName)?.Split(';').Length ?? 0); } public Task SetUserNameAsync(IdentityUser user, string userName, CancellationToken cancellationToken) diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 68ceef8760..7bed2f6b26 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -49,7 +49,7 @@ public async Task InitializeAsync(CancellationToken ct = default(CancellationTok throw new ConfigurationException("Cannot connect to event store.", ex); } - await projectionClient.ConnectAsync(); + await projectionClient.ConnectAsync(ct); } public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs index 70e4d3397d..7f9e38bf36 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; using Squidex.Infrastructure.MongoDb; diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs index 0a11b956e5..e19381ab96 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs @@ -89,7 +89,7 @@ public async Task DropCollectionIfExistsAsync(CancellationToken ct = defau { try { - await mongoDatabase.DropCollectionAsync(CollectionName()); + await mongoDatabase.DropCollectionAsync(CollectionName(), ct); mongoCollection = CreateCollection(); diff --git a/src/Squidex.Infrastructure/Diagnostics/GCHealthCheck.cs b/src/Squidex.Infrastructure/Diagnostics/GCHealthCheck.cs index 90c55244c7..ded740e5ff 100644 --- a/src/Squidex.Infrastructure/Diagnostics/GCHealthCheck.cs +++ b/src/Squidex.Infrastructure/Diagnostics/GCHealthCheck.cs @@ -34,7 +34,7 @@ public Task CheckHealthAsync(HealthCheckContext context, Canc { "Allocated", allocated.ToReadableSize() }, { "Gen0Collections", GC.CollectionCount(0) }, { "Gen1Collections", GC.CollectionCount(1) }, - { "Gen2Collections", GC.CollectionCount(2) }, + { "Gen2Collections", GC.CollectionCount(2) } }; var status = allocated < threshold ? HealthStatus.Healthy : HealthStatus.Unhealthy; diff --git a/src/Squidex.Infrastructure/IMigrated.cs b/src/Squidex.Infrastructure/IMigrated.cs index c2f74a40b1..46af762da4 100644 --- a/src/Squidex.Infrastructure/IMigrated.cs +++ b/src/Squidex.Infrastructure/IMigrated.cs @@ -7,7 +7,7 @@ namespace Squidex.Infrastructure { - public interface IMigrated + public interface IMigrated { T Migrate(); } diff --git a/src/Squidex.Infrastructure/Json/Newtonsoft/JsonValueConverter.cs b/src/Squidex.Infrastructure/Json/Newtonsoft/JsonValueConverter.cs index 0e4282826b..49fdd5166e 100644 --- a/src/Squidex.Infrastructure/Json/Newtonsoft/JsonValueConverter.cs +++ b/src/Squidex.Infrastructure/Json/Newtonsoft/JsonValueConverter.cs @@ -38,7 +38,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist return ReadJson(reader); } - private IJsonValue ReadJson(JsonReader reader) + private static IJsonValue ReadJson(JsonReader reader) { switch (reader.TokenType) { @@ -125,11 +125,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s WriteJson(writer, (IJsonValue)value); } - private void WriteJson(JsonWriter writer, IJsonValue value) + private static void WriteJson(JsonWriter writer, IJsonValue value) { switch (value) { - case JsonNull n: + case JsonNull _: writer.WriteNull(); break; case JsonBoolean s: diff --git a/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs b/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs index 42495544da..491f32964f 100644 --- a/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs +++ b/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs @@ -65,8 +65,10 @@ public void Initialize() var fs = new FileStream(fileInfo.FullName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite); - writer = new StreamWriter(fs, Encoding.UTF8); - writer.AutoFlush = true; + writer = new StreamWriter(fs, Encoding.UTF8) + { + AutoFlush = true + }; writer.WriteLine($"--- Started Logging {DateTime.UtcNow} ---", 1); } diff --git a/src/Squidex.Infrastructure/Queries/FilterValue.cs b/src/Squidex.Infrastructure/Queries/FilterValue.cs index 7c07827f81..88a1746d02 100644 --- a/src/Squidex.Infrastructure/Queries/FilterValue.cs +++ b/src/Squidex.Infrastructure/Queries/FilterValue.cs @@ -131,7 +131,7 @@ public override string ToString() return ToString(Value); } - private string ToString(object value) + private static string ToString(object value) { if (value == null) { diff --git a/src/Squidex.Infrastructure/Queries/OData/ConstantWithTypeVisitor.cs b/src/Squidex.Infrastructure/Queries/OData/ConstantWithTypeVisitor.cs index 3276c5b7ad..df455a1b00 100644 --- a/src/Squidex.Infrastructure/Queries/OData/ConstantWithTypeVisitor.cs +++ b/src/Squidex.Infrastructure/Queries/OData/ConstantWithTypeVisitor.cs @@ -148,7 +148,7 @@ public override FilterValue Visit(ConstantNode nodeIn) throw new NotSupportedException(); } - private Instant ParseInstant(object value) + private static Instant ParseInstant(object value) { if (value is DateTimeOffset dateTimeOffset) { diff --git a/src/Squidex.Infrastructure/States/Persistence{TSnapshot,TKey}.cs b/src/Squidex.Infrastructure/States/Persistence{TSnapshot,TKey}.cs index 3aa0e09a36..5b7f103e7d 100644 --- a/src/Squidex.Infrastructure/States/Persistence{TSnapshot,TKey}.cs +++ b/src/Squidex.Infrastructure/States/Persistence{TSnapshot,TKey}.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; #pragma warning disable RECS0012 // 'if' statement can be re-written as 'switch' statement diff --git a/src/Squidex.Shared/Permissions.cs b/src/Squidex.Shared/Permissions.cs index c49784d7fc..aee7f268eb 100644 --- a/src/Squidex.Shared/Permissions.cs +++ b/src/Squidex.Shared/Permissions.cs @@ -166,7 +166,7 @@ public static PermissionSet ToAppPermissions(this PermissionSet permissions, str public static string[] ToAppNames(this PermissionSet permissions) { - var matching = permissions.Where(x => x.StartsWith($"squidex.apps.")); + var matching = permissions.Where(x => x.StartsWith("squidex.apps.")); var result = matching diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs index 2d3676d82c..085170779e 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppClientsController.cs @@ -11,7 +11,6 @@ using Microsoft.Net.Http.Headers; using Squidex.Areas.Api.Controllers.Apps.Models; using Squidex.Domain.Apps.Entities.Apps.Commands; -using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Pipeline; using Squidex.Shared; diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs index a1313dc8dd..a8aacc1ba4 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppRolesController.cs @@ -93,8 +93,7 @@ public async Task GetPermissions(string app) [ApiCosts(1)] public async Task PostRole(string app, [FromBody] AddRoleDto request) { - var command = request.ToCommand(); - var context = await CommandBus.PublishAsync(command); + await CommandBus.PublishAsync(request.ToCommand()); return NoContent(); } diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index fa620eb9f4..5deacb593e 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; @@ -20,7 +19,6 @@ using Squidex.Pipeline; using Squidex.Shared; using Squidex.Shared.Identity; -using Squidex.Shared.Users; namespace Squidex.Areas.Api.Controllers.Apps { diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs index 7acdb7c081..e2245fb415 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/AppDto.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; using NodaTime; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Services; diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs index 8292c7f0a7..e482b1a69c 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/ContributorsDto.cs @@ -6,7 +6,6 @@ // ========================================================================== using System.ComponentModel.DataAnnotations; -using System.Linq; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Infrastructure; diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index d69893681d..5819a1a168 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Orleans; diff --git a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs index 81b4aa1267..281c63f675 100644 --- a/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Comments/CommentsController.cs @@ -82,7 +82,8 @@ public async Task GetComments(string app, Guid commentsId, [FromQ public async Task PostComment(string app, Guid commentsId, [FromBody] UpsertCommentDto request) { var command = request.ToCreateCommand(commentsId); - var context = await CommandBus.PublishAsync(command); + + await CommandBus.PublishAsync(command); var response = CommentDto.FromCommand(command); diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index 7eb6680345..ffed1ed06a 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -19,7 +19,6 @@ using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.GraphQL; -using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Pipeline; using Squidex.Shared; diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs index 53e2fa8aa3..e09a2aa949 100644 --- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs +++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Squidex.Areas.Api.Controllers.History.Models; diff --git a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs index 482ac0caaf..ef320b78dd 100644 --- a/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleEventsDto.cs @@ -9,7 +9,6 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using Squidex.Domain.Apps.Entities.Rules; -using Squidex.Infrastructure; namespace Squidex.Areas.Api.Controllers.Rules.Models { diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs index 41af583698..d3f034d967 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs @@ -6,8 +6,6 @@ // ========================================================================== using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; diff --git a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs index e5da765286..7e3b4afb6a 100644 --- a/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Statistics/UsagesController.cs @@ -13,7 +13,6 @@ using Squidex.Areas.Api.Controllers.Statistics.Models; using Squidex.Domain.Apps.Entities.Apps.Services; using Squidex.Domain.Apps.Entities.Assets; -using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.UsageTracking; using Squidex.Pipeline; diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs index 890ebefab8..ae9abfe5a1 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs @@ -35,9 +35,7 @@ public sealed class AccountController : IdentityServerController private readonly UserManager userManager; private readonly IUserFactory userFactory; private readonly IUserEvents userEvents; - private readonly IUserResolver userResolver; private readonly IOptions identityOptions; - private readonly IOptions urlOptions; private readonly ISemanticLog log; private readonly IIdentityServerInteractionService interactions; @@ -46,16 +44,12 @@ public sealed class AccountController : IdentityServerController UserManager userManager, IUserFactory userFactory, IUserEvents userEvents, - IUserResolver userResolver, IOptions identityOptions, - IOptions urlOptions, ISemanticLog log, IIdentityServerInteractionService interactions) { this.log = log; - this.urlOptions = urlOptions; this.userEvents = userEvents; - this.userResolver = userResolver; this.userManager = userManager; this.userFactory = userFactory; this.interactions = interactions; diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs index 6d0294fca5..a681860ada 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Security; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; diff --git a/src/Squidex/Pipeline/AppResolver.cs b/src/Squidex/Pipeline/AppResolver.cs index f6b7d94449..705bfae79d 100644 --- a/src/Squidex/Pipeline/AppResolver.cs +++ b/src/Squidex/Pipeline/AppResolver.cs @@ -16,7 +16,6 @@ using Squidex.Infrastructure.Security; using Squidex.Shared; using Squidex.Shared.Identity; -using Squidex.Shared.Users; namespace Squidex.Pipeline { diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs index 278e2bb3bc..c962c2f8c6 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs @@ -428,9 +428,9 @@ public void Should_convert_asset_ids_to_urls() new ContentFieldData() .AddValue("iv", JsonValue.Array("url/to/1", "url/to/2")); - var rtesult = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "1" }), assetUrlGenerator)(source, assetsField); + var result = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "1" }), assetUrlGenerator)(source, assetsField); - Assert.Equal(expected, source); + Assert.Equal(expected, result); } [Fact] @@ -444,9 +444,9 @@ public void Should_convert_asset_ids_to_urls_for_wildcard_fields() new ContentFieldData() .AddValue("iv", JsonValue.Array("url/to/1", "url/to/2")); - var rtesult = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "*" }), assetUrlGenerator)(source, assetsField); + var result = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "*" }), assetUrlGenerator)(source, assetsField); - Assert.Equal(expected, source); + Assert.Equal(expected, result); } [Fact] @@ -460,9 +460,9 @@ public void Should_not_convert_asset_ids_to_urls_when_field_does_not_match() new ContentFieldData() .AddValue("iv", JsonValue.Array("1", "2")); - var rtesult = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "2" }), assetUrlGenerator)(source, assetsField); + var result = FieldConverters.ResolveAssetUrls(new HashSet(new[] { "2" }), assetUrlGenerator)(source, assetsField); - Assert.Equal(expected, source); + Assert.Equal(expected, result); } [Fact] @@ -476,9 +476,9 @@ public void Should_not_convert_asset_ids_to_urls_when_field_is_specified() new ContentFieldData() .AddValue("iv", JsonValue.Array("1", "2")); - var rtesult = FieldConverters.ResolveAssetUrls(null, assetUrlGenerator)(source, assetsField); + var result = FieldConverters.ResolveAssetUrls(null, assetUrlGenerator)(source, assetsField); - Assert.Equal(expected, source); + Assert.Equal(expected, result); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs index 684035e91d..453c602c98 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs @@ -269,7 +269,7 @@ public void Should_return_same_token_from_references_field_when_removing_referen private static IJsonValue CreateValue(params Guid[] ids) { - return ids == null ? (IJsonValue)JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); + return ids == null ? JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs index 019ae63f23..53bcf4106e 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs @@ -53,7 +53,7 @@ public void Should_serialize_object_to_json() { var result = sut.ToPayload(new { Value = 1 }); - Assert.True(result is string); + Assert.NotNull(result); } [Fact] @@ -63,7 +63,7 @@ public void Should_create_payload() var result = sut.ToPayload(@event); - Assert.True(result is string); + Assert.NotNull(result); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Tags/TagNormalizerTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Tags/TagNormalizerTests.cs index 6dfc8dba09..6032337d19 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Tags/TagNormalizerTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Tags/TagNormalizerTests.cs @@ -101,7 +101,7 @@ public async Task Should_denormalize_tags() Assert.Equal(JsonValue.Array("name4"), GetNestedTags(newData)); } - private IJsonValue GetNestedTags(NamedContentData newData) + private static IJsonValue GetNestedTags(NamedContentData newData) { var array = (JsonArray)newData["array"]["iv"]; var arrayItem = (JsonObject)array[0]; diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs index 9ce01da68d..c29434bb85 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs @@ -104,7 +104,7 @@ public async Task Should_add_error_if_value_has_too_much_items() private static IJsonValue CreateValue(params JsonObject[] ids) { - return ids == null ? (IJsonValue)JsonValue.Null : JsonValue.Array(ids.OfType().ToArray()); + return ids == null ? JsonValue.Null : JsonValue.Array(ids.OfType().ToArray()); } private static RootField Field(ArrayFieldProperties properties) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs index 28dfab2975..59b670dbb8 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs @@ -265,7 +265,7 @@ public async Task Should_add_error_if_image_has_invalid_extension() private static IJsonValue CreateValue(params Guid[] ids) { - return ids == null ? (IJsonValue)JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); + return ids == null ? JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); } private static RootField Field(AssetsFieldProperties properties) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs index 937ce1131c..43e8ed3cf3 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs @@ -119,7 +119,7 @@ public async Task Should_add_error_if_reference_are_not_valid() private static IJsonValue CreateValue(params Guid[] ids) { - return ids == null ? (IJsonValue)JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); + return ids == null ? JsonValue.Null : JsonValue.Array(ids.Select(x => (object)x.ToString()).ToArray()); } private static RootField Field(ReferencesFieldProperties properties) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs index 8cc8e046b0..ca970755ef 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs @@ -116,7 +116,7 @@ public async Task Should_add_error_if_value_contains_an_not_allowed_values() private static IJsonValue CreateValue(params string[] ids) { - return ids == null ? (IJsonValue)JsonValue.Null : JsonValue.Array(ids.OfType().ToArray()); + return ids == null ? JsonValue.Null : JsonValue.Array(ids.OfType().ToArray()); } private static RootField Field(TagsFieldProperties properties) diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs index f13e5ca3e5..8969e6c09a 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppGrainTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Apps { - public class AppGrainTests : HandlerTestBase + public class AppGrainTests : HandlerTestBase { private readonly IAppPlansProvider appPlansProvider = A.Fake(); private readonly IAppPlanBillingManager appPlansBillingManager = A.Fake(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/RolePermissionsProviderTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/RolePermissionsProviderTests.cs index aabeb0040c..ae797b146a 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/RolePermissionsProviderTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/RolePermissionsProviderTests.cs @@ -48,7 +48,7 @@ public async Task Should_provide_all_permissions() Assert.True(result.Contains("schemas.schema2.read")); } - private ISchemaEntity CreateSchema(string name) + private static ISchemaEntity CreateSchema(string name) { var schema = A.Fake(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs index 9d3a08544d..eac20aeba6 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs @@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { - public class AssetCommandMiddlewareTests : HandlerTestBase + public class AssetCommandMiddlewareTests : HandlerTestBase { private readonly IAssetThumbnailGenerator assetThumbnailGenerator = A.Fake(); private readonly IAssetStore assetStore = A.Fake(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs index a7ac5d7ae2..fb5d933eca 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { - public class AssetGrainTests : HandlerTestBase + public class AssetGrainTests : HandlerTestBase { private readonly ITagService tagService = A.Fake(); private readonly ImageInfo image = new ImageInfo(2048, 2048); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsGrainTests.cs index 50fe3cd201..101fe358c8 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsGrainTests.cs @@ -23,9 +23,8 @@ namespace Squidex.Domain.Apps.Entities.Comments { - public class CommentsGrainTests : HandlerTestBase + public class CommentsGrainTests : HandlerTestBase { - private readonly IAppProvider appProvider = A.Fake(); private readonly Guid commentsId = Guid.NewGuid(); private readonly CommentsGrain sut; @@ -139,11 +138,6 @@ public async Task Delete_should_create_events_and_update_state() ); } - private Task ExecuteDeleteAsync() - { - return sut.ExecuteAsync(CreateCommentsCommand(new DeleteComment())); - } - protected T CreateCommentsEvent(T @event) where T : CommentsEvent { @event.CommentsId = commentsId; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Comments/Guards/GuardCommentsTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Comments/Guards/GuardCommentsTests.cs index 6248c89e20..cb665e45a4 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Comments/Guards/GuardCommentsTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Comments/Guards/GuardCommentsTests.cs @@ -87,7 +87,7 @@ public void CanUpdate_should_throw_exception_if_comment_deleted_found() var events = new List> { Envelope.Create(new CommentCreated { CommentId = commentId, Actor = user1 }).To(), - Envelope.Create(new CommentDeleted { CommentId = commentId }).To(), + Envelope.Create(new CommentDeleted { CommentId = commentId }).To() }; Assert.Throws(() => GuardComments.CanUpdate(events, command)); @@ -141,7 +141,7 @@ public void CanDelete_should_throw_exception_if_comment_deleted() var events = new List> { Envelope.Create(new CommentCreated { CommentId = commentId, Actor = user1 }).To(), - Envelope.Create(new CommentDeleted { CommentId = commentId }).To(), + Envelope.Create(new CommentDeleted { CommentId = commentId }).To() }; Assert.Throws(() => GuardComments.CanDelete(events, command)); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs index 56bddfe271..07564c4055 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs @@ -29,7 +29,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { - public class ContentGrainTests : HandlerTestBase + public class ContentGrainTests : HandlerTestBase { private readonly ISchemaEntity schema = A.Fake(); private readonly IScriptEngine scriptEngine = A.Fake(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs index 182741bcb6..e5cf65e70d 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Entities.Rules { - public class RuleGrainTests : HandlerTestBase + public class RuleGrainTests : HandlerTestBase { private readonly IAppProvider appProvider = A.Fake(); private readonly Guid ruleId = Guid.NewGuid(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs index b16a1fa977..ac3ceb25c0 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas { - public class SchemaGrainTests : HandlerTestBase + public class SchemaGrainTests : HandlerTestBase { private readonly IAppProvider appProvider = A.Fake(); private readonly FieldRegistry registry = new FieldRegistry(new TypeNameRegistry()); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs index d10ec22015..af1f88032c 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs @@ -21,7 +21,7 @@ namespace Squidex.Domain.Apps.Entities.TestHelpers { - public abstract class HandlerTestBase where T : IDomainObjectGrain + public abstract class HandlerTestBase { private readonly IStore store = A.Fake>(); private readonly IPersistence persistence1 = A.Fake>(); diff --git a/tests/Squidex.Domain.Users.Tests/DefaultUserResolverTests.cs b/tests/Squidex.Domain.Users.Tests/DefaultUserResolverTests.cs index dcc2a645f8..1854b3f528 100644 --- a/tests/Squidex.Domain.Users.Tests/DefaultUserResolverTests.cs +++ b/tests/Squidex.Domain.Users.Tests/DefaultUserResolverTests.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; @@ -104,7 +103,7 @@ private static (IdentityUser, List) GernerateUser(string id) var claims = new List { new Claim($"{id}_a", "1"), - new Claim($"{id}_b", "2"), + new Claim($"{id}_b", "2") }; return (user, claims); diff --git a/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs b/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs index 65005939ee..cf1e98f0cf 100644 --- a/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Json/ClaimsPrincipalConverterTests.cs @@ -49,7 +49,7 @@ public void Should_serialize_and_deserialize_null_principal() var serialized = value.SerializeAndDeserialize(); - Assert.Null(value); + Assert.Null(serialized); } } } diff --git a/tests/Squidex.Infrastructure.Tests/LanguageTests.cs b/tests/Squidex.Infrastructure.Tests/LanguageTests.cs index f57e30fe76..c029837490 100644 --- a/tests/Squidex.Infrastructure.Tests/LanguageTests.cs +++ b/tests/Squidex.Infrastructure.Tests/LanguageTests.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Linq; using Squidex.Infrastructure.TestHelpers; using Xunit; @@ -37,7 +36,7 @@ public void Should_throw_exception_if_getting_by_unsupported_language() [Fact] public void Should_provide_all_languages() { - Assert.True(Language.AllLanguages.Count() > 100); + Assert.True(Language.AllLanguages.Count > 100); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Log/SemanticLogAdapterTests.cs b/tests/Squidex.Infrastructure.Tests/Log/SemanticLogAdapterTests.cs index ec9958df83..5b48fbc27d 100644 --- a/tests/Squidex.Infrastructure.Tests/Log/SemanticLogAdapterTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Log/SemanticLogAdapterTests.cs @@ -137,8 +137,6 @@ public void Should_log_message_with_exception() [Fact] public void Should_log_additional_values() { - var exception = new InvalidOperationException(); - var logger = sut.CreateLogger("my-category"); logger.LogDebug("My numbers are {number1} and {Number2}", 123, 456); @@ -157,8 +155,6 @@ public void Should_log_additional_values() [Fact] public void Should_not_log_numbers() { - var exception = new InvalidOperationException(); - var logger = sut.CreateLogger("my-category"); logger.LogDebug("My numbers are {0} and {1}", 123, 456); diff --git a/tools/Migrate_01/Rebuilder.cs b/tools/Migrate_01/Rebuilder.cs index d3bac5427c..030257d8e6 100644 --- a/tools/Migrate_01/Rebuilder.cs +++ b/tools/Migrate_01/Rebuilder.cs @@ -25,7 +25,6 @@ using Squidex.Infrastructure.Caching; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; -using Squidex.Infrastructure.Json; using Squidex.Infrastructure.States; namespace Migrate_01 @@ -34,21 +33,18 @@ public sealed class Rebuilder { private readonly FieldRegistry fieldRegistry; private readonly ILocalCache localCache; - private readonly IJsonSerializer serializer; private readonly IStore store; private readonly IEventStore eventStore; public Rebuilder( FieldRegistry fieldRegistry, ILocalCache localCache, - IJsonSerializer serializer, IStore store, IEventStore eventStore) { this.fieldRegistry = fieldRegistry; this.eventStore = eventStore; this.localCache = localCache; - this.serializer = serializer; this.store = store; }