UUID not working as GeneratedValue Id with merge - fix (#2087)

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Mar 6, 2024 · 592506c · 592506c
1 parent 4c3c2b4
commit 592506c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 9 deletions.
diff --git a/...istence.core/src/main/java/org/eclipse/persistence/mappings/converters/UUIDConverter.java b/...istence.core/src/main/java/org/eclipse/persistence/mappings/converters/UUIDConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,9 @@ public UUIDConverter() {
      */
     @Override
     public Object convertObjectValueToDataValue(Object uuidValue, Session session) {
+        if (uuidValue == null) {
+            return null;
+        }
         if (uuidValue instanceof UUID) {
             return uuidValue.toString();
         }

diff --git a/...selink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/uuid/TestUuidCommon.java b/...selink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/uuid/TestUuidCommon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,7 +32,8 @@
 @Ignore
 public abstract class TestUuidCommon {
 
-    private static final String NAME_UUID = "Persist UUID UUID 1";
+    private static final String NAME_UUID1 = "Persist UUID UUID 1";
+    private static final String NAME_UUID2 = "Merge UUID UUID 2";
 
     abstract EntityManagerFactory getEmf();
 
@@ -41,10 +42,11 @@ public abstract class TestUuidCommon {
      */
     @Test
     public void testUuid() {
-        UUID uuid = persistUUIDUUIDEntity();
+        UUID uuid1 = persistUUIDUUIDEntity();
+        mergeUUIDUUIDEntity();
         queryAllUUIDUUIDEntity();
-        queryWithParameterUUIDUUIDEntity(uuid);
-        findUUIDUUIDEntityTest(uuid);
+        queryWithParameterUUIDUUIDEntity(uuid1);
+        findUUIDUUIDEntityTest(uuid1);
     }
 
     private UUID persistUUIDUUIDEntity() {
@@ -53,7 +55,7 @@ private UUID persistUUIDUUIDEntity() {
         try {
             em.getTransaction().begin();
             UUIDUUIDEntity entity = new UUIDUUIDEntity();
-            entity.setName(NAME_UUID);
+            entity.setName(NAME_UUID1);
             em.persist(entity);
             uuidResult = entity.getId();
             assertNotNull(uuidResult);
@@ -71,6 +73,30 @@ private UUID persistUUIDUUIDEntity() {
         return uuidResult;
     }
 
+    private UUID mergeUUIDUUIDEntity() {
+        EntityManager em = getEmf().createEntityManager();
+        UUID uuidResult = null;
+        try {
+            em.getTransaction().begin();
+            UUIDUUIDEntity entity = new UUIDUUIDEntity();
+            entity.setName(NAME_UUID2);
+            entity = em.merge(entity);
+            uuidResult = entity.getId();
+            assertNotNull(uuidResult);
+            em.getTransaction().commit();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        finally {
+            if (em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+            em.close();
+        }
+        return uuidResult;
+    }
+
     public void queryAllUUIDUUIDEntity() {
         EntityManager em = getEmf().createEntityManager();
         try {
@@ -102,7 +128,7 @@ public void queryWithParameterUUIDUUIDEntity(UUID id) {
                 assertNotNull(entity);
                 assertNotNull(entity.getId());
                 assertEquals(id, entity.getId());
-                assertEquals(NAME_UUID, entity.getName());
+                assertEquals(NAME_UUID1, entity.getName());
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -122,7 +148,7 @@ public void findUUIDUUIDEntityTest(UUID id) {
             UUIDUUIDEntity entity = em.find(UUIDUUIDEntity.class, id);
             assertNotNull(entity);
             assertEquals(id, entity.getId());
-            assertEquals(NAME_UUID, entity.getName());
+            assertEquals(NAME_UUID1, entity.getName());
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException();