Added ISystemClock dependency to Passport

Replaced usages of DateTime.Now with ISystemClock or constants
Added IResourceFactory/DefaultResourceFactory to abstract creating resource instances

Author: Bart Koelman

benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.Design;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
@@ -38,7 +39,7 @@ public JsonApiDeserializerBenchmarks()
             IResourceGraph resourceGraph = DependencyFactory.CreateResourceGraph(options);
             var targetedFields = new TargetedFields();
 
-            _jsonApiDeserializer = new RequestDeserializer(resourceGraph, new ServiceContainer(), targetedFields);
+            _jsonApiDeserializer = new RequestDeserializer(resourceGraph, new DefaultResourceFactory(new ServiceContainer()), targetedFields);
         }
 
         [Benchmark]

src/Examples/JsonApiDotNetCoreExample/Models/Passport.cs

@@ -3,11 +3,14 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Data;
+using Microsoft.AspNetCore.Authentication;
 
 namespace JsonApiDotNetCoreExample.Models
 {
     public class Passport : Identifiable
     {
+        private readonly ISystemClock _systemClock;
         private int? _socialSecurityNumber;
 
         [Attr]
@@ -18,7 +21,7 @@ public int? SocialSecurityNumber
             {
                 if (value != _socialSecurityNumber)
                 {
-                    LastSocialSecurityNumberChange = DateTime.Now;
+                    LastSocialSecurityNumberChange = _systemClock.UtcNow.LocalDateTime;
                     _socialSecurityNumber = value;
                 }
             }
@@ -60,5 +63,10 @@ public string BirthCountryName
 
         [EagerLoad]
         public ICollection<Visa> GrantedVisas { get; set; }
+
+        public Passport(AppDbContext appDbContext)
+        {
+            _systemClock = appDbContext.SystemClock;
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.RequestServices;
 
 namespace JsonApiDotNetCoreExample.Services
@@ -21,8 +22,9 @@ public CustomArticleService(
             IResourceRepository<Article, int> repository,
             IResourceContextProvider provider,
             IResourceChangeTracker<Article> resourceChangeTracker,
+            IResourceFactory resourceFactory,
             IResourceHookExecutor hookExecutor = null)
-            : base(queryParameters, options, loggerFactory, repository, provider, resourceChangeTracker, hookExecutor)
+            : base(queryParameters, options, loggerFactory, repository, provider, resourceChangeTracker, resourceFactory, hookExecutor)
         { }
 
         public override async Task<Article> GetAsync(int id)

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -188,6 +188,7 @@ public void ConfigureServices()
             _services.AddScoped<IFieldsToSerialize, FieldsToSerialize>();
             _services.AddScoped(typeof(IResourceChangeTracker<>), typeof(DefaultResourceChangeTracker<>));
             _services.AddScoped<IQueryParameterActionFilter, QueryParameterActionFilter>();
+            _services.AddScoped<IResourceFactory, DefaultResourceFactory>();
 
             AddServerSerialization();
             AddQueryParameterServices();

src/JsonApiDotNetCore/Internal/IResourceFactory.cs

@@ -0,0 +1,57 @@
+using System;
+using JsonApiDotNetCore.Extensions;
+using JsonApiDotNetCore.Models;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace JsonApiDotNetCore.Internal
+{
+    public interface IResourceFactory
+    {
+        public IIdentifiable CreateInstance(Type resourceType);
+        public TResource CreateInstance<TResource>() where TResource : IIdentifiable;
+    }
+
+    internal sealed class DefaultResourceFactory : IResourceFactory
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public DefaultResourceFactory(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
+        }
+
+        public IIdentifiable CreateInstance(Type resourceType)
+        {
+            if (resourceType == null)
+            {
+                throw new ArgumentNullException(nameof(resourceType));
+            }
+
+            return (IIdentifiable) InnerCreateInstance(resourceType, _serviceProvider);
+        }
+
+        public TResource CreateInstance<TResource>() where TResource : IIdentifiable
+        {
+            return (TResource) InnerCreateInstance(typeof(TResource), _serviceProvider);
+        }
+
+        private static object InnerCreateInstance(Type type, IServiceProvider serviceProvider)
+        {
+            bool hasSingleConstructorWithoutParameters = type.HasSingleConstructorWithoutParameters();
+
+            try
+            {
+                return hasSingleConstructorWithoutParameters
+                    ? Activator.CreateInstance(type)
+                    : ActivatorUtilities.CreateInstance(serviceProvider, type);
+            }
+            catch (Exception exception)
+            {
+                throw new InvalidOperationException(hasSingleConstructorWithoutParameters
+                        ? $"Failed to create an instance of '{type.FullName}' using its default constructor."
+                        : $"Failed to create an instance of '{type.FullName}' using injected constructor parameters.",
+                    exception);
+            }
+        }
+    }
+}

src/JsonApiDotNetCore/Internal/TypeHelper.cs

@@ -238,39 +238,5 @@ public static object CreateInstance(Type type)
                 throw new InvalidOperationException($"Failed to create an instance of '{type.FullName}' using its default constructor.", exception);
             }
         }
-
-        public static T CreateEntityInstance<T>(IServiceProvider serviceProvider)
-        {
-            return (T) CreateEntityInstance(typeof(T), serviceProvider);
-        }
-
-        public static object CreateEntityInstance(Type type, IServiceProvider serviceProvider)
-        {
-            if (type == null)
-            {
-                throw new ArgumentNullException(nameof(type));
-            }
-
-            if (serviceProvider == null)
-            {
-                throw new ArgumentNullException(nameof(serviceProvider));
-            }
-
-            bool hasSingleConstructorWithoutParameters = type.HasSingleConstructorWithoutParameters();
-
-            try
-            {
-                return hasSingleConstructorWithoutParameters
-                    ? Activator.CreateInstance(type)
-                    : ActivatorUtilities.CreateInstance(serviceProvider, type);
-            }
-            catch (Exception exception)
-            {
-                throw new InvalidOperationException(hasSingleConstructorWithoutParameters
-                        ? $"Failed to create an instance of '{type.FullName}' using its default constructor."
-                        : $"Failed to create an instance of '{type.FullName}' using injected constructor parameters.",
-                    exception);
-            }
-        }
     }
 }

src/JsonApiDotNetCore/Serialization/Client/ResponseDeserializer.cs

@@ -13,7 +13,7 @@ namespace JsonApiDotNetCore.Serialization.Client
     /// </summary>
     public class ResponseDeserializer : BaseDocumentParser, IResponseDeserializer
     {
-        public ResponseDeserializer(IResourceContextProvider contextProvider, IServiceProvider serviceProvider) : base(contextProvider, serviceProvider) { }
+        public ResponseDeserializer(IResourceContextProvider contextProvider, IResourceFactory resourceFactory) : base(contextProvider, resourceFactory) { }
 
         /// <inheritdoc/>
         public DeserializedSingleResponse<TResource> DeserializeSingle<TResource>(string body) where TResource : class, IIdentifiable

src/JsonApiDotNetCore/Serialization/Common/BaseDocumentParser.cs

@@ -22,13 +22,13 @@ namespace JsonApiDotNetCore.Serialization
     public abstract class BaseDocumentParser
     {
         protected readonly IResourceContextProvider _contextProvider;
-        private readonly IServiceProvider _serviceProvider;
+        private readonly IResourceFactory _resourceFactory;
         protected Document _document;
 
-        protected BaseDocumentParser(IResourceContextProvider contextProvider, IServiceProvider serviceProvider)
+        protected BaseDocumentParser(IResourceContextProvider contextProvider, IResourceFactory resourceFactory)
         {
             _contextProvider = contextProvider;
-            _serviceProvider = serviceProvider;
+            _resourceFactory = resourceFactory;
         }
 
         /// <summary>
@@ -142,7 +142,7 @@ private IIdentifiable ParseResourceObject(ResourceObject data)
                     "If you have manually registered the resource, check that the call to AddResource correctly sets the public name.", null);
             }
 
-            var entity = (IIdentifiable)TypeHelper.CreateEntityInstance(resourceContext.ResourceType, _serviceProvider);
+            var entity = _resourceFactory.CreateInstance(resourceContext.ResourceType);
 
             entity = SetAttributes(entity, data.Attributes, resourceContext.Attributes);
             entity = SetRelationships(entity, data.Relationships, resourceContext.Relationships);
@@ -214,7 +214,7 @@ private void SetNavigation(IIdentifiable entity, HasOneAttribute attr, string re
             }
             else
             {
-                var relatedInstance = (IIdentifiable)TypeHelper.CreateInstance(attr.RightType);
+                var relatedInstance = _resourceFactory.CreateInstance(attr.RightType);
                 relatedInstance.StringId = relatedId;
                 attr.SetValue(entity, relatedInstance);
             }

src/JsonApiDotNetCore/Serialization/Server/RequestDeserializer.cs

@@ -1,4 +1,5 @@
-using System;
+using System;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 
@@ -11,8 +12,8 @@ public class RequestDeserializer : BaseDocumentParser, IJsonApiDeserializer
     {
         private readonly ITargetedFields  _targetedFields;
 
-        public RequestDeserializer(IResourceContextProvider contextProvider, IServiceProvider serviceProvider, ITargetedFields  targetedFields) 
-            : base(contextProvider, serviceProvider)
+        public RequestDeserializer(IResourceContextProvider contextProvider, IResourceFactory resourceFactory, ITargetedFields  targetedFields) 
+            : base(contextProvider, resourceFactory)
         {
             _targetedFields = targetedFields;
         }

src/JsonApiDotNetCore/Services/DefaultResourceService.cs

@@ -32,6 +32,7 @@ public class DefaultResourceService<TResource, TId> :
         private readonly ISortService _sortService;
         private readonly IResourceRepository<TResource, TId> _repository;
         private readonly IResourceChangeTracker<TResource> _resourceChangeTracker;
+        private readonly IResourceFactory _resourceFactory;
         private readonly ILogger _logger;
         private readonly IResourceHookExecutor _hookExecutor;
         private readonly IIncludeService _includeService;
@@ -45,6 +46,7 @@ public DefaultResourceService(
             IResourceRepository<TResource, TId> repository,
             IResourceContextProvider provider,
             IResourceChangeTracker<TResource> resourceChangeTracker,
+            IResourceFactory resourceFactory,
             IResourceHookExecutor hookExecutor = null)
         {
             _includeService = queryParameters.FirstOrDefault<IIncludeService>();
@@ -56,6 +58,7 @@ public DefaultResourceService(
             _logger = loggerFactory.CreateLogger<DefaultResourceService<TResource, TId>>();
             _repository = repository;
             _resourceChangeTracker = resourceChangeTracker;
+            _resourceFactory = resourceFactory;
             _hookExecutor = hookExecutor;
             _currentRequestResource = provider.GetResourceContext<TResource>();
         }
@@ -81,18 +84,28 @@ public virtual async Task DeleteAsync(TId id)
         {
             _logger.LogTrace($"Entering {nameof(DeleteAsync)}('{id}').");
 
-            var entity = TypeHelper.CreateInstance<TResource>();
-            entity.Id = id;
-            if (!IsNull(_hookExecutor, entity)) _hookExecutor.BeforeDelete(AsList(entity), ResourcePipeline.Delete);
+            if (!IsNull(_hookExecutor))
+            {
+                var entity = _resourceFactory.CreateInstance<TResource>();
+                entity.Id = id;
+
+                _hookExecutor.BeforeDelete(AsList(entity), ResourcePipeline.Delete);
+            }
 
-            var succeeded = await _repository.DeleteAsync(entity.Id);
+            var succeeded = await _repository.DeleteAsync(id);
             if (!succeeded)
             {
                 string resourceId = TypeExtensions.GetResourceStringId<TResource, TId>(id);
                 throw new ResourceNotFoundException(resourceId, _currentRequestResource.ResourceName);
             }
 
-            if (!IsNull(_hookExecutor, entity)) _hookExecutor.AfterDelete(AsList(entity), ResourcePipeline.Delete, succeeded);
+            if (!IsNull(_hookExecutor))
+            {
+                var entity = _resourceFactory.CreateInstance<TResource>();
+                entity.Id = id;
+
+                _hookExecutor.AfterDelete(AsList(entity), ResourcePipeline.Delete, succeeded);
+            }
         }
 
         public virtual async Task<IEnumerable<TResource>> GetAsync()
@@ -427,8 +440,9 @@ public DefaultResourceService(
             IResourceRepository<TResource, int> repository,
             IResourceContextProvider provider,
             IResourceChangeTracker<TResource> resourceChangeTracker,
+            IResourceFactory resourceFactory,
             IResourceHookExecutor hookExecutor = null)
-            : base(queryParameters, options, loggerFactory, repository, provider, resourceChangeTracker, hookExecutor)
+            : base(queryParameters, options, loggerFactory, repository, provider, resourceChangeTracker, resourceFactory, hookExecutor)
         { }
     }
 }