JsonTypeDescriptor should use Objects.equals for both Collections and…

… Maps #494
vladmihalcea · Oct 17, 2022 · 71b9696 · 71b9696
1 parent fb86f62
commit 71b9696
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/...es-43/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...es-43/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -83,7 +83,8 @@ public boolean areEqual(Object one, Object another) {
         if (one instanceof String && another instanceof String) {
             return one.equals(another);
         }
-        if (one instanceof Collection && another instanceof Collection) {
+        if ((one instanceof Collection && another instanceof Collection) ||
+            (one instanceof Map && another instanceof Map)) {
             return Objects.equals(one, another);
         }
         if (one.getClass().equals(another.getClass()) &&

diff --git a/...pes-5/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...pes-5/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -83,7 +83,8 @@ public boolean areEqual(Object one, Object another) {
         if (one instanceof String && another instanceof String) {
             return one.equals(another);
         }
-        if (one instanceof Collection && another instanceof Collection) {
+        if ((one instanceof Collection && another instanceof Collection) ||
+            (one instanceof Map && another instanceof Map)) {
             return Objects.equals(one, another);
         }
         if (one.getClass().equals(another.getClass()) &&

diff --git a/...es-52/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...es-52/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -82,7 +82,8 @@ public boolean areEqual(Object one, Object another) {
         if (one instanceof String && another instanceof String) {
             return one.equals(another);
         }
-        if (one instanceof Collection && another instanceof Collection) {
+        if ((one instanceof Collection && another instanceof Collection) ||
+            (one instanceof Map && another instanceof Map)) {
             return Objects.equals(one, another);
         }
         if (one.getClass().equals(another.getClass()) &&

diff --git a/...es-55/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java b/...es-55/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonTypeDescriptor.java
@@ -82,7 +82,8 @@ public boolean areEqual(Object one, Object another) {
         if (one instanceof String && another instanceof String) {
             return one.equals(another);
         }
-        if (one instanceof Collection && another instanceof Collection) {
+        if ((one instanceof Collection && another instanceof Collection) ||
+            (one instanceof Map && another instanceof Map)) {
             return Objects.equals(one, another);
         }
         if (one.getClass().equals(another.getClass()) &&

diff --git a/...0/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonJavaTypeDescriptor.java b/...0/src/main/java/com/vladmihalcea/hibernate/type/json/internal/JsonJavaTypeDescriptor.java
@@ -89,7 +89,8 @@ public boolean areEqual(Object one, Object another) {
         if (one instanceof String && another instanceof String) {
             return one.equals(another);
         }
-        if (one instanceof Collection && another instanceof Collection) {
+        if ((one instanceof Collection && another instanceof Collection) ||
+            (one instanceof Map && another instanceof Map)) {
             return Objects.equals(one, another);
         }
         if (one.getClass().equals(another.getClass()) &&