Various fixes

benchmarks/DependencyFactory.cs

@@ -4,6 +4,7 @@
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Query;
+using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 
 namespace Benchmarks
@@ -12,7 +13,7 @@ internal static class DependencyFactory
     {
         public static IResourceGraph CreateResourceGraph(IJsonApiOptions options)
         {
-            IResourceGraphBuilder builder = new ResourceGraphBuilder(options);
+            IResourceGraphBuilder builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
             builder.AddResource<BenchmarkResource>(BenchmarkResourcePublicNames.Type);
             return builder.Build();
         }

benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

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

benchmarks/Serialization/JsonApiSerializerBenchmarks.cs

@@ -1,7 +1,6 @@
 using System;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Managers;
 using JsonApiDotNetCore.Query;

src/Examples/GettingStarted/Models/Person.cs

@@ -7,7 +7,8 @@ public sealed class Person : Identifiable
     {
         [Attr] 
         public string Name { get; set; }
+
         [HasMany] 
-        public List<Article> Articles { get; set; }
+        public ICollection<Article> Articles { get; set; }
     }
 }

src/Examples/GettingStarted/Startup.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
-using JsonApiDotNetCore.Extensions;
+using JsonApiDotNetCore;
 
 namespace GettingStarted
 {

src/Examples/JsonApiDotNetCoreExample/Controllers/PassportsController.cs

@@ -1,18 +1,50 @@
-using JsonApiDotNetCore.Configuration;
+using System.Threading.Tasks;
+using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCoreExample.Controllers
 {
-    public sealed class PassportsController : JsonApiController<Passport>
+    public sealed class PassportsController : BaseJsonApiController<Passport>
     {
         public PassportsController(
             IJsonApiOptions jsonApiOptions,
             ILoggerFactory loggerFactory,
             IResourceService<Passport, int> resourceService)
             : base(jsonApiOptions, loggerFactory, resourceService)
         { }
+
+        [HttpGet]
+        public override async Task<IActionResult> GetAsync() => await base.GetAsync();
+
+        [HttpGet("{id}")]
+        public async Task<IActionResult> GetAsync(string id)
+        {
+            int idValue = HexadecimalObfuscationCodec.Decode(id);
+            return await base.GetAsync(idValue);
+        }
+
+        [HttpPatch("{id}")]
+        public async Task<IActionResult> PatchAsync(string id, [FromBody] Passport entity)
+        {
+            int idValue = HexadecimalObfuscationCodec.Decode(id);
+            return await base.PatchAsync(idValue, entity);
+        }
+
+        [HttpPost]
+        public override async Task<IActionResult> PostAsync([FromBody] Passport entity)
+        {
+            return await base.PostAsync(entity);
+        }
+
+        [HttpDelete("{id}")]
+        public async Task<IActionResult> DeleteAsync(string id)
+        {
+            int idValue = HexadecimalObfuscationCodec.Decode(id);
+            return await base.DeleteAsync(idValue);
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Controllers/TestValuesController.cs

@@ -11,5 +11,25 @@ public IActionResult Get()
             var result = new[] { "value" };
             return Ok(result);
         }
+
+        [HttpPost]
+        public IActionResult Post(string name)
+        {
+            var result = "Hello, " + name;
+            return Ok(result);
+        }
+
+        [HttpPatch]
+        public IActionResult Patch(string name)
+        {
+            var result = "Hello, " + name;
+            return Ok(result);
+        }
+
+        [HttpDelete]
+        public IActionResult Delete()
+        {
+            return Ok("Deleted");
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs

@@ -1,30 +1,35 @@
+using System;
 using JsonApiDotNetCoreExample.Models;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
 
 namespace JsonApiDotNetCoreExample.Data
 {
     public sealed class AppDbContext : DbContext
     {
+        public ISystemClock SystemClock { get; }
+
         public DbSet<TodoItem> TodoItems { get; set; }
         public DbSet<Passport> Passports { get; set; }
         public DbSet<Person> People { get; set; }
         public DbSet<TodoItemCollection> TodoItemCollections { get; set; }
         public DbSet<KebabCasedModel> KebabCasedModels { get; set; }
         public DbSet<Article> Articles { get; set; }
         public DbSet<Author> AuthorDifferentDbContextName { get; set; }
-        public DbSet<NonJsonApiResource> NonJsonApiResources { get; set; }
         public DbSet<User> Users { get; set; }
-        public DbSet<SuperUser> SuperUsers { get; set; }
         public DbSet<PersonRole> PersonRoles { get; set; }
         public DbSet<ArticleTag> ArticleTags { get; set; }
-        public DbSet<IdentifiableArticleTag> IdentifiableArticleTags { get; set; }
         public DbSet<Tag> Tags { get; set; }
-        public DbSet<ThrowingResource> ThrowingResources { get; set; }
 
-        public AppDbContext(DbContextOptions<AppDbContext> options) : base(options) { }
+        public AppDbContext(DbContextOptions<AppDbContext> options, ISystemClock systemClock) : base(options)
+        {
+            SystemClock = systemClock ?? throw new ArgumentNullException(nameof(systemClock));
+        }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<ThrowingResource>();
+
             modelBuilder.Entity<SuperUser>().HasBaseType<User>();
 
             modelBuilder.Entity<TodoItem>()
@@ -66,6 +71,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey<Person>(p => p.PassportId)
                 .OnDelete(DeleteBehavior.SetNull);
 
+            modelBuilder.Entity<Passport>()
+                .HasMany(passport => passport.GrantedVisas)
+                .WithOne()
+                .OnDelete(DeleteBehavior.Cascade);
+
             modelBuilder.Entity<TodoItem>()
                 .HasOne(p => p.OneToOnePerson)
                 .WithOne(p => p.OneToOneTodoItem)

src/Examples/JsonApiDotNetCoreExample/HexadecimalObfuscationCodec.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+
+namespace JsonApiDotNetCoreExample
+{
+    public static class HexadecimalObfuscationCodec
+    {
+        public static int Decode(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return 0;
+            }
+
+            if (!value.StartsWith("x"))
+            {
+                throw new InvalidOperationException("Invalid obfuscated id.");
+            }
+
+            string stringValue = FromHexString(value.Substring(1));
+            return int.Parse(stringValue);
+        }
+
+        private static string FromHexString(string hexString)
+        {
+            List<byte> bytes = new List<byte>(hexString.Length / 2);
+            for (int index = 0; index < hexString.Length; index += 2)
+            {
+                var hexChar = hexString.Substring(index, 2);
+                byte bt = byte.Parse(hexChar, NumberStyles.HexNumber);
+                bytes.Add(bt);
+            }
+
+            var chars = Encoding.ASCII.GetChars(bytes.ToArray());
+            return new string(chars);
+        }
+
+        public static string Encode(object value)
+        {
+            if (value is int intValue && intValue == 0)
+            {
+                return string.Empty;
+            }
+
+            string stringValue = value.ToString();
+            return 'x' + ToHexString(stringValue);
+        }
+
+        private static string ToHexString(string value)
+        {
+            var builder = new StringBuilder();
+
+            foreach (byte bt in Encoding.ASCII.GetBytes(value))
+            {
+                builder.Append(bt.ToString("X2"));
+            }
+
+            return builder.ToString();
+        }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Models/Article.cs

@@ -15,13 +15,12 @@ public sealed class Article : Identifiable
 
         [NotMapped]
         [HasManyThrough(nameof(ArticleTags))]
-        public List<Tag> Tags { get; set; }
-        public List<ArticleTag> ArticleTags { get; set; }
-
+        public ISet<Tag> Tags { get; set; }
+        public ISet<ArticleTag> ArticleTags { get; set; }
 
         [NotMapped]
         [HasManyThrough(nameof(IdentifiableArticleTags))]
-        public List<Tag> IdentifiableTags { get; set; }
-        public List<IdentifiableArticleTag> IdentifiableArticleTags { get; set; }
+        public ICollection<Tag> IdentifiableTags { get; set; }
+        public ICollection<IdentifiableArticleTag> IdentifiableArticleTags { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/ArticleTag.cs

@@ -1,4 +1,6 @@
+using System;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Data;
 
 namespace JsonApiDotNetCoreExample.Models
 {
@@ -9,8 +11,12 @@ public sealed class ArticleTag
 
         public int TagId { get; set; }
         public Tag Tag { get; set; }
-    }
 
+        public ArticleTag(AppDbContext appDbContext)
+        {
+            if (appDbContext == null) throw new ArgumentNullException(nameof(appDbContext));
+        }
+    }
 
     public class IdentifiableArticleTag : Identifiable
     {

src/Examples/JsonApiDotNetCoreExample/Models/Author.cs

@@ -9,7 +9,7 @@ public sealed class Author : Identifiable
         public string Name { get; set; }
 
         [HasMany]
-        public List<Article> Articles { get; set; }
+        public IList<Article> Articles { get; set; }
     }
 }
 

src/Examples/JsonApiDotNetCoreExample/Models/Passport.cs

@@ -3,13 +3,26 @@
 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;
 
+        protected override string GetStringId(object value)
+        {
+            return HexadecimalObfuscationCodec.Encode(value);
+        }
+
+        protected override int GetTypedId(string value)
+        {
+            return HexadecimalObfuscationCodec.Decode(value);
+        }
+
         [Attr]
         public int? SocialSecurityNumber
         {
@@ -18,7 +31,7 @@ public int? SocialSecurityNumber
             {
                 if (value != _socialSecurityNumber)
                 {
-                    LastSocialSecurityNumberChange = DateTime.Now;
+                    LastSocialSecurityNumberChange = _systemClock.UtcNow.LocalDateTime;
                     _socialSecurityNumber = value;
                 }
             }
@@ -54,14 +67,16 @@ public string BirthCountryName
 
         [Attr(AttrCapabilities.All & ~AttrCapabilities.AllowMutate)]
         [NotMapped]
-        public string GrantedVisaCountries
-        {
-            get => GrantedVisas == null ? null : string.Join(", ", GrantedVisas.Select(v => v.TargetCountry.Name));
-            // The setter is required only for deserialization in unit tests.
-            set { }
-        }
+        public string GrantedVisaCountries => GrantedVisas == null || !GrantedVisas.Any()
+            ? null
+            : string.Join(", ", GrantedVisas.Select(v => v.TargetCountry.Name));
 
         [EagerLoad]
         public ICollection<Visa> GrantedVisas { get; set; }
+
+        public Passport(AppDbContext appDbContext)
+        {
+            _systemClock = appDbContext.SystemClock;
+        }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/Person.cs

@@ -44,13 +44,13 @@ public string FirstName
         public Gender Gender { get; set; }
 
         [HasMany]
-        public List<TodoItem> TodoItems { get; set; }
+        public ISet<TodoItem> TodoItems { get; set; }
 
         [HasMany]
-        public List<TodoItem> AssignedTodoItems { get; set; }
+        public ISet<TodoItem> AssignedTodoItems { get; set; }
 
         [HasMany]
-        public List<TodoItemCollection> todoCollections { get; set; }
+        public HashSet<TodoItemCollection> todoCollections { get; set; }
 
         [HasOne]
         public PersonRole Role { get; set; }