Fix null values

rasmus · rasmus · commit 88daeb5bbe46 · 2019-09-11T23:25:38.000+02:00
diff --git a/Source/EventFlow.Tests/UnitTests/ValueObjects/SingleValueObjectTests.cs b/Source/EventFlow.Tests/UnitTests/ValueObjects/SingleValueObjectTests.cs
@@ -168,7 +168,8 @@ public void EqualsForDifferentValues()
 
         private static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
             {
-                DefaultValueHandling = DefaultValueHandling.Ignore
+                DefaultValueHandling = DefaultValueHandling.Ignore,
+                NullValueHandling = NullValueHandling.Ignore
             };
 
         [JsonConverter(typeof(SingleValueObjectConverter))]
diff --git a/Source/EventFlow/ValueObjects/SingleValueObjectConverter.cs b/Source/EventFlow/ValueObjects/SingleValueObjectConverter.cs
@@ -35,16 +35,21 @@ public class SingleValueObjectConverter : JsonConverter
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var singleValueObject = value as ISingleValueObject;
-            if (singleValueObject == null)
+            if (!(value is ISingleValueObject singleValueObject))
             {
                 return;
             }
+
             serializer.Serialize(writer, singleValueObject.GetValue());
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
+            if (reader.Value == null)
+            {
+                return null;
+            }
+
             var parameterType = ConstructorArgumentTypes.GetOrAdd(
                 objectType,
                 t =>
@@ -55,7 +60,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                     });
 
             var value = serializer.Deserialize(reader, parameterType);
-            return Activator.CreateInstance(objectType, new[] { value });
+
+            return Activator.CreateInstance(objectType, value);
         }
 
         public override bool CanConvert(Type objectType)

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,8 @@ public void EqualsForDifferentValues()`
`168`	`168`
`169`	`169`	`private static readonly JsonSerializerSettings Settings = new JsonSerializerSettings`
`170`	`170`	`{`
`171`		`- DefaultValueHandling = DefaultValueHandling.Ignore`
	`171`	`+ DefaultValueHandling = DefaultValueHandling.Ignore,`
	`172`	`+ NullValueHandling = NullValueHandling.Ignore`
`172`	`173`	`};`
`173`	`174`
`174`	`175`	`[JsonConverter(typeof(SingleValueObjectConverter))]`
Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,21 @@ public class SingleValueObjectConverter : JsonConverter`
`35`	`35`
`36`	`36`	`public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)`
`37`	`37`	`{`
`38`		`- var singleValueObject = value as ISingleValueObject;`
`39`		`- if (singleValueObject == null)`
	`38`	`+ if (!(value is ISingleValueObject singleValueObject))`
`40`	`39`	`{`
`41`	`40`	`return;`
`42`	`41`	`}`
	`42`	`+`
`43`	`43`	`serializer.Serialize(writer, singleValueObject.GetValue());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)`
`47`	`47`	`{`
	`48`	`+ if (reader.Value == null)`
	`49`	`+ {`
	`50`	`+ return null;`
	`51`	`+ }`
	`52`	`+`
`48`	`53`	`var parameterType = ConstructorArgumentTypes.GetOrAdd(`
`49`	`54`	`objectType,`
`50`	`55`	`t =>`
`@@ -55,7 +60,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`55`	`60`	`});`
`56`	`61`
`57`	`62`	`var value = serializer.Deserialize(reader, parameterType);`
`58`		`- return Activator.CreateInstance(objectType, new[] { value });`
	`63`	`+`
	`64`	`+ return Activator.CreateInstance(objectType, value);`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`public override bool CanConvert(Type objectType)`