From aa377e995660926a1414f32c7b0a3bc8af2ba227 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 13 Nov 2021 08:59:41 -0600 Subject: [PATCH] =?UTF-8?q?refactor(dir):=20=E2=99=BB=20prefer=20empty=20o?= =?UTF-8?q?ver=20null=20collections=20per=20https://docs.microsoft.com/en-?= =?UTF-8?q?us/dotnet/standard/design-guidelines/guidelines-for-collections?= =?UTF-8?q?\#collection-properties-and-return-values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/ListDetailsVm.cs | 22 +++++++++---------- .../Models/ListVm.cs | 8 +++---- .../Queries/GetLanguages.cs | 2 +- .../Queries/GetLicenses.cs | 2 +- .../Queries/GetMaintainers.cs | 2 +- .../Queries/GetSoftware.cs | 2 +- .../Queries/GetSyntaxes.cs | 4 ++-- .../Queries/GetTags.cs | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs index ba0bee30f..c5218f8be 100644 --- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs @@ -6,10 +6,10 @@ public record ListDetailsVm public string Name { get; init; } = null!; public string? Description { get; init; } public int? LicenseId { get; init; } - public IEnumerable? SyntaxIds { get; init; } - public IEnumerable? Iso6391s { get; init; } - public IEnumerable? TagIds { get; init; } - public IEnumerable? ViewUrls { get; init; } + public IReadOnlyCollection SyntaxIds { get; init; } = new HashSet(); + public IReadOnlyCollection Iso6391s { get; init; } = new HashSet(); + public IReadOnlyCollection TagIds { get; init; } = new HashSet(); + public IReadOnlyCollection ViewUrls { get; init; } = new HashSet(); public Uri? HomeUrl { get; init; } public Uri? OnionUrl { get; init; } public Uri? PolicyUrl { get; init; } @@ -19,13 +19,13 @@ public record ListDetailsVm public Uri? ChatUrl { get; init; } public string? EmailAddress { get; init; } public Uri? DonateUrl { get; init; } - public IEnumerable? MaintainerIds { get; init; } - public IEnumerable? UpstreamFilterListIds { get; init; } - public IEnumerable? ForkFilterListIds { get; init; } - public IEnumerable? IncludedInFilterListIds { get; init; } - public IEnumerable? IncludesFilterListIds { get; init; } - public IEnumerable? DependencyFilterListIds { get; init; } - public IEnumerable? DependentFilterListIds { get; init; } + public IReadOnlyCollection MaintainerIds { get; init; } = new HashSet(); + public IReadOnlyCollection UpstreamFilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection ForkFilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection IncludedInFilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection IncludesFilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection DependencyFilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection DependentFilterListIds { get; init; } = new HashSet(); public record ViewUrlVm { diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs index c07ed4a64..e33e31112 100644 --- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs +++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListVm.cs @@ -6,9 +6,9 @@ public record ListVm public string Name { get; init; } = null!; public string? Description { get; init; } public int? LicenseId { get; init; } - public IEnumerable? SyntaxIds { get; init; } - public IEnumerable? Iso6391s { get; init; } - public IEnumerable? TagIds { get; init; } + public IReadOnlyCollection SyntaxIds { get; init; } = new HashSet(); + public IReadOnlyCollection Iso6391s { get; init; } = new HashSet(); + public IReadOnlyCollection TagIds { get; init; } = new HashSet(); public Uri? PrimaryViewUrl { get; init; } - public IEnumerable? MaintainerIds { get; init; } + public IReadOnlyCollection MaintainerIds { get; init; } = new HashSet(); } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs index 8cd107658..fb6ed5179 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs @@ -50,6 +50,6 @@ public record LanguageVm { public string Iso6391 { get; init; } = null!; public string Name { get; init; } = null!; - public IEnumerable? FilterListIds { get; init; } + public IReadOnlyCollection FilterListIds { get; init; } = new HashSet(); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs index d60d4cd5d..23edc6cdb 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs @@ -52,6 +52,6 @@ public record LicenseVm public bool PermitsModification { get; init; } public bool PermitsDistribution { get; init; } public bool PermitsCommercialUse { get; init; } - public IEnumerable? FilterListIds { get; init; } + public IReadOnlyCollection FilterListIds { get; init; } = new HashSet(); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs index d3a9a2fd6..2aa4d47c2 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs @@ -52,6 +52,6 @@ public record MaintainerVm public Uri? Url { get; init; } public string? EmailAddress { get; init; } public string? TwitterHandle { get; init; } - public IEnumerable? FilterListIds { get; init; } + public IReadOnlyCollection FilterListIds { get; init; } = new HashSet(); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs index 10ad539f8..3a79a559f 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs @@ -52,6 +52,6 @@ public record SoftwareVm public Uri? HomeUrl { get; init; } public Uri? DownloadUrl { get; init; } public bool SupportsAbpUrlScheme { get; init; } - public IEnumerable? SyntaxIds { get; init; } + public IReadOnlyCollection SyntaxIds { get; init; } = new HashSet(); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs index dfdfc9ff1..773f58e0f 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs @@ -53,7 +53,7 @@ public record SyntaxVm public string Name { get; init; } = null!; public string? Description { get; init; } public Uri? Url { get; init; } - public IEnumerable? FilterListIds { get; init; } - public IEnumerable? SoftwareIds { get; init; } + public IReadOnlyCollection FilterListIds { get; init; } = new HashSet(); + public IReadOnlyCollection SoftwareIds { get; init; } = new HashSet(); } } diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs index da3a45ac2..5e53674c5 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs @@ -49,6 +49,6 @@ public record TagVm public int Id { get; init; } public string Name { get; init; } = null!; public string? Description { get; init; } - public IEnumerable? FilterListIds { get; init; } + public IReadOnlyCollection FilterListIds { get; init; } = new HashSet(); } }