Browse Source

Fix warnings.

pull/940/head
Sebastian 4 years ago
parent
commit
8843778152
  1. 2
      backend/src/Migrations/Migrations/ConvertEventStore.cs
  2. 2
      backend/src/Migrations/Migrations/ConvertEventStoreAppId.cs
  3. 4
      backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/StringReferenceExtractor.cs
  4. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleContext.cs
  5. 4
      backend/src/Squidex.Domain.Apps.Entities/Apps/Templates/TemplatesClient.cs
  6. 7
      backend/src/Squidex.Infrastructure/Queries/PropertyPath.cs
  7. 10
      backend/src/Squidex.Shared/Texts.cs
  8. 2
      backend/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs
  9. 3
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryDedicatedIntegrationTests.cs
  10. 1
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryTestsBase.cs

2
backend/src/Migrations/Migrations/ConvertEventStore.cs

@ -48,7 +48,7 @@ public sealed class ConvertEventStore : MongoBase<BsonDocument>, IMigration
await collection.Find(FindAll).ForEachAsync(async commit =>
{
foreach (BsonDocument @event in commit["Events"].AsBsonArray)
foreach (BsonDocument @event in commit["Events"].AsBsonArray.OfType<BsonDocument>())
{
var meta = BsonDocument.Parse(@event["Metadata"].AsString);

2
backend/src/Migrations/Migrations/ConvertEventStoreAppId.cs

@ -53,7 +53,7 @@ public sealed class ConvertEventStoreAppId : MongoBase<BsonDocument>, IMigration
var index = 0;
foreach (BsonDocument @event in commit["Events"].AsBsonArray)
foreach (BsonDocument @event in commit["Events"].AsBsonArray.OfType<BsonDocument>())
{
var data = BsonDocument.Parse(@event["Payload"].AsString);

4
backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/StringReferenceExtractor.cs

@ -80,7 +80,7 @@ public sealed class StringReferenceExtractor
foreach (var pattern in contentsPatterns)
{
foreach (Match match in pattern.Matches(text))
foreach (Match match in pattern.Matches(text).OfType<Match>())
{
yield return DomainId.Create(match.Groups["Id"].Value);
}
@ -96,7 +96,7 @@ public sealed class StringReferenceExtractor
foreach (var pattern in assetsPatterns)
{
foreach (Match match in pattern.Matches(text))
foreach (Match match in pattern.Matches(text).OfType<Match>())
{
yield return DomainId.Create(match.Groups["Id"].Value);
}

2
backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleContext.cs

@ -10,7 +10,7 @@ using Squidex.Infrastructure;
namespace Squidex.Domain.Apps.Core.HandleRules;
public struct RuleContext
public readonly struct RuleContext
{
public NamedId<DomainId> AppId { get; init; }

4
backend/src/Squidex.Domain.Apps.Entities/Apps/Templates/TemplatesClient.cs

@ -37,7 +37,7 @@ public sealed class TemplatesClient
var text = await httpClient.GetStringAsync(url, ct);
foreach (Match match in Regex.Matches(text))
foreach (Match match in Regex.Matches(text).OfType<Match>())
{
var currentName = match.Groups["Name"].Value;
@ -65,7 +65,7 @@ public sealed class TemplatesClient
var text = await httpClient.GetStringAsync(url, ct);
foreach (Match match in Regex.Matches(text))
foreach (Match match in Regex.Matches(text).OfType<Match>())
{
var title = match.Groups["Title"].Value;

7
backend/src/Squidex.Infrastructure/Queries/PropertyPath.cs

@ -88,13 +88,6 @@ public sealed class PropertyPath : ReadonlyList<string>
return string.Join(".", this);
}
private static string Unescape(string source)
{
return source
.Replace("\\/", "/", StringComparison.OrdinalIgnoreCase)
.Replace("\\.", ".", StringComparison.OrdinalIgnoreCase);
}
private static PropertyPath Create(IEnumerable<string>? source)
{
var inner = source?.ToList();

10
backend/src/Squidex.Shared/Texts.cs

@ -15,15 +15,7 @@ namespace Squidex.Shared
public static ResourceManager ResourceManager
{
get
{
if (resourceManager == null)
{
resourceManager = new ResourceManager("Squidex.Shared.Texts", typeof(Texts).Assembly);
}
return resourceManager;
}
get => resourceManager ??= new ResourceManager("Squidex.Shared.Texts", typeof(Texts).Assembly);
}
}
}

2
backend/src/Squidex/Areas/Api/Controllers/Backups/RestoreController.cs

@ -66,7 +66,7 @@ public class RestoreController : ApiController
[ApiPermission(PermissionIds.AdminRestore)]
public async Task<IActionResult> PostRestoreJob([FromBody] RestoreRequestDto request)
{
await backupService.StartRestoreAsync(User.Token()!, request.Url, request.Name);
await backupService.StartRestoreAsync(User.Token()!, request.Url, request.Name, HttpContext.RequestAborted);
return NoContent();
}

3
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryDedicatedIntegrationTests.cs

@ -7,9 +7,6 @@
using Xunit;
#pragma warning disable SA1300 // Element should begin with upper-case letter
#pragma warning disable MA0048 // File name must match type name
namespace Squidex.Domain.Apps.Entities.Contents.MongoDb;
[Trait("Category", "Dependencies")]

1
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryTestsBase.cs

@ -14,7 +14,6 @@ using Xunit;
using F = Squidex.Infrastructure.Queries.ClrFilter;
#pragma warning disable SA1300 // Element should begin with upper-case letter
#pragma warning disable MA0048 // File name must match type name
namespace Squidex.Domain.Apps.Entities.Contents.MongoDb;

Loading…
Cancel
Save