Fix comparison of object-nodes with custom-equals method

fixes #335

scim-sdk-common/src/main/java/de/captaingoldfish/scim/sdk/common/utils/JsonHelper.java

@@ -635,4 +635,58 @@ public static boolean isEmpty(JsonNode jsonNode)
     return jsonNode.size() == 0;
   }
 
+  /**
+   * jackson is currently not supporting comparison of int and long-nodes even if the nodes do have the same
+   * values. for this reason we are overriding the comparison here in case for number nodes
+   *
+   * @return true if the list contains a node that is equal to given complexNode, false else
+   */
+  public static boolean hasEqualObject(List<ObjectNode> originalObjects, ObjectNode complexNode)
+  {
+    return originalObjects.parallelStream().anyMatch(originalNode -> isEqual(originalNode, complexNode));
+  }
+
+  /**
+   * jackson is currently not supporting comparison of int and long-nodes even if the nodes do have the same
+   * values. for this reason we are overriding the comparison here in case for number nodes
+   *
+   * @return true if the list contains a node that is equal to given complexNode, false else
+   */
+  public static boolean isEqual(JsonNode node1, JsonNode node2)
+  {
+    if (node1 == null && node2 == null)
+    {
+      return true;
+    }
+    else if (node1 == null || node2 == null)
+    {
+      return false;
+    }
+    return node1.equals((o1, o2) -> {
+      boolean isO1Null = o1 == null || o1.isNull();
+      boolean isO2Null = o2 == null || o2.isNull();
+      if (isO1Null && isO2Null)
+      {
+        return 0;
+      }
+      else if (isO1Null || isO2Null)
+      {
+        return 1;
+      }
+
+      if (o1.isNumber() && o2.isNumber())
+      {
+        return o1.longValue() == o2.longValue() ? 0 : 1;
+      }
+      if (o1.isNumber() && o2.isNumber())
+      {
+        return o1.longValue() == o2.longValue() ? 0 : 1;
+      }
+      else
+      {
+        return o1.equals(o2) ? 0 : 1;
+      }
+    }, node2);
+  }
+
 }

scim-sdk-server/src/main/java/de/captaingoldfish/scim/sdk/server/patch/PatchTargetHandler.java

@@ -860,34 +860,12 @@ private boolean handleDirectMultiValuedComplexPathReference(ArrayNode multiValue
       else if (!path.isWithFilter() || matchingComplexNodes.isEmpty())
       {
         multiValued.add(complexNode);
-        isResourceChanged = isResourceChanged || !hasEqualObject(originalNodes, complexNode);
+        isResourceChanged = isResourceChanged || !JsonHelper.hasEqualObject(originalNodes, complexNode);
       }
     }
     return isResourceChanged;
   }
 
-  /**
-   * jackson is failing on int and long comparison even if the nodes do have the same values. for this reason we
-   * are overriding the comparison here in case for number nodes
-   *
-   * @return true if the list contains a node that is equal to given complexNode, false else
-   */
-  private boolean hasEqualObject(List<ObjectNode> originalObjects, ObjectNode complexNode)
-  {
-    return originalObjects.parallelStream().anyMatch(originalNode -> {
-      return originalNode.equals((o1, o2) -> {
-        if (o1.isNumber() && o2.isNumber())
-        {
-          return o1.longValue() == o2.longValue() ? 0 : 1;
-        }
-        else
-        {
-          return o1.equals(o2) ? 0 : 1;
-        }
-      }, complexNode);
-    });
-  }
-
   /**
    * this method will check if the current operation adds a new primary value and will set the original primary
    * to false if such a value exists

scim-sdk-server/src/main/java/de/captaingoldfish/scim/sdk/server/schemas/ResourceTypeFactory.java

@@ -161,7 +161,7 @@ private void checkResourceSchema(ResourceType resourceTypeObject, JsonNode resou
     else
     {
       if (registeredResourceSchema != null && resourceSchema != null
-          && !registeredResourceSchema.equals(resourceSchema))
+          && !JsonHelper.isEqual(registeredResourceSchema, resourceSchema))
       {
         log.debug("Resource schema with id '{}' is already registered. The new instance is not equal to"
                   + " the old schema document. The old document is being replaced by the new one",