chore: removed unused obsolete methods, fixed some tests that still relied on these methods

maurei · maurei · commit a47f0f375d16 · 2019-06-17T12:38:05.000+02:00
diff --git a/benchmarks/Serialization/JsonApiDeserializer_Benchmarks.cs b/benchmarks/Serialization/JsonApiDeserializer_Benchmarks.cs
@@ -45,9 +45,8 @@ public JsonApiDeserializer_Benchmarks() {
             jsonApiOptions.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
             jsonApiContextMock.Setup(m => m.Options).Returns(jsonApiOptions);
 
-            var genericProcessorFactoryMock = new Mock<IGenericProcessorFactory>();
 
-            _jsonApiDeSerializer = new JsonApiDeSerializer(jsonApiContextMock.Object, genericProcessorFactoryMock.Object);
+            _jsonApiDeSerializer = new JsonApiDeSerializer(jsonApiContextMock.Object);
         }
 
         [Benchmark]
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoCollectionsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoCollectionsController.cs
@@ -33,7 +33,7 @@ public override async Task<IActionResult> PatchAsync(Guid id, [FromBody] TodoIte
             if (entity.Name == "PRE-ATTACH-TEST")
             {
                 var targetTodoId = entity.TodoItems.First().Id;
-                var todoItemContext = _dbResolver.GetDbSet<TodoItem>();
+                var todoItemContext = _dbResolver.GetContext().Set<TodoItem>();
                 await todoItemContext.Where(ti => ti.Id == targetTodoId).FirstOrDefaultAsync();
             }
             return await base.PatchAsync(id, entity);
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
@@ -181,12 +181,6 @@ public class JsonApiOptions
         /// </example>
         public bool ValidateModelState { get; set; }
 
-        [Obsolete("JsonContract resolver can now be set on SerializerSettings.")]
-        public IContractResolver JsonContractResolver
-        {
-            get => SerializerSettings.ContractResolver;
-            set => SerializerSettings.ContractResolver = value;
-        }
         public JsonSerializerSettings SerializerSettings { get; } = new JsonSerializerSettings()
         {
             NullValueHandling = NullValueHandling.Ignore,
diff --git a/src/JsonApiDotNetCore/Data/DbContextResolver.cs b/src/JsonApiDotNetCore/Data/DbContextResolver.cs
@@ -15,7 +15,7 @@ public DbContextResolver(TContext context)
 
         public DbContext GetContext() => _context;
 
-        public DbSet<TEntity> GetDbSet<TEntity>() where TEntity : class
-            => _context.GetDbSet<TEntity>();
+        public DbSet<TEntity> GetDbSet<TEntity>() where TEntity : class =>  null;
+
     }
 }
diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs
@@ -56,7 +56,7 @@ public DefaultEntityRepository(
             ResourceDefinition<TEntity> resourceDefinition = null)
         {
             _context = contextResolver.GetContext();
-            _dbSet = contextResolver.GetDbSet<TEntity>();
+            _dbSet = _context.Set<TEntity>();
             _jsonApiContext = jsonApiContext;
             _genericProcessorFactory = _jsonApiContext.GenericProcessorFactory;
             _resourceDefinition = resourceDefinition;
@@ -69,7 +69,7 @@ public DefaultEntityRepository(
             ResourceDefinition<TEntity> resourceDefinition = null)
         {
             _context = contextResolver.GetContext();
-            _dbSet = contextResolver.GetDbSet<TEntity>();
+            _dbSet = _context.Set<TEntity>();
             _jsonApiContext = jsonApiContext;
             _logger = loggerFactory.CreateLogger<DefaultEntityRepository<TEntity, TId>>();
             _genericProcessorFactory = _jsonApiContext.GenericProcessorFactory;
diff --git a/src/JsonApiDotNetCore/Data/IDbContextResolver.cs b/src/JsonApiDotNetCore/Data/IDbContextResolver.cs
@@ -1,10 +1,13 @@
+using System;
 using Microsoft.EntityFrameworkCore;
 
 namespace JsonApiDotNetCore.Data
 {
     public interface IDbContextResolver
     {
         DbContext GetContext();
+
+        [Obsolete("Use DbContext.Set<TEntity>() instead", error: true)]
         DbSet<TEntity> GetDbSet<TEntity>() 
             where TEntity : class;
     }
diff --git a/src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs b/src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs
@@ -30,15 +30,6 @@ private static MethodInfo ContainsMethod
             }
         }
 
-        [Obsolete("Use overload Sort<T>(IJsonApiContext, List<SortQuery>) instead.", error: true)]
-        public static IQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, List<SortQuery> sortQueries) => null;
-
-        [Obsolete("Use overload Sort<T>(IJsonApiContext, SortQuery) instead.", error: true)]
-        public static IOrderedQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, SortQuery sortQuery) => null;
-
-        [Obsolete("Use overload Sort<T>(IJsonApiContext, SortQuery) instead.", error: true)]
-        public static IOrderedQueryable<TSource> Sort<TSource>(this IOrderedQueryable<TSource> source, SortQuery sortQuery) => null;
-
         public static IQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, IJsonApiContext jsonApiContext, List<SortQuery> sortQueries)
         {
             if (sortQueries == null || sortQueries.Count == 0)
diff --git a/src/JsonApiDotNetCore/Extensions/ModelStateExtensions.cs b/src/JsonApiDotNetCore/Extensions/ModelStateExtensions.cs
@@ -7,26 +7,6 @@ namespace JsonApiDotNetCore.Extensions
 {
     public static class ModelStateExtensions
     {
-        [Obsolete("Use Generic Method ConvertToErrorCollection<T>(IResourceGraph resourceGraph) instead for full validation errors")]
-        public static ErrorCollection ConvertToErrorCollection(this ModelStateDictionary modelState)
-        {
-            ErrorCollection collection = new ErrorCollection();
-            foreach (var entry in modelState)
-            {
-                if (entry.Value.Errors.Any() == false)
-                    continue;
-
-                foreach (var modelError in entry.Value.Errors)
-                {
-                    if (modelError.Exception is JsonApiException jex)
-                        collection.Errors.AddRange(jex.GetError().Errors);
-                    else
-                        collection.Errors.Add(new Error(400, entry.Key, modelError.ErrorMessage, modelError.Exception != null ? ErrorMeta.FromException(modelError.Exception) : null));
-                }
-            }
-
-            return collection;
-        }
         public static ErrorCollection ConvertToErrorCollection<T>(this ModelStateDictionary modelState, IResourceGraph resourceGraph)
         {
             ErrorCollection collection = new ErrorCollection();
diff --git a/src/JsonApiDotNetCore/Internal/ContextGraph.cs b/src/JsonApiDotNetCore/Internal/ContextGraph.cs
diff --git a/src/JsonApiDotNetCore/Internal/Error.cs b/src/JsonApiDotNetCore/Internal/Error.cs
@@ -9,17 +9,7 @@ namespace JsonApiDotNetCore.Internal
 {
     public class Error
     {
-        public Error()
-        { }
-
-        [Obsolete("Use Error constructors with int typed status")]
-        public Error(string status, string title, ErrorMeta meta = null, object source = null)
-        {
-            Status = status;
-            Title = title;
-            Meta = meta;
-            Source = source;
-        }
+        public Error() { }
 
         public Error(int status, string title, ErrorMeta meta = null, object source = null)
         {
@@ -29,16 +19,6 @@ public Error(int status, string title, ErrorMeta meta = null, object source = nu
             Source = source;
         }
 
-        [Obsolete("Use Error constructors with int typed status")]
-        public Error(string status, string title, string detail, ErrorMeta meta = null, object source = null)
-        {
-            Status = status;
-            Title = title;
-            Detail = detail;
-            Meta = meta;
-            Source = source;
-        }
-
         public Error(int status, string title, string detail, ErrorMeta meta = null, object source = null)
         {
             Status = status.ToString();
diff --git a/src/JsonApiDotNetCore/Internal/JsonApiException.cs b/src/JsonApiDotNetCore/Internal/JsonApiException.cs
@@ -14,17 +14,7 @@ public JsonApiException(ErrorCollection errorCollection)
 
         public JsonApiException(Error error)
         : base(error.Title) => _errors.Add(error);
-
-        [Obsolete("Use int statusCode overload instead")]
-        public JsonApiException(string statusCode, string message, string source = null)
-        : base(message)
-            => _errors.Add(new Error(statusCode, message, null, GetMeta(), source));
-
-        [Obsolete("Use int statusCode overload instead")]
-        public JsonApiException(string statusCode, string message, string detail, string source = null)
-        : base(message)
-            => _errors.Add(new Error(statusCode, message, detail, GetMeta(), source));
-
+            
         public JsonApiException(int statusCode, string message, string source = null)
         : base(message)
             => _errors.Add(new Error(statusCode, message, null, GetMeta(), source));
diff --git a/src/JsonApiDotNetCore/Internal/Query/AttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/AttrFilterQuery.cs
@@ -16,11 +16,6 @@ public AttrFilterQuery(
 
             if (Attribute.IsFilterable == false)
                 throw new JsonApiException(400, $"Filter is not allowed for attribute '{Attribute.PublicAttributeName}'.");
-
-            FilteredAttribute = Attribute;
         }
-
-        [Obsolete("Use " + nameof(BaseAttrQuery.Attribute) + " instead.")]
-        public AttrAttribute FilteredAttribute { get; set; }
     }
 }
diff --git a/src/JsonApiDotNetCore/Internal/Query/FilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/FilterQuery.cs
@@ -20,13 +20,10 @@ public class FilterQuery : BaseQuery
         public FilterQuery(string attribute, string value, string operation)
             : base(attribute)
         {
-            Key = attribute.ToProperCase();
             Value = value;
             Operation = operation;
         }
 
-        [Obsolete("Key has been replaced by '" + nameof(Attribute) + "'. Members should be located by their public name, not by coercing the provided value to the internal name.")]
-        public string Key { get; set; }
         public string Value { get; set; }
         public string Operation { get; set; }
 
diff --git a/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs
@@ -19,15 +19,7 @@ public RelatedAttrFilterQuery(
 
             if (Attribute.IsFilterable == false)
                 throw new JsonApiException(400, $"Filter is not allowed for attribute '{Attribute.PublicAttributeName}'.");
-
-            FilteredRelationship = Relationship;
-            FilteredAttribute = Attribute;
+                
         }
-
-        [Obsolete("Use " + nameof(Attribute) + " instead.")]
-        public AttrAttribute FilteredAttribute { get; set; }
-
-        [Obsolete("Use " + nameof(Relationship) + " instead.")]
-        public RelationshipAttribute FilteredRelationship { get; set; }
     }
 }
diff --git a/src/JsonApiDotNetCore/Internal/Query/SortQuery.cs b/src/JsonApiDotNetCore/Internal/Query/SortQuery.cs
@@ -8,10 +8,6 @@ namespace JsonApiDotNetCore.Internal.Query
     /// </summary>
     public class SortQuery : BaseQuery
     {
-        [Obsolete("Use constructor overload (SortDirection, string) instead. The string should be the publicly exposed attribute name.", error: true)]
-        public SortQuery(SortDirection direction, AttrAttribute sortedAttribute)
-            : base(sortedAttribute.PublicAttributeName) { }
-
         public SortQuery(SortDirection direction, string attribute)
             : base(attribute)
         {
@@ -22,8 +18,5 @@ public SortQuery(SortDirection direction, string attribute)
         /// Direction the sort should be applied
         /// </summary>
         public SortDirection Direction { get; set; }
-
-        [Obsolete("Use string based Attribute instead.", error: true)]
-        public AttrAttribute SortedAttribute { get; set; }
     }
 }
diff --git a/src/JsonApiDotNetCore/Models/Identifiable.cs b/src/JsonApiDotNetCore/Models/Identifiable.cs
@@ -62,11 +62,5 @@ protected virtual T GetTypedId(string value)
             var convertedValue = TypeHelper.ConvertType(value, typeof(T));
             return convertedValue == null ? default : (T)convertedValue;
         }
-
-        [Obsolete("Use GetTypedId instead")]
-        protected virtual object GetConcreteId(string value)
-        {
-            return TypeHelper.ConvertType(value, typeof(T));
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs b/src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs
@@ -18,16 +18,6 @@ public class JsonApiDeSerializer : IJsonApiDeSerializer
     {
         private readonly IJsonApiContext _jsonApiContext;
 
-        [Obsolete(
-            "The deserializer no longer depends on the IGenericProcessorFactory",
-            error: false)]
-        public JsonApiDeSerializer(
-            IJsonApiContext jsonApiContext,
-            IGenericProcessorFactory genericProcessorFactory)
-        {
-            _jsonApiContext = jsonApiContext;
-        }
-
         public JsonApiDeSerializer(IJsonApiContext jsonApiContext)
         {
             _jsonApiContext = jsonApiContext;
diff --git a/src/JsonApiDotNetCore/Services/IJsonApiContext.cs b/src/JsonApiDotNetCore/Services/IJsonApiContext.cs
@@ -139,9 +139,6 @@ public interface IJsonApiRequest : IJsonApiApplication, IUpdateRequest, IQueryRe
         /// If the request is on the `{id}/relationships/{relationshipName}` route
         /// </summary>
         bool IsRelationshipPath { get; }
-
-        [Obsolete("Use `IsRelationshipPath` instead.")]
-        bool IsRelationshipData { get; set; }
     }
 
     public interface IJsonApiContext : IJsonApiRequest
@@ -150,9 +147,6 @@ public interface IJsonApiContext : IJsonApiRequest
         IMetaBuilder MetaBuilder { get; set; }
         IGenericProcessorFactory GenericProcessorFactory { get; set; }
 
-        [Obsolete("Use the proxied method IControllerContext.GetControllerAttribute instead.")]
-        TAttribute GetControllerAttribute<TAttribute>() where TAttribute : Attribute;
-
         /// <summary>
         /// **_Experimental_**: do not use. It is likely to change in the future.
         /// 
diff --git a/src/JsonApiDotNetCore/Services/JsonApiContext.cs b/src/JsonApiDotNetCore/Services/JsonApiContext.cs
@@ -139,10 +139,6 @@ private PageManager GetPageManager()
             };
         }
 
-        [Obsolete("Use the proxied method IControllerContext.GetControllerAttribute instead.")]
-        public TAttribute GetControllerAttribute<TAttribute>() where TAttribute : Attribute
-            => _controllerContext.GetControllerAttribute<TAttribute>();
-
         public void BeginOperation()
         {
             IncludedRelationships = new List<string>();
diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
@@ -5,6 +5,7 @@
 using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
@@ -14,7 +15,16 @@ namespace DiscoveryTests
     public class ServiceDiscoveryFacadeTests
     {
         private readonly IServiceCollection _services = new ServiceCollection();
-        private readonly ResourceGraphBuilder _graphBuilder = new ResourceGraphBuilder();
+        private readonly ResourceGraphBuilder _graphBuilder = new ResourceGraphBuilder();
+
+        public ServiceDiscoveryFacadeTests()
+        {
+            var contextMock = new Mock<DbContext>();
+            var dbResolverMock = new Mock<IDbContextResolver>();
+            dbResolverMock.Setup(m => m.GetContext()).Returns(new Mock<DbContext>().Object);
+            TestModelRepository._dbContextResolver = dbResolverMock.Object;
+        }
+
         private ServiceDiscoveryFacade _facade => new ServiceDiscoveryFacade(_services, _graphBuilder);
 
         [Fact]
@@ -79,7 +89,7 @@ public TestModelService() : base(_jsonApiContext, _repo) { }
 
         public class TestModelRepository : DefaultEntityRepository<TestModel>
         {
-            private static IDbContextResolver _dbContextResolver = new  Mock<IDbContextResolver>().Object;
+            internal static IDbContextResolver _dbContextResolver;
             private static IJsonApiContext _jsonApiContext = new  Mock<IJsonApiContext>().Object;
             public TestModelRepository() : base(_jsonApiContext, _dbContextResolver) { }
         }
diff --git a/test/UnitTests/Data/DefaultEntityRepository_Tests.cs b/test/UnitTests/Data/DefaultEntityRepository_Tests.cs
@@ -77,14 +77,15 @@ public async Task UpdateAsync_Updates_Attributes_In_AttributesToUpdate()
 
         private DefaultEntityRepository<TodoItem> GetRepository()
         {
+
+            _contextMock
+                .Setup(m => m.Set<TodoItem>())
+                .Returns(_dbSetMock.Object);
+
             _contextResolverMock
                 .Setup(m => m.GetContext())
                 .Returns(_contextMock.Object);
 
-            _contextResolverMock
-                .Setup(m => m.GetDbSet<TodoItem>())
-                .Returns(_dbSetMock.Object);
-
             _jsonApiContextMock
                .Setup(m => m.AttributesToUpdate)
                .Returns(_attrsToUpdate);
diff --git a/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs b/test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs
@@ -343,7 +343,6 @@ IDbContextResolver CreateTestDbResolver<TModel>(AppDbContext dbContext) where TM
         {
             var mock = new Mock<IDbContextResolver>();
             mock.Setup(r => r.GetContext()).Returns(dbContext);
-            mock.Setup(r => r.GetDbSet<TModel>()).Returns(dbContext.Set<TModel>());
             return mock.Object;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ public JsonApiDeserializer_Benchmarks() {`
`45`	`45`	`jsonApiOptions.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();`
`46`	`46`	`jsonApiContextMock.Setup(m => m.Options).Returns(jsonApiOptions);`
`47`	`47`
`48`		`- var genericProcessorFactoryMock = new Mock<IGenericProcessorFactory>();`
`49`	`48`
`50`		`- _jsonApiDeSerializer = new JsonApiDeSerializer(jsonApiContextMock.Object, genericProcessorFactoryMock.Object);`
	`49`	`+ _jsonApiDeSerializer = new JsonApiDeSerializer(jsonApiContextMock.Object);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`[Benchmark]`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override async Task<IActionResult> PatchAsync(Guid id, [FromBody] TodoIte`
`33`	`33`	`if (entity.Name == "PRE-ATTACH-TEST")`
`34`	`34`	`{`
`35`	`35`	`var targetTodoId = entity.TodoItems.First().Id;`
`36`		`- var todoItemContext = _dbResolver.GetDbSet<TodoItem>();`
	`36`	`+ var todoItemContext = _dbResolver.GetContext().Set<TodoItem>();`
`37`	`37`	`await todoItemContext.Where(ti => ti.Id == targetTodoId).FirstOrDefaultAsync();`
`38`	`38`	`}`
`39`	`39`	`return await base.PatchAsync(id, entity);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public DbContextResolver(TContext context)`
`15`	`15`
`16`	`16`	`public DbContext GetContext() => _context;`
`17`	`17`
`18`		`- public DbSet<TEntity> GetDbSet<TEntity>() where TEntity : class`
`19`		`- => _context.GetDbSet<TEntity>();`
	`18`	`+ public DbSet<TEntity> GetDbSet<TEntity>() where TEntity : class => null;`
	`19`	`+`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,13 @@`
	`1`	`+using System;`
`1`	`2`	`using Microsoft.EntityFrameworkCore;`
`2`	`3`
`3`	`4`	`namespace JsonApiDotNetCore.Data`
`4`	`5`	`{`
`5`	`6`	`public interface IDbContextResolver`
`6`	`7`	`{`
`7`	`8`	`DbContext GetContext();`
	`9`	`+`
	`10`	`+ [Obsolete("Use DbContext.Set<TEntity>() instead", error: true)]`
`8`	`11`	`DbSet<TEntity> GetDbSet<TEntity>()`
`9`	`12`	`where TEntity : class;`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,6 @@ private static MethodInfo ContainsMethod`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- [Obsolete("Use overload Sort<T>(IJsonApiContext, List<SortQuery>) instead.", error: true)]`
`34`		`- public static IQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, List<SortQuery> sortQueries) => null;`
`35`		`-`
`36`		`- [Obsolete("Use overload Sort<T>(IJsonApiContext, SortQuery) instead.", error: true)]`
`37`		`- public static IOrderedQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, SortQuery sortQuery) => null;`
`38`		`-`
`39`		`- [Obsolete("Use overload Sort<T>(IJsonApiContext, SortQuery) instead.", error: true)]`
`40`		`- public static IOrderedQueryable<TSource> Sort<TSource>(this IOrderedQueryable<TSource> source, SortQuery sortQuery) => null;`
`41`		`-`
`42`	`33`	`public static IQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, IJsonApiContext jsonApiContext, List<SortQuery> sortQueries)`
`43`	`34`	`{`
`44`	`35`	`if (sortQueries == null \|\| sortQueries.Count == 0)`