From 624dcd228534827886e0112eedac7d15fd63036d Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 17 Apr 2017 15:29:33 -0500 Subject: [PATCH] add back commented dependencies, optimize references --- src/FilterLists.Data/FilterLists.Data.csproj | 1 + src/FilterLists.Data/Models/BaseEntity.cs | 13 +++++------- src/FilterLists.Data/Models/List.cs | 21 +++++++++---------- .../Implementations/ListRepository.cs | 5 ++--- .../Implementations/ListService.cs | 5 ++--- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/FilterLists.Data/FilterLists.Data.csproj b/src/FilterLists.Data/FilterLists.Data.csproj index b6b7776ab..88fc3e323 100644 --- a/src/FilterLists.Data/FilterLists.Data.csproj +++ b/src/FilterLists.Data/FilterLists.Data.csproj @@ -6,6 +6,7 @@ + diff --git a/src/FilterLists.Data/Models/BaseEntity.cs b/src/FilterLists.Data/Models/BaseEntity.cs index 8c12ec99a..6a2066418 100644 --- a/src/FilterLists.Data/Models/BaseEntity.cs +++ b/src/FilterLists.Data/Models/BaseEntity.cs @@ -1,11 +1,8 @@ -//https://code.msdn.microsoft.com/Generic-Repository-Pattern-f133bca4/sourcecode?fileId=164016&pathId=1938870460 - -using System; +using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; - -//using JetBrains.Annotations; +using JetBrains.Annotations; namespace FilterLists.Data.Models { @@ -13,18 +10,18 @@ public abstract class BaseEntity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - //[UsedImplicitly] + [UsedImplicitly] public long Id { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Identity)] //TODO: Implement http://stackoverflow.com/a/38102266/2343739 so DefaultValue takes effect in db automatically //For now, manually execute on new tables: InitializeNewTableBaseEntityDefaults.sql [DefaultValue("CURRENT_TIMESTAMP")] - //[UsedImplicitly] + [UsedImplicitly] public DateTime AddedDateUtc { get; set; } [DatabaseGenerated(DatabaseGeneratedOption.Computed)] - //[UsedImplicitly] + [UsedImplicitly] public DateTime? ModifiedDateUtc { get; set; } } } \ No newline at end of file diff --git a/src/FilterLists.Data/Models/List.cs b/src/FilterLists.Data/Models/List.cs index b41851c1c..578982cff 100644 --- a/src/FilterLists.Data/Models/List.cs +++ b/src/FilterLists.Data/Models/List.cs @@ -1,53 +1,52 @@ using System.ComponentModel.DataAnnotations; - -//using JetBrains.Annotations; +using JetBrains.Annotations; namespace FilterLists.Data.Models { public class List : BaseEntity { [MaxLength(1022)] - //[UsedImplicitly] + [UsedImplicitly] public string Description { get; set; } [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string DescriptionSourceUrl { get; set; } [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string DonateUrl { get; set; } [MaxLength(126)] [MinLength(7)] - //[UsedImplicitly] + [UsedImplicitly] public string Email { get; set; } [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string ForumUrl { get; set; } [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string HomeUrl { get; set; } [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string IssuesUrl { get; set; } [MaxLength(126)] - //[UsedImplicitly] + [UsedImplicitly] public string Name { get; set; } [Required] [MaxLength(2083)] [MinLength(6)] - //[UsedImplicitly] + [UsedImplicitly] public string ViewUrl { get; set; } } } \ No newline at end of file diff --git a/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs b/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs index d428a6122..de668daee 100644 --- a/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs +++ b/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs @@ -3,12 +3,11 @@ using FilterLists.Data.Contexts; using FilterLists.Data.Models; using FilterLists.Data.Repositories.Contracts; - -//using JetBrains.Annotations; +using JetBrains.Annotations; namespace FilterLists.Data.Repositories.Implementations { - //[UsedImplicitly] + [UsedImplicitly] public class ListRepository : IListRepository { private readonly FilterListsDbContext _filterListsDbContext; diff --git a/src/FilterLists.Services/Implementations/ListService.cs b/src/FilterLists.Services/Implementations/ListService.cs index 6b5a6f11d..90c8ced26 100644 --- a/src/FilterLists.Services/Implementations/ListService.cs +++ b/src/FilterLists.Services/Implementations/ListService.cs @@ -2,12 +2,11 @@ using FilterLists.Data.Models; using FilterLists.Data.Repositories.Contracts; using FilterLists.Services.Contracts; - -//using JetBrains.Annotations; +using JetBrains.Annotations; namespace FilterLists.Services.Implementations { - //[UsedImplicitly] + [UsedImplicitly] public class ListService : IListService { private readonly IListRepository _listRepository;