Remove ErrorLocation

SimonCropp · Oct 24, 2024 · 81517ab · 81517ab
1 parent cb9bacc
commit 81517ab
Show file tree

Hide file tree

Showing 23 changed files with 72 additions and 84 deletions.
diff --git a/docs/SerializationErrorHandling.md b/docs/SerializationErrorHandling.md
@@ -29,7 +29,7 @@ var c = JsonConvert.DeserializeObject<List<DateTime>>(
     """,
     new JsonSerializerSettings
     {
-        DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+        DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
         {
             errors.Add(exception.Message);
             markAsHandled();
@@ -61,15 +61,15 @@ var errors = new List<string>();
 
 var serializer = new JsonSerializer
 {
-    SerializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+    SerializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
     {
         // only log an error once
         if (currentObject == originalObject)
         {
             errors.Add(exception.Message);
         }
     },
-    DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+    DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
     {
         // only log an error once
         if (currentObject == originalObject)
@@ -115,7 +115,7 @@ public class PersonError :
 
     public string Title { get; set; }
 
-    public void OnSerializeError(object originalObject, ErrorLocation location, Exception exception, Action markAsHandled) =>
+    public void OnSerializeError(object originalObject, string path, object member, Exception exception, Action markAsHandled) =>
         markAsHandled();
 }
 ```

diff --git a/docs/Serializer/ErrorHandlingAttribute.md b/docs/Serializer/ErrorHandlingAttribute.md
@@ -30,7 +30,7 @@ public class Employee :
 
     public string Title { get; set; }
 
-    public void OnSerializeError(object originalObject, ErrorLocation location, Exception exception, Action markAsHandled) =>
+    public void OnSerializeError(object originalObject, string path, object member, Exception exception, Action markAsHandled) =>
         markAsHandled();
 }
 ```

diff --git a/docs/Serializer/ErrorHandlingEvent.md b/docs/Serializer/ErrorHandlingEvent.md
@@ -22,7 +22,7 @@ var c = JsonConvert.DeserializeObject<List<DateTime>>(
     """,
     new JsonSerializerSettings
     {
-        DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+        DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
         {
             errors.Add(exception.Message);
             markAsHandled();

diff --git a/src/Argon.InterfaceCallbacks/IJsonOnDeserializeError.cs b/src/Argon.InterfaceCallbacks/IJsonOnDeserializeError.cs
@@ -5,5 +5,5 @@ namespace Argon;
 /// </summary>
 public interface IJsonOnDeserializeError
 {
-    void OnDeserializeError(object? originalObject, ErrorLocation location, Exception exception, Action markAsHanded);
+    void OnDeserializeError(object? originalObject, string path, object? member, Exception exception, Action markAsHanded);
 }
diff --git a/src/Argon.InterfaceCallbacks/IJsonOnSerializeError.cs b/src/Argon.InterfaceCallbacks/IJsonOnSerializeError.cs
@@ -8,5 +8,5 @@ public interface IJsonOnSerializeError
     /// <summary>
     /// The method that is called on serialization error.
     /// </summary>
-    void OnSerializeError(object? originalObject, ErrorLocation location, Exception exception, Action markAsHanded);
+    void OnSerializeError(object? originalObject, string path, object? member, Exception exception, Action markAsHanded);
 }
diff --git a/src/Argon.InterfaceCallbacks/InterfaceCallbacks.cs b/src/Argon.InterfaceCallbacks/InterfaceCallbacks.cs
@@ -4,18 +4,18 @@ public static class InterfaceCallbacks
 {
     public static void AddInterfaceCallbacks(this JsonSerializerSettings settings)
     {
-        settings.SerializeError += (currentObject, originalObject, location, exception, handled) =>
+        settings.SerializeError += (currentObject, originalObject, path, member, exception, handled) =>
         {
             if (currentObject is IJsonOnSerializeError onError)
             {
-                onError.OnSerializeError(originalObject, location, exception, handled);
+                onError.OnSerializeError(originalObject, path, member, exception, handled);
             }
         };
-        settings.DeserializeError += (currentObject, originalObject, location, exception, handled) =>
+        settings.DeserializeError += (currentObject, originalObject, path, member, exception, handled) =>
         {
             if (currentObject is IJsonOnDeserializeError onError)
             {
-                onError.OnDeserializeError(originalObject, location, exception, handled);
+                onError.OnDeserializeError(originalObject, path, member, exception, handled);
             }
         };
         settings.Serializing += (_, target) =>

diff --git a/src/Argon/Callbacks/ErrorLocation.cs b/src/Argon/Callbacks/ErrorLocation.cs
diff --git a/src/Argon/Callbacks/OnDeserializeError.cs b/src/Argon/Callbacks/OnDeserializeError.cs
@@ -3,4 +3,4 @@
 /// <summary>
 /// Handles <see cref="JsonSerializer" /> deserialization error callback events.
 /// </summary>
-public delegate void OnDeserializeError(object? currentObject, object? originalObject, ErrorLocation location, Exception exception, Action markAsHandled);
+public delegate void OnDeserializeError(object? currentObject, object? originalObject, string path, object? member, Exception exception, Action markAsHandled);
diff --git a/src/Argon/Callbacks/OnSerializeError.cs b/src/Argon/Callbacks/OnSerializeError.cs
@@ -3,4 +3,4 @@
 /// <summary>
 /// Handles <see cref="JsonSerializer" /> serialization error callback events.
 /// </summary>
-public delegate void OnSerializeError(object? currentObject, object? originalObject, ErrorLocation location, Exception exception, Action markAsHandled);
+public delegate void OnSerializeError(object? currentObject, object? originalObject, string path, object? member, Exception exception, Action markAsHandled);
diff --git a/src/Argon/Serialization/JsonSerializerInternalReader.cs b/src/Argon/Serialization/JsonSerializerInternalReader.cs
@@ -2249,7 +2249,8 @@ protected bool IsDeserializeErrorHandled(object? currentObject, object? member,
                 .Invoke(
                     currentObject,
                     currentDeserializeErrorContext.OriginalObject,
-                    new(path, member),
+                    path,
+                    member,
                     exception,
                     () => currentDeserializeErrorContext.Handled = true);
         }

diff --git a/src/Argon/Serialization/JsonSerializerInternalWriter.cs b/src/Argon/Serialization/JsonSerializerInternalWriter.cs
@@ -1098,7 +1098,8 @@ protected bool IsSerializeErrorHandled(object? currentObject, object? member, st
                 .Invoke(
                     currentObject,
                     currentSerializeErrorContext.OriginalObject,
-                    new(path, member),
+                    path,
+                    member,
                     exception,
                     () => currentSerializeErrorContext.Handled = true);
         }

diff --git a/src/ArgonTests/Converters/DataTableConverterTests.cs b/src/ArgonTests/Converters/DataTableConverterTests.cs
@@ -711,7 +711,7 @@ public override object ReadJson(JsonReader reader, Type type, object existingVal
             existingValue ??= CreateTable();
 
             var previousError = serializer.DeserializeError;
-            serializer.DeserializeError = (_, _, _, _, markAsHandled) => markAsHandled();
+            serializer.DeserializeError = (_, _, _, _, _, markAsHandled) => markAsHandled();
             try
             {
                 return base.ReadJson(reader, type, existingValue, serializer);
@@ -722,7 +722,7 @@ public override object ReadJson(JsonReader reader, Type type, object existingVal
             }
         }
 
-        public void OnDeserializeError(object originalObject, ErrorLocation location, Exception exception, Action markAsHandled) =>
+        public void OnDeserializeError(object originalObject, string path, object member, Exception exception, Action markAsHandled) =>
             markAsHandled();
     }
 }
diff --git a/src/ArgonTests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs b/src/ArgonTests/Documentation/Samples/Serializer/ErrorHandlingAttribute.cs
@@ -30,7 +30,7 @@ public List<string> Roles
 
         public string Title { get; set; }
 
-        public void OnSerializeError(object originalObject, ErrorLocation location, Exception exception, Action markAsHandled) =>
+        public void OnSerializeError(object originalObject, string path, object member, Exception exception, Action markAsHandled) =>
             markAsHandled();
     }
 

diff --git a/src/ArgonTests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs b/src/ArgonTests/Documentation/Samples/Serializer/ErrorHandlingEvent.cs
@@ -28,7 +28,7 @@ public void Example()
             """,
             new JsonSerializerSettings
             {
-                DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+                DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
                 {
                     errors.Add(exception.Message);
                     markAsHandled();

diff --git a/src/ArgonTests/Documentation/SerializationTests.cs b/src/ArgonTests/Documentation/SerializationTests.cs
@@ -200,7 +200,7 @@ public void SerializationErrorHandling()
             """,
             new JsonSerializerSettings
             {
-                DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+                DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
                 {
                     errors.Add(exception.Message);
                     markAsHandled();
@@ -248,15 +248,15 @@ public void SerializationErrorHandlingWithParent()
 
         var serializer = new JsonSerializer
         {
-            SerializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+            SerializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
             {
                 // only log an error once
                 if (currentObject == originalObject)
                 {
                     errors.Add(exception.Message);
                 }
             },
-            DeserializeError = (currentObject, originalObject, location, exception, markAsHandled) =>
+            DeserializeError = (currentObject, originalObject, path, member, exception, markAsHandled) =>
             {
                 // only log an error once
                 if (currentObject == originalObject)
@@ -295,7 +295,7 @@ public List<string> Roles
 
         public string Title { get; set; }
 
-        public void OnSerializeError(object originalObject, ErrorLocation location, Exception exception, Action markAsHandled) =>
+        public void OnSerializeError(object originalObject, string path, object member, Exception exception, Action markAsHandled) =>
             markAsHandled();
     }
 

diff --git a/src/ArgonTests/Serialization/JsonSerializerTest.cs b/src/ArgonTests/Serialization/JsonSerializerTest.cs
@@ -632,7 +632,7 @@ public void ReadIntegerWithError()
             json,
             new JsonSerializerSettings
             {
-                DeserializeError = (_, _, _, _, markAsHandled) => markAsHandled()
+                DeserializeError = (_, _, _, _, _, markAsHandled) => markAsHandled()
             });
 
         Assert.Equal(0, l.ChildId);
@@ -5832,7 +5832,7 @@ public void ObjectRequiredDeserializeMissing()
             json,
             new JsonSerializerSettings
             {
-                DeserializeError = (_, _, _, exception, markAsHandled) =>
+                DeserializeError = (_, _, _, _, exception, markAsHandled) =>
                 {
                     errors.Add(exception.Message);
                     markAsHandled();
@@ -5857,7 +5857,7 @@ public void ObjectRequiredDeserializeNull()
             json,
             new JsonSerializerSettings
             {
-                DeserializeError = (_, _, _, exception, markAsHandled) =>
+                DeserializeError = (_, _, _, _, exception, markAsHandled) =>
                 {
                     errors.Add(exception.Message);
                     markAsHandled();
@@ -5880,7 +5880,7 @@ public void ObjectRequiredSerialize()
             new RequiredObject(),
             new JsonSerializerSettings
             {
-                SerializeError = (_, _, _, exception, markAsHandled) =>
+                SerializeError = (_, _, _, _, exception, markAsHandled) =>
                 {
                     errors.Add(exception.Message);
                     markAsHandled();