chore(pointers): move classes into separate files

Author: jaredcnance

src/JsonApiDotNetCore/Extensions/JObjectExtensions.cs

@@ -0,0 +1,23 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+using JsonApiDotNetCore.Models.Pointers;
+
+namespace JsonApiDotNetCore.Extensions
+{
+    public static class JObjectExtensions
+    {
+        public static bool TryParse<TPointer, TPointerBase>(this JObject obj, JSchema schema, out Pointer<TPointerBase> pointer)
+        where TPointer : Pointer<TPointerBase>, new()
+        {
+            if (obj.IsValid(schema))
+            {
+                pointer = obj.ToObject<TPointer>();
+                return true;
+            }
+
+            pointer = null;
+            return false;
+        }
+    }
+}

src/JsonApiDotNetCore/Internal/Generics/IGenericProcessorFactory.cs

@@ -10,7 +10,6 @@ namespace JsonApiDotNetCore.Internal.Generics
     /// </summary>
     public interface IGenericProcessorFactory
     {
-
         TInterface GetProcessor<TInterface>(params Type[] types);
     }
 }

src/JsonApiDotNetCore/Models/DocumentData.cs

@@ -1,8 +1,7 @@
+using System;
 using System.Collections.Generic;
 using JsonApiDotNetCore.Models.Pointers;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Schema;
 
 namespace JsonApiDotNetCore.Models
 {
@@ -20,44 +19,4 @@ public class DocumentData
         [JsonProperty("relationships")]
         public Dictionary<string, RelationshipData> Relationships { get; set; }
     }
-
-    public class DocumentDataPointerReplacement<TPointer, TPointerBase>
-        where TPointer : Pointer<TPointerBase>, new()
-    {
-        private readonly DocumentData _data;
-
-        public DocumentDataPointerReplacement(DocumentData data)
-        {
-            _data = data;
-        }
-
-        public void ReplacePointers(List<TPointerBase> parentDoc)
-        {
-            ReplacePointer(_data.Id, parentDoc);
-            ReplacePointer(_data.Type, parentDoc);
-        }
-
-        private void ReplacePointer(object reference, List<TPointerBase> parentDoc)
-        {
-            if (reference is JObject jObj)
-                if (jObj.TryParse<TPointer, TPointerBase>(Pointer<TPointerBase>.JsonSchema, out Pointer<TPointerBase> pointer))
-                    reference = pointer.GetValue(parentDoc);
-        }
-    }
-}
-
-public static class JObjectExtensions
-{
-    public static bool TryParse<TPointer, TPointerBase>(this JObject obj, JSchema schema, out Pointer<TPointerBase> pointer)
-      where TPointer : Pointer<TPointerBase>, new()
-    {
-        if (obj.IsValid(schema))
-        {
-            pointer = obj.ToObject<TPointer>();
-            return true;
-        }
-
-        pointer = null;
-        return false;
-    }
 }

src/JsonApiDotNetCore/Services/Operations/OperationsPointerExchanger.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using JsonApiDotNetCore.Models.Pointers;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Extensions;
+
+namespace JsonApiDotNetCore.Services.Operations
+{
+    public class DocumentDataPointerReplacement<TPointer, TPointerBase>
+        where TPointer : Pointer<TPointerBase>, new()
+    {
+        private readonly DocumentData _data;
+
+        public DocumentDataPointerReplacement(DocumentData data)
+        {
+            _data = data;
+        }
+
+        public void ReplacePointers(List<TPointerBase> parentDoc)
+        {
+            _data.Id = GetPointerValue(_data.Id, parentDoc);
+            _data.Type = GetPointerValue(_data.Type, parentDoc);
+
+            if (_data.Relationships != null)
+            {
+                foreach (var relationshipDictionary in _data.Relationships)
+                {
+                    if (relationshipDictionary.Value.IsHasMany)
+                    {
+                        foreach (var relationship in relationshipDictionary.Value.ManyData)
+                            ReplaceDictionaryPointers(relationship, parentDoc);
+                    }
+                    else
+                    {
+                        ReplaceDictionaryPointers(relationshipDictionary.Value.SingleData, parentDoc);
+                    }
+                }
+            }
+        }
+
+        private void ReplaceDictionaryPointers(Dictionary<string, object> relationship, List<TPointerBase> parentDoc)
+        {
+            if (relationship.ContainsKey("id"))
+                relationship["id"] = GetPointerValue(relationship["id"], parentDoc);
+
+            if (relationship.ContainsKey("type"))
+                relationship["type"] = GetPointerValue(relationship["type"], parentDoc);
+        }
+
+        private object GetPointerValue(object reference, List<TPointerBase> parentDoc)
+        {
+            if (reference is JObject jObj)
+                if (jObj.TryParse<TPointer, TPointerBase>(Pointer<TPointerBase>.JsonSchema, out Pointer<TPointerBase> pointer))
+                    return pointer.GetValue(parentDoc);
+
+            return reference;
+        }
+    }
+}