From d1dc35c7b5f1f9f5dafa905a7a222b496dd6f1ce Mon Sep 17 00:00:00 2001 From: Collin Barrett <6483057+collinbarrett@users.noreply.github.com> Date: Tue, 27 May 2025 18:15:10 -0500 Subject: [PATCH] refactor(api): rm JB Annotations, simplify warning suppressions --- .../FilterLists.Directory.Api/OpenApi/OpenApiTags.cs | 2 -- .../FilterLists.Directory.Application.csproj | 9 +-------- .../Queries/GetLanguages.cs | 3 --- .../Queries/GetLicenses.cs | 3 --- .../Queries/GetListDetails.cs | 6 +----- .../Queries/GetLists.cs | 3 --- .../Queries/GetMaintainers.cs | 3 --- .../Queries/GetSoftware.cs | 3 --- .../Queries/GetSyntaxes.cs | 3 --- .../FilterLists.Directory.Application/Queries/GetTags.cs | 3 --- .../FilterLists.Directory.Infrastructure.csproj | 1 - .../Persistence/Queries/Entities/FilterListViewUrl.cs | 5 +---- 12 files changed, 3 insertions(+), 41 deletions(-) diff --git a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs index e61c686f1..ca682e1e6 100644 --- a/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs +++ b/services/Directory/FilterLists.Directory.Api/OpenApi/OpenApiTags.cs @@ -1,6 +1,5 @@ using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -using JetBrains.Annotations; using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.SwaggerGen; @@ -86,7 +85,6 @@ internal static class OpenApiTags } }; - [UsedImplicitly] internal sealed class TagDescriptionsDocumentFilter : IDocumentFilter { public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context) diff --git a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj index e0fd9da93..2c0fe4222 100644 --- a/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj +++ b/services/Directory/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj @@ -3,14 +3,7 @@ net9.0 true - - - - 1591;1701;1702 - - - - 1591;1701;1702 + $(NoWarn);1591 diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs index 8e2ad52b6..f1c023556 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -28,7 +27,6 @@ public static class GetLanguages public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -45,6 +43,5 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// The unique ISO 639-1 code. /// The unique ISO name. /// The identifiers of the FilterLists targeted by this Language. - [PublicAPI] public sealed record Response(short Id, string Iso6391, string Name, IEnumerable FilterListIds); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs index 15d49deff..09184c3c3 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -31,7 +30,6 @@ public static class GetLicenses public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -51,7 +49,6 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// If the License permits distribution. /// If the License permits commercial use. /// The identifiers of the FilterLists released under this License. - [PublicAPI] public sealed record Response( int Id, string Name, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs index 79230dbcf..4643e36a6 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs @@ -1,5 +1,4 @@ using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -71,7 +70,6 @@ public static class GetListDetails public sealed record Request(int Id) : IRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IRequestHandler { public Task Handle(Request request, CancellationToken _) @@ -80,8 +78,7 @@ private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IRequestH } } - // TODO: refactor to primary ctor syntax while allowing EF Core query compilation to succeed - [PublicAPI] + // TODO: refactor to primary ctor syntax while allowing EF Core query compilation to succeed public sealed record Response { /// @@ -238,6 +235,5 @@ public sealed record Response /// unique per SegmentNumber) /// /// The view URL. - [PublicAPI] public sealed record ViewUrlResponse(short SegmentNumber, short Primariness, Uri Url); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs index 39ac6155c..d2187832e 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -43,7 +42,6 @@ public static class GetLists public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -68,7 +66,6 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// The identifiers of the Tags applied to this FilterList. /// The primary view URL. /// The identifiers of the Maintainers of this FilterList. - [PublicAPI] public sealed record Response( int Id, string Name, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs index 9ad2b79cb..9cb05331e 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -30,7 +29,6 @@ public static class GetMaintainers public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -49,7 +47,6 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// The email address. /// The Twitter handle. /// The identifiers of the FilterLists maintained by this Maintainer. - [PublicAPI] public sealed record Response( int Id, string Name, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs index 72b87477e..2eda35c7b 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -33,7 +32,6 @@ public static class GetSoftware public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -58,7 +56,6 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// If the Software supports the abp: URL scheme to click-to-subscribe to a FilterList. /// /// The identifiers of the Syntaxes that this Software supports. - [PublicAPI] public sealed record Response( long Id, string Name, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs index ca40e397d..77bc5055e 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -33,7 +32,6 @@ public static class GetSyntaxes public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -52,7 +50,6 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// The URL of the home page. /// The identifiers of the FilterLists implementing this Syntax. /// The identifiers of the Software that supports this Syntax. - [PublicAPI] public sealed record Response( short Id, string Name, diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs index ef8e69c50..97163126f 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs @@ -1,7 +1,6 @@ using System.Runtime.CompilerServices; using FilterLists.Directory.Infrastructure; using FilterLists.Directory.Infrastructure.Persistence.Queries.Context; -using JetBrains.Annotations; using MediatR; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -29,7 +28,6 @@ public static class GetTags public sealed record Request : IStreamRequest; - [UsedImplicitly] private sealed class Handler(QueryDbContext ctx, IMemoryCache cache) : IStreamRequestHandler { public async IAsyncEnumerable Handle(Request request, [EnumeratorCancellation] CancellationToken ct) @@ -46,6 +44,5 @@ public async IAsyncEnumerable Handle(Request request, [EnumeratorCance /// The unique name. /// The description. /// The identifiers of the FilterLists to which this Tag is applied. - [PublicAPI] public sealed record Response(int Id, string Name, string? Description, IEnumerable FilterListIds); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj index c9ddf8901..11b3f3692 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj +++ b/services/Directory/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj @@ -6,7 +6,6 @@ - \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs index dcaec5427..df986a8ef 100644 --- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs +++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs @@ -1,8 +1,5 @@ -using JetBrains.Annotations; +namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; -namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; - -[PublicAPI] public sealed record FilterListViewUrl { public int Id { get; init; }