Add cache existence checking before creation (#1)

unidev-polydata · Mar 18, 2023 · 6206bab · 6206bab
1 parent ea46e8c
commit 6206bab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,9 @@ Cache integration:
 cache:
     data:
         type: jcache
-        name: org.ehcache.jsr107.EhcacheCachingProvider
+        provider: org.ehcache.jsr107.EhcacheCachingProvider
+        implementationUri: "file://./ehcache.xml"
+        name: "polydata"
 ```
 
 ## License

diff --git a/polydata-factory/src/main/java/com/unidev/polydata4/factory/StorageFactory.java b/polydata-factory/src/main/java/com/unidev/polydata4/factory/StorageFactory.java
@@ -12,6 +12,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Interface for storage factories
@@ -49,9 +50,20 @@ default Optional<Cache<String, BasicPoly>> fetchCache(BasicPoly config) {
             if (StringUtils.isNotBlank(implementationUri)) {
                 try {
                     CacheManager cacheManager = provider.getCacheManager(new URI(implementationUri), null);
-                    Optional<MutableConfiguration<String, BasicPoly>> configuration = fetchJCacheConfig(config);
-                    if (configuration.isPresent()) {
-                        cache = cacheManager.createCache(cacheName, configuration.get());
+                    AtomicBoolean cacheExists = new AtomicBoolean(false);
+                    cacheManager.getCacheNames().iterator().forEachRemaining(name -> {
+                        if (name.equals(cacheName)) {
+                            cacheExists.set(true);
+                        }
+                    });
+
+                    if (!cacheExists.get()) {
+                        Optional<MutableConfiguration<String, BasicPoly>> configuration = fetchJCacheConfig(config);
+                        if (configuration.isPresent()) {
+                            cache = cacheManager.createCache(cacheName, configuration.get());
+                        } else {
+                            cache = cacheManager.getCache(cacheName);
+                        }
                     } else {
                         cache = cacheManager.getCache(cacheName);
                     }