ListArrayType on Set entity attribute fails for EntityManager.merge o…

…peration #717
vladmihalcea · Jun 4, 2024 · 60be483 · 60be483
1 parent 7372cd7
commit 60be483
Show file tree

Hide file tree

Showing 15 changed files with 222 additions and 6 deletions.
diff --git a/...nate-52/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java b/...nate-52/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <code>ArrayUtil</code> - Array utilities holder.
@@ -374,4 +376,17 @@ public static <T> List<T> asList(T[] array) {
         }
         return list;
     }
+
+    /**
+     * @param array array to transform
+     * @param <T>   array element type
+     * @return the {@link Set} representation of the array
+     */
+    public static <T> Set<T> asSet(T[] array) {
+        Set<T> set = new LinkedHashSet<T>(array.length);
+        for (int i = 0; i < array.length; i++) {
+            set.add(array[i]);
+        }
+        return set;
+    }
 }
diff --git a/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java b/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java
@@ -31,7 +31,10 @@ public ListArrayTypeDescriptor() {
         super(Object.class, new MutableMutabilityPlan<Object>() {
             @Override
             protected Object deepCopyNotNull(Object value) {
-                if (value instanceof Collection) {
+                if (value instanceof Set) {
+                    Object[] array = ((Set<Object>) value).toArray();
+                    return ArrayUtil.asSet(ArrayUtil.deepCopy(array));
+                } else if (value instanceof Collection) {
                     Object[] array = ((Collection<Object>) value).toArray();
                     return ArrayUtil.asList(ArrayUtil.deepCopy(array));
                 } else if (value.getClass().isArray()) {

diff --git a/...rnate-52/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java b/...rnate-52/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java
@@ -266,6 +266,30 @@ public void test() {
 
             assertEquals(2, events.size());
         });
+
+        Event _event = doInJPA(entityManager -> {
+            return entityManager.find(Event.class, 1L);
+        });
+
+        String newString = "New";
+        LocalDateTime newTimestamp = LocalDateTime.of(2024, 6, 4, 11, 22, 33);
+
+        assertEquals(2, _event.getSensorNames().size());
+        assertEquals(2, _event.getLocalDateTimeSetValues().size());
+        _event.getSensorNames().add(newString);
+        _event.getLocalDateTimeSetValues().add(newTimestamp);
+
+        doInJPA(entityManager -> {
+            entityManager.merge(_event);
+        });
+
+        doInJPA(entityManager -> {
+            Event event = entityManager.find(Event.class, 1L);
+            assertEquals(3, event.getSensorNames().size());
+            assertTrue(event.getSensorNames().contains(newString));
+            assertEquals(3, event.getLocalDateTimeSetValues().size());
+            assertTrue(event.getLocalDateTimeSetValues().contains(newTimestamp));
+        });
     }
 
     @Test

diff --git a/...nate-55/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java b/...nate-55/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <code>ArrayUtil</code> - Array utilities holder.
@@ -374,4 +376,17 @@ public static <T> List<T> asList(T[] array) {
         }
         return list;
     }
+
+    /**
+     * @param array array to transform
+     * @param <T>   array element type
+     * @return the {@link Set} representation of the array
+     */
+    public static <T> Set<T> asSet(T[] array) {
+        Set<T> set = new LinkedHashSet<T>(array.length);
+        for (int i = 0; i < array.length; i++) {
+            set.add(array[i]);
+        }
+        return set;
+    }
 }
diff --git a/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java b/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java
@@ -31,7 +31,10 @@ public ListArrayTypeDescriptor() {
         super(Object.class, new MutableMutabilityPlan<Object>() {
             @Override
             protected Object deepCopyNotNull(Object value) {
-                if (value instanceof Collection) {
+                if (value instanceof Set) {
+                    Object[] array = ((Set<Object>) value).toArray();
+                    return ArrayUtil.asSet(ArrayUtil.deepCopy(array));
+                } else if (value instanceof Collection) {
                     Object[] array = ((Collection<Object>) value).toArray();
                     return ArrayUtil.asList(ArrayUtil.deepCopy(array));
                 } else if (value.getClass().isArray()) {

diff --git a/...rnate-55/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java b/...rnate-55/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java
@@ -266,6 +266,30 @@ public void test() {
 
             assertEquals(2, events.size());
         });
+
+        Event _event = doInJPA(entityManager -> {
+            return entityManager.find(Event.class, 1L);
+        });
+
+        String newString = "New";
+        LocalDateTime newTimestamp = LocalDateTime.of(2024, 6, 4, 11, 22, 33);
+
+        assertEquals(2, _event.getSensorNames().size());
+        assertEquals(2, _event.getLocalDateTimeSetValues().size());
+        _event.getSensorNames().add(newString);
+        _event.getLocalDateTimeSetValues().add(newTimestamp);
+
+        doInJPA(entityManager -> {
+            entityManager.merge(_event);
+        });
+
+        doInJPA(entityManager -> {
+            Event event = entityManager.find(Event.class, 1L);
+            assertEquals(3, event.getSensorNames().size());
+            assertTrue(event.getSensorNames().contains(newString));
+            assertEquals(3, event.getLocalDateTimeSetValues().size());
+            assertTrue(event.getLocalDateTimeSetValues().contains(newTimestamp));
+        });
     }
 
     @Test

diff --git a/...nate-60/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java b/...nate-60/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <code>ArrayUtil</code> - Array utilities holder.
@@ -374,4 +376,17 @@ public static <T> List<T> asList(T[] array) {
         }
         return list;
     }
+
+    /**
+     * @param array array to transform
+     * @param <T>   array element type
+     * @return the {@link Set} representation of the array
+     */
+    public static <T> Set<T> asSet(T[] array) {
+        Set<T> set = new LinkedHashSet<T>(array.length);
+        for (int i = 0; i < array.length; i++) {
+            set.add(array[i]);
+        }
+        return set;
+    }
 }
diff --git a/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java b/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java
@@ -32,8 +32,13 @@ public ListArrayTypeDescriptor() {
         super(Collection.class, new MutableMutabilityPlan<>() {
             @Override
             protected Collection deepCopyNotNull(Collection value) {
+                if (value instanceof Set) {
+                    Object[] array = ((Set<Object>) value).toArray();
+                    return ArrayUtil.asSet(ArrayUtil.deepCopy(array));
+                } else {
                     Object[] array = ((Collection<Object>) value).toArray();
                     return ArrayUtil.asList(ArrayUtil.deepCopy(array));
+                }
             }
 
             @Override

diff --git a/...rnate-60/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java b/...rnate-60/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java
@@ -261,6 +261,30 @@ public void test() {
 
             assertEquals(2, events.size());
         });
+
+        Event _event = doInJPA(entityManager -> {
+            return entityManager.find(Event.class, 1L);
+        });
+
+        String newString = "New";
+        LocalDateTime newTimestamp = LocalDateTime.of(2024, 6, 4, 11, 22, 33);
+
+        assertEquals(2, _event.getSensorNames().size());
+        assertEquals(2, _event.getLocalDateTimeSetValues().size());
+        _event.getSensorNames().add(newString);
+        _event.getLocalDateTimeSetValues().add(newTimestamp);
+
+        doInJPA(entityManager -> {
+            entityManager.merge(_event);
+        });
+
+        doInJPA(entityManager -> {
+            Event event = entityManager.find(Event.class, 1L);
+            assertEquals(3, event.getSensorNames().size());
+            assertTrue(event.getSensorNames().contains(newString));
+            assertEquals(3, event.getLocalDateTimeSetValues().size());
+            assertTrue(event.getLocalDateTimeSetValues().contains(newTimestamp));
+        });
     }
 
     @Test

diff --git a/...nate-62/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java b/...nate-62/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <code>ArrayUtil</code> - Array utilities holder.
@@ -374,4 +376,17 @@ public static <T> List<T> asList(T[] array) {
         }
         return list;
     }
+
+    /**
+     * @param array array to transform
+     * @param <T>   array element type
+     * @return the {@link Set} representation of the array
+     */
+    public static <T> Set<T> asSet(T[] array) {
+        Set<T> set = new LinkedHashSet<T>(array.length);
+        for (int i = 0; i < array.length; i++) {
+            set.add(array[i]);
+        }
+        return set;
+    }
 }
diff --git a/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java b/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java
@@ -32,8 +32,13 @@ public ListArrayTypeDescriptor() {
         super(Collection.class, new MutableMutabilityPlan<>() {
             @Override
             protected Collection deepCopyNotNull(Collection value) {
-                Object[] array = ((Collection<Object>) value).toArray();
-                return ArrayUtil.asList(ArrayUtil.deepCopy(array));
+                if (value instanceof Set) {
+                    Object[] array = ((Set<Object>) value).toArray();
+                    return ArrayUtil.asSet(ArrayUtil.deepCopy(array));
+                } else {
+                    Object[] array = ((Collection<Object>) value).toArray();
+                    return ArrayUtil.asList(ArrayUtil.deepCopy(array));
+                }
             }
 
             @Override

diff --git a/...rnate-62/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java b/...rnate-62/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java
@@ -261,6 +261,30 @@ public void test() {
 
             assertEquals(2, events.size());
         });
+
+        Event _event = doInJPA(entityManager -> {
+            return entityManager.find(Event.class, 1L);
+        });
+
+        String newString = "New";
+        LocalDateTime newTimestamp = LocalDateTime.of(2024, 6, 4, 11, 22, 33);
+
+        assertEquals(2, _event.getSensorNames().size());
+        assertEquals(2, _event.getLocalDateTimeSetValues().size());
+        _event.getSensorNames().add(newString);
+        _event.getLocalDateTimeSetValues().add(newTimestamp);
+
+        doInJPA(entityManager -> {
+            entityManager.merge(_event);
+        });
+
+        doInJPA(entityManager -> {
+            Event event = entityManager.find(Event.class, 1L);
+            assertEquals(3, event.getSensorNames().size());
+            assertTrue(event.getSensorNames().contains(newString));
+            assertEquals(3, event.getLocalDateTimeSetValues().size());
+            assertTrue(event.getLocalDateTimeSetValues().contains(newTimestamp));
+        });
     }
 
     @Test

diff --git a/...nate-63/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java b/...nate-63/src/main/java/io/hypersistence/utils/hibernate/type/array/internal/ArrayUtil.java
@@ -4,7 +4,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * <code>ArrayUtil</code> - Array utilities holder.
@@ -374,4 +376,17 @@ public static <T> List<T> asList(T[] array) {
         }
         return list;
     }
+
+    /**
+     * @param array array to transform
+     * @param <T>   array element type
+     * @return the {@link Set} representation of the array
+     */
+    public static <T> Set<T> asSet(T[] array) {
+        Set<T> set = new LinkedHashSet<T>(array.length);
+        for (int i = 0; i < array.length; i++) {
+            set.add(array[i]);
+        }
+        return set;
+    }
 }
diff --git a/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java b/...in/java/io/hypersistence/utils/hibernate/type/array/internal/ListArrayTypeDescriptor.java
@@ -32,8 +32,13 @@ public ListArrayTypeDescriptor() {
         super(Collection.class, new MutableMutabilityPlan<>() {
             @Override
             protected Collection deepCopyNotNull(Collection value) {
-                Object[] array = ((Collection<Object>) value).toArray();
-                return ArrayUtil.asList(ArrayUtil.deepCopy(array));
+                if (value instanceof Set) {
+                    Object[] array = ((Set<Object>) value).toArray();
+                    return ArrayUtil.asSet(ArrayUtil.deepCopy(array));
+                } else {
+                    Object[] array = ((Collection<Object>) value).toArray();
+                    return ArrayUtil.asList(ArrayUtil.deepCopy(array));
+                }
             }
 
             @Override

diff --git a/...rnate-63/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java b/...rnate-63/src/test/java/io/hypersistence/utils/hibernate/type/array/ListArrayTypeTest.java
@@ -261,6 +261,30 @@ public void test() {
 
             assertEquals(2, events.size());
         });
+
+        Event _event = doInJPA(entityManager -> {
+             return entityManager.find(Event.class, 1L);
+        });
+
+        String newString = "New";
+        LocalDateTime newTimestamp = LocalDateTime.of(2024, 6, 4, 11, 22, 33);
+
+        assertEquals(2, _event.getSensorNames().size());
+        assertEquals(2, _event.getLocalDateTimeSetValues().size());
+        _event.getSensorNames().add(newString);
+        _event.getLocalDateTimeSetValues().add(newTimestamp);
+
+        doInJPA(entityManager -> {
+            entityManager.merge(_event);
+        });
+
+        doInJPA(entityManager -> {
+            Event event = entityManager.find(Event.class, 1L);
+            assertEquals(3, event.getSensorNames().size());
+            assertTrue(event.getSensorNames().contains(newString));
+            assertEquals(3, event.getLocalDateTimeSetValues().size());
+            assertTrue(event.getLocalDateTimeSetValues().contains(newTimestamp));
+        });
     }
 
     @Test