Work around JsonSerializer limitation.

https://github.com/dotnet/corefx/issues/38569
RyanNieuwoudt · Jan 2, 2020 · 8ab79a2 · 8ab79a2
1 parent 2e21848
commit 8ab79a2
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 11 deletions.
diff --git a/StarCommander.Domain/Players/Player.cs b/StarCommander.Domain/Players/Player.cs
@@ -4,6 +4,10 @@ namespace StarCommander.Domain.Players
 {
 	public class Player : IAggregate
 	{
+		protected Player()
+		{
+		}
+
 		Player(Reference<Player> id, string callSign, string firstName, string lastName, byte[] passwordHash,
 			byte[] passwordSalt)
 		{
@@ -15,11 +19,11 @@ public class Player : IAggregate
 			PasswordSalt = passwordSalt;
 		}
 
-		public string CallSign { get; }
-		public string FirstName { get; }
-		public string LastName { get; }
-		public byte[] PasswordHash { get; }
-		public byte[] PasswordSalt { get; }
+		public string CallSign { get; protected set; }
+		public string FirstName { get; protected set; }
+		public string LastName { get; protected set; }
+		public byte[] PasswordHash { get; protected set; }
+		public byte[] PasswordSalt { get; protected set; }
 
 		public Guid Id { get; }
 

diff --git a/StarCommander.Infrastructure.Persistence.Aggregate/Players/Player.cs b/StarCommander.Infrastructure.Persistence.Aggregate/Players/Player.cs
@@ -1,6 +1,6 @@
 namespace StarCommander.Infrastructure.Persistence.Aggregate.Players
 {
-	public class Player : JsonEntity<Domain.Players.Player>
+	public class Player : JsonEntity<Domain.Players.Player, PlayerJson>
 	{
 		public string CallSign { get; set; } = string.Empty;
 

diff --git a/StarCommander.Infrastructure.Persistence.Aggregate/Players/PlayerJson.cs b/StarCommander.Infrastructure.Persistence.Aggregate/Players/PlayerJson.cs
@@ -0,0 +1,36 @@
+namespace StarCommander.Infrastructure.Persistence.Aggregate.Players
+{
+	// ReSharper disable once ClassNeverInstantiated.Global
+	public class PlayerJson : Domain.Players.Player
+	{
+		public new string CallSign
+		{
+			get => base.CallSign;
+			set => base.CallSign = value;
+		}
+
+		public new string FirstName
+		{
+			get => base.FirstName;
+			set => base.FirstName = value;
+		}
+
+		public new string LastName
+		{
+			get => base.LastName;
+			set => base.LastName = value;
+		}
+
+		public new byte[] PasswordHash
+		{
+			get => base.PasswordHash;
+			set => base.PasswordHash = value;
+		}
+
+		public new byte[] PasswordSalt
+		{
+			get => base.PasswordSalt;
+			set => base.PasswordSalt = value;
+		}
+	}
+}
diff --git a/StarCommander.Infrastructure.Persistence.Aggregate/Players/PlayerRepository.cs b/StarCommander.Infrastructure.Persistence.Aggregate/Players/PlayerRepository.cs
@@ -4,7 +4,7 @@
 
 namespace StarCommander.Infrastructure.Persistence.Aggregate.Players
 {
-	public class PlayerRepository : JsonRepositoryBase<Domain.Players.Player, Player, PlayerDataContext>,
+	public class PlayerRepository : JsonRepositoryBase<Domain.Players.Player, PlayerJson, Player, PlayerDataContext>,
 		IPlayerRepository
 	{
 		public PlayerRepository(IAmbientDbContextConfigurator ambientDbContextConfigurator) : base(

diff --git a/StarCommander.Infrastructure.Persistence/JsonEntity.cs b/StarCommander.Infrastructure.Persistence/JsonEntity.cs
@@ -4,7 +4,7 @@
 
 namespace StarCommander.Infrastructure.Persistence
 {
-	public abstract class JsonEntity<T> where T : class, IAggregate
+	public abstract class JsonEntity<T, TU> where T : class, IAggregate where TU : class, T
 	{
 		public Guid Id { get; set; }
 
@@ -23,7 +23,7 @@ protected virtual void ProjectValues(T aggregate)
 
 		public T ToDomain()
 		{
-			return (T)JsonSerializer.Deserialize(Json, typeof(T));
+			return JsonSerializer.Deserialize<TU>(Json);
 		}
 	}
 }
diff --git a/StarCommander.Infrastructure.Persistence/JsonRepositoryBase.cs b/StarCommander.Infrastructure.Persistence/JsonRepositoryBase.cs
@@ -7,9 +7,10 @@
 
 namespace StarCommander.Infrastructure.Persistence
 {
-	public abstract class JsonRepositoryBase<T, TU, TV> : RepositoryBase<TV>, IRepository<T>
+	public abstract class JsonRepositoryBase<T, T1, TU, TV> : RepositoryBase<TV>, IRepository<T>
 		where T : class, IAggregate
-		where TU : JsonEntity<T>
+		where T1 : class, T
+		where TU : JsonEntity<T, T1>
 		where TV : class, IDbContext
 	{
 		protected JsonRepositoryBase(IAmbientDbContextConfigurator ambientDbContextConfigurator) : base(