From 3ddc697ed1679555a54d3c9b72da9e781ceab110 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 1 Jul 2019 15:32:24 -0500 Subject: [PATCH] avoid empty interface https://stackoverflow.com/a/20189040/2343739 --- src/FilterLists.Agent/Core/Entities/IEntityUrls.cs | 6 ------ src/FilterLists.Agent/Core/Interfaces/IUrlsRepository.cs | 3 +-- src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs | 3 +-- src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs | 3 +-- .../Features/Urls/Models/MaintainerUrls.cs | 3 +-- src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs | 3 +-- src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs | 3 +-- .../Infrastructure/Repositories/UrlsRepository.cs | 5 ++--- 8 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 src/FilterLists.Agent/Core/Entities/IEntityUrls.cs diff --git a/src/FilterLists.Agent/Core/Entities/IEntityUrls.cs b/src/FilterLists.Agent/Core/Entities/IEntityUrls.cs deleted file mode 100644 index a89681c65..000000000 --- a/src/FilterLists.Agent/Core/Entities/IEntityUrls.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace FilterLists.Agent.Core.Entities -{ - public interface IEntityUrls - { - } -} \ No newline at end of file diff --git a/src/FilterLists.Agent/Core/Interfaces/IUrlsRepository.cs b/src/FilterLists.Agent/Core/Interfaces/IUrlsRepository.cs index cddf29725..d7d352533 100644 --- a/src/FilterLists.Agent/Core/Interfaces/IUrlsRepository.cs +++ b/src/FilterLists.Agent/Core/Interfaces/IUrlsRepository.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using FilterLists.Agent.Core.Entities; namespace FilterLists.Agent.Core.Interfaces { public interface IUrlsRepository { - Task> GetAllAsync() where TEntityUrls : IEntityUrls, new(); + Task> GetAllAsync(); } } \ No newline at end of file diff --git a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs index 89109101b..3ec2ae416 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs @@ -1,11 +1,10 @@ using System; -using FilterLists.Agent.Core.Entities; using JetBrains.Annotations; namespace FilterLists.Agent.Features.Urls.Models { [UsedImplicitly] - public class LicenseUrls : IEntityUrls + public class LicenseUrls { public Uri DescriptionUrl { get; set; } } diff --git a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs index e91239f0e..484ecf9d1 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs @@ -1,11 +1,10 @@ using System; -using FilterLists.Agent.Core.Entities; using JetBrains.Annotations; namespace FilterLists.Agent.Features.Urls.Models { [UsedImplicitly] - public class ListUrls : IEntityUrls + public class ListUrls { public Uri ChatUrl { get; private set; } public Uri DescriptionSourceUrl { get; private set; } diff --git a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs index c7e717e41..ca1e66242 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs @@ -1,11 +1,10 @@ using System; -using FilterLists.Agent.Core.Entities; using JetBrains.Annotations; namespace FilterLists.Agent.Features.Urls.Models { [UsedImplicitly] - public class MaintainerUrls : IEntityUrls + public class MaintainerUrls { public Uri HomeUrl { get; set; } } diff --git a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs index 8ec6a8b73..618a506d9 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs @@ -1,11 +1,10 @@ using System; -using FilterLists.Agent.Core.Entities; using JetBrains.Annotations; namespace FilterLists.Agent.Features.Urls.Models { [UsedImplicitly] - public class SoftwareUrls : IEntityUrls + public class SoftwareUrls { public Uri DownloadUrl { get; set; } public Uri HomeUrl { get; set; } diff --git a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs index 0a944d830..daa862e9f 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs @@ -1,11 +1,10 @@ using System; -using FilterLists.Agent.Core.Entities; using JetBrains.Annotations; namespace FilterLists.Agent.Features.Urls.Models { [UsedImplicitly] - public class SyntaxUrls : IEntityUrls + public class SyntaxUrls { public Uri DefinitionUrl { get; set; } } diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs index 005bb65d7..d2f591d2d 100644 --- a/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs +++ b/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FilterLists.Agent.Core.Entities; using FilterLists.Agent.Core.Interfaces; using FilterLists.Agent.Features.Urls.Models; using FilterLists.Agent.Infrastructure.Clients; @@ -19,7 +18,7 @@ public UrlsRepository(IFilterListsApiClient apiClient) _apiClient = apiClient; } - public async Task> GetAllAsync() where TEntityUrls : IEntityUrls, new() + public async Task> GetAllAsync() { var endpoint = BuildEndpoint(); var request = new RestRequest(endpoint); @@ -28,7 +27,7 @@ public UrlsRepository(IFilterListsApiClient apiClient) .Where(u => u != null); } - private static string BuildEndpoint() where TEntityUrls : IEntityUrls, new() + private static string BuildEndpoint() { string endpointSuffix; switch (typeof(TEntityUrls).Name)