EntityManagerFactory.setCacheRetrieveMode() setCacheStoreMode() and N…

…PE fix plus unit test (#2104) Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Mar 26, 2024 · 0f4718a · 0f4718a
1 parent a5c7f08
commit 0f4718a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/.../test/java/org/eclipse/persistence/testing/tests/jpa/persistence32/EntityManagerTest.java b/.../test/java/org/eclipse/persistence/testing/tests/jpa/persistence32/EntityManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -14,6 +14,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.persistence.EntityTransaction;
@@ -46,7 +48,9 @@ public static Test suite() {
                 new EntityManagerTest("testGetReferenceForExistingEntity"),
                 new EntityManagerTest("testGetReferenceForNotExistingEntity"),
                 new EntityManagerTest("testLockOptionUtilsUnknownClass"),
-                new EntityManagerTest("testLockPessimisticWriteWithTimeout")
+                new EntityManagerTest("testLockPessimisticWriteWithTimeout"),
+                new EntityManagerTest("testSetCacheRetrieveMode"),
+                new EntityManagerTest("testSetCacheStoreMode")
         );
     }
 
@@ -169,4 +173,21 @@ public void run() {
         }
     }
 
+    public void testSetCacheRetrieveMode() {
+        try (EntityManager em = emf.createEntityManager();) {
+            em.setCacheRetrieveMode(CacheRetrieveMode.BYPASS);
+            assertEquals(CacheRetrieveMode.BYPASS, em.getCacheRetrieveMode());
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
+    public void testSetCacheStoreMode() {
+        try (EntityManager em = emf.createEntityManager();) {
+            em.setCacheStoreMode(CacheStoreMode.USE);
+            assertEquals(CacheStoreMode.USE, em.getCacheStoreMode());
+        } catch (Exception e) {
+            throw e;
+        }
+    }
 }
diff --git a/...persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java b/...persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
@@ -2970,6 +2970,9 @@ public CacheRetrieveMode getCacheRetrieveMode() {
 
     @Override
     public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+        if (this.properties == null) {
+            this.properties = new HashMap<>();
+        }
         FindOptionUtils.setCacheRetrieveMode(properties, cacheRetrieveMode);
     }
 
@@ -2980,6 +2983,9 @@ public CacheStoreMode getCacheStoreMode() {
 
     @Override
     public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+        if (this.properties == null) {
+            this.properties = new HashMap<>();
+        }
         FindOptionUtils.setCacheStoreMode(properties, cacheStoreMode);
     }