fix: add alias for default ehcache (#17887)

dhis2 · Jun 26, 2024 · fbe637c · fbe637c
1 parent 139370f
commit fbe637c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java b/...is-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/config/HibernateConfig.java
@@ -42,6 +42,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.hibernate.SessionFactory;
+import org.hibernate.cache.ehcache.ConfigSettings;
+import org.hibernate.cache.ehcache.MissingCacheStrategy;
 import org.hibernate.cache.ehcache.internal.EhcacheRegionFactory;
 import org.hibernate.cfg.AvailableSettings;
 import org.hisp.dhis.cache.DefaultHibernateCacheManager;
@@ -153,6 +155,7 @@ private Properties getAdditionalProperties(DhisConfigurationProvider dhisConfig)
       properties.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, "true");
       properties.put(AvailableSettings.CACHE_REGION_FACTORY, EhcacheRegionFactory.class.getName());
       properties.put(AvailableSettings.USE_QUERY_CACHE, dhisConfig.getProperty(USE_QUERY_CACHE));
+      properties.put(ConfigSettings.MISSING_CACHE_STRATEGY, MissingCacheStrategy.CREATE);
     }
 
     // TODO: this is anti-pattern and should be turn off

diff --git a/dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml b/dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ehcache>
 
-  <!-- Default cache -->
-
+<!-- Default cache -->
   <!-- 
     Ensure that default cache has less frequent expiration than query cache
     to avoid individual select queries per entity.
@@ -13,19 +12,20 @@
     eternal="false" 
     timeToIdleSeconds="21600" 
     timeToLiveSeconds="21600"
-    overflowToDisk="false" 
+    overflowToDisk="false"
     diskPersistent="false" />
 
   <!-- Hibernate query cache -->
 
-  <cache name="org.hibernate.cache.internal.StandardQueryCache"
+  <cache name="default-query-results-region"
     maxElementsInMemory="1000000" 
     eternal="false" 
     timeToIdleSeconds="21600" 
     timeToLiveSeconds="21600"
     overflowToDisk="false" 
     diskPersistent="false" />
 
-  <cache name="org.hibernate.cache.spi.UpdateTimestampsCache" 
+  <cache name="default-update-timestamps-region" 
     maxElementsInMemory="5000" />
+
 </ehcache>