root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Rewrite 2nd level cache to use ehcache 

Closes gh-44809
This commit is contained in:
Stéphane Nicoll 2025-03-20 15:50:56 +01:00
parent 9091f3f58f
commit 3ea272ac2a
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/Hibernate2ndLevelCacheIntegrationTests.java
View File

@ -16,14 +16,13 @@
package org.springframework.boot.autoconfigure.orm.jpa;
import com.hazelcast.cache.impl.HazelcastServerCachingProvider;
import org.ehcache.jsr107.EhcacheCachingProvider;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.testsupport.classpath.resources.WithResource;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Configuration;
@ -42,29 +41,12 @@ class Hibernate2ndLevelCacheIntegrationTests {
.withUserConfiguration(TestConfiguration.class);
@Test
@WithResource(name = "hazelcast.xml", content = """
<hazelcast
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-5.0.xsd"
xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<instance-name>default-instance</instance-name>
<map name="defaultCache" />
<network>
<join>
<auto-detection enabled="false" />
<multicast enabled="false" />
</join>
</network>
</hazelcast>
""")
void hibernate2ndLevelCacheWithJCacheAndHazelcast() {
String cachingProviderFqn = HazelcastServerCachingProvider.class.getName();
String configLocation = "classpath:hazelcast.xml";
void hibernate2ndLevelCacheWithJCacheAndEhCache() {
String cachingProviderFqn = EhcacheCachingProvider.class.getName();
this.contextRunner
.withPropertyValues("spring.cache.type=jcache", "spring.cache.jcache.provider=" + cachingProviderFqn,
"spring.cache.jcache.config=" + configLocation,
"spring.jpa.properties.hibernate.cache.region.factory_class=jcache",
"spring.jpa.properties.hibernate.cache.provider=" + cachingProviderFqn,
"spring.jpa.properties.hibernate.javax.cache.uri=" + configLocation)
"spring.jpa.properties.hibernate.cache.provider=" + cachingProviderFqn)
.run((context) -> assertThat(context).hasNotFailed());
}