HHH-14837 : Re-enable hibernate-jcache module.
This commit is contained in:
parent
b4cfe7e54a
commit
55db51894f
|
@ -29,7 +29,7 @@ dependencies {
|
|||
testImplementation project(':hibernate-testing')
|
||||
testImplementation project(':hibernate-envers')
|
||||
testImplementation project(':hibernate-spatial')
|
||||
// testImplementation project( ':hibernate-jcache' )
|
||||
testImplementation project(':hibernate-jcache')
|
||||
testImplementation project( path: ':hibernate-core', configuration: 'tests' )
|
||||
|
||||
testImplementation 'org.apache.commons:commons-lang3:3.4'
|
||||
|
@ -39,7 +39,11 @@ dependencies {
|
|||
testImplementation libraries.mockito_inline
|
||||
|
||||
testRuntimeOnly libraries.wildfly_transaction_client
|
||||
testRuntimeOnly libraries.ehcache3
|
||||
testRuntimeOnly(libraries.ehcache3) {
|
||||
capabilities {
|
||||
requireCapability 'org.ehcache.modules:ehcache-xml-jakarta'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -8,8 +8,10 @@ package org.hibernate.userguide.caching;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.hibernate.Session;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
|
||||
|
||||
import org.junit.Test;
|
||||
|
@ -32,6 +34,13 @@ public class FirstLevelCacheTest extends BaseEntityManagerFunctionalTestCase {
|
|||
return new Class<?>[] { Person.class };
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings( "unchecked" )
|
||||
protected void addConfigOptions(Map options) {
|
||||
options.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.TRUE.toString());
|
||||
options.put(AvailableSettings.CACHE_REGION_FACTORY, "jcache");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCache() {
|
||||
Person aPerson = doInJPA( this::entityManagerFactory, entityManager -> {
|
||||
|
|
|
@ -11,10 +11,10 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
|
||||
import org.hibernate.annotations.CacheConcurrencyStrategy;
|
||||
import org.hibernate.cache.jcache.JCacheHelper;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
|
||||
|
||||
import org.hibernate.testing.FailureExpected;
|
||||
import org.junit.Test;
|
||||
|
||||
import jakarta.persistence.Cacheable;
|
||||
|
@ -27,29 +27,30 @@ import jakarta.persistence.ManyToOne;
|
|||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Version;
|
||||
|
||||
import javax.cache.configuration.MutableConfiguration;
|
||||
|
||||
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
|
||||
|
||||
|
||||
/**
|
||||
* @author Vlad Mihalcea
|
||||
*/
|
||||
@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" )
|
||||
public class NonStrictReadWriteCacheTest extends BaseEntityManagerFunctionalTestCase {
|
||||
|
||||
@Override
|
||||
public void buildEntityManagerFactory() {
|
||||
// JCacheHelper.locateStandardCacheManager().createCache(
|
||||
// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person",
|
||||
// new MutableConfiguration<>()
|
||||
// );
|
||||
// JCacheHelper.locateStandardCacheManager().createCache(
|
||||
// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone",
|
||||
// new MutableConfiguration<>()
|
||||
// );
|
||||
// JCacheHelper.locateStandardCacheManager().createCache(
|
||||
// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones",
|
||||
// new MutableConfiguration<>()
|
||||
// );
|
||||
JCacheHelper.locateStandardCacheManager().createCache(
|
||||
"hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person",
|
||||
new MutableConfiguration<>()
|
||||
);
|
||||
JCacheHelper.locateStandardCacheManager().createCache(
|
||||
"hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone",
|
||||
new MutableConfiguration<>()
|
||||
);
|
||||
JCacheHelper.locateStandardCacheManager().createCache(
|
||||
"hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones",
|
||||
new MutableConfiguration<>()
|
||||
);
|
||||
|
||||
super.buildEntityManagerFactory();
|
||||
}
|
||||
|
|
|
@ -11,30 +11,31 @@ import java.util.Map;
|
|||
import org.hibernate.Session;
|
||||
import org.hibernate.annotations.NaturalId;
|
||||
import org.hibernate.annotations.NaturalIdCache;
|
||||
import org.hibernate.cache.jcache.JCacheHelper;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
|
||||
|
||||
import org.hibernate.testing.FailureExpected;
|
||||
import org.junit.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
import javax.cache.configuration.MutableConfiguration;
|
||||
|
||||
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
/**
|
||||
* @author Vlad Mihalcea
|
||||
*/
|
||||
@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" )
|
||||
public class CacheableNaturalIdTest extends BaseEntityManagerFunctionalTestCase {
|
||||
|
||||
@Override
|
||||
public void buildEntityManagerFactory() {
|
||||
// JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() );
|
||||
// JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() );
|
||||
// JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() );
|
||||
//// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() );
|
||||
JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() );
|
||||
JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() );
|
||||
JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() );
|
||||
// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() );
|
||||
|
||||
super.buildEntityManagerFactory();
|
||||
}
|
||||
|
|
|
@ -43,6 +43,8 @@ public class MultiLoadIdTest extends BaseEntityManagerFunctionalTestCase {
|
|||
|
||||
@Override
|
||||
protected void addMappings(Map settings) {
|
||||
settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true );
|
||||
settings.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" );
|
||||
settings.put( AvailableSettings.GENERATE_STATISTICS, Boolean.TRUE.toString() );
|
||||
sqlStatementInterceptor = new SQLStatementInterceptor( settings );
|
||||
}
|
||||
|
|
|
@ -176,7 +176,7 @@ ext {
|
|||
|
||||
c3p0: "com.mchange:c3p0:0.9.5.5",
|
||||
ehcache: "net.sf.ehcache:ehcache:2.10.6",
|
||||
ehcache3: "org.ehcache:ehcache:3.8.1",
|
||||
ehcache3: "org.ehcache:ehcache:3.10.0-alpha0",
|
||||
jcache: "javax.cache:cache-api:1.0.0",
|
||||
proxool: "proxool:proxool:0.8.3",
|
||||
hikaricp: "com.zaxxer:HikariCP:3.2.0",
|
||||
|
|
|
@ -4,12 +4,16 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' )
|
|||
|
||||
|
||||
dependencies {
|
||||
implementation project( ':hibernate-core' )
|
||||
implementation libraries.jcache
|
||||
api project( ':hibernate-core' )
|
||||
api libraries.jcache
|
||||
|
||||
testImplementation project( ':hibernate-testing' )
|
||||
testImplementation libraries.mockito
|
||||
testImplementation libraries.mockito_inline
|
||||
|
||||
testRuntimeOnly libraries.ehcache3
|
||||
testRuntimeOnly(libraries.ehcache3) {
|
||||
capabilities {
|
||||
requireCapability 'org.ehcache.modules:ehcache-xml-jakarta'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.jcache;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
import org.hibernate.annotations.Cache;
|
||||
import org.hibernate.annotations.CacheConcurrencyStrategy;
|
||||
|
|
|
@ -9,13 +9,14 @@ package org.hibernate.orm.test.jcache;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import javax.persistence.CascadeType;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.OneToMany;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.annotations.Cache;
|
||||
import org.hibernate.annotations.CacheConcurrencyStrategy;
|
||||
|
|
|
@ -8,12 +8,12 @@ package org.hibernate.orm.test.jcache;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.persistence.ElementCollection;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Version;
|
||||
import jakarta.persistence.ElementCollection;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.persistence.Version;
|
||||
import org.hibernate.annotations.Cache;
|
||||
import org.hibernate.annotations.CacheConcurrencyStrategy;
|
||||
import org.hibernate.boot.Metadata;
|
||||
|
|
|
@ -31,6 +31,7 @@ import org.hibernate.orm.test.jcache.domain.VersionedItem;
|
|||
import org.hibernate.orm.test.jcache.domain.Event;
|
||||
import org.hibernate.mapping.Collection;
|
||||
import org.hibernate.mapping.PersistentClass;
|
||||
import org.hibernate.testing.orm.junit.DialectContext;
|
||||
import org.hibernate.tool.schema.Action;
|
||||
|
||||
import static org.hibernate.cache.jcache.JCacheHelper.locateStandardCacheManager;
|
||||
|
@ -121,7 +122,7 @@ public class TestHelper {
|
|||
.applySetting( AvailableSettings.HBM2DDL_DATABASE_ACTION, Action.CREATE_DROP )
|
||||
.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
|
||||
|
||||
if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) {
|
||||
if ( H2Dialect.class.equals( DialectContext.getDialect().getClass() ) ) {
|
||||
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc" );
|
||||
}
|
||||
return ssrb;
|
||||
|
|
|
@ -12,8 +12,8 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.ListIterator;
|
||||
|
||||
import javax.persistence.criteria.CriteriaBuilder;
|
||||
import javax.persistence.criteria.CriteriaQuery;
|
||||
import jakarta.persistence.criteria.CriteriaBuilder;
|
||||
import jakarta.persistence.criteria.CriteriaQuery;
|
||||
|
||||
import org.hibernate.query.Query;
|
||||
import org.hibernate.Session;
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.jcache.domain;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.Id;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
|
||||
/**
|
||||
* @author Vlad Mihalcea
|
||||
|
|
|
@ -130,8 +130,8 @@ dependencies {
|
|||
vibur project( ':hibernate-vibur' )
|
||||
javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )
|
||||
|
||||
// jcache project( ':hibernate-jcache' )
|
||||
// javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
|
||||
jcache project( ':hibernate-jcache' )
|
||||
javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
|
||||
|
||||
jpamodelgen project( ':hibernate-jpamodelgen' )
|
||||
javadocSources project( path: ':hibernate-jpamodelgen', configuration: 'javadocSources' )
|
||||
|
|
|
@ -125,7 +125,7 @@ include 'hibernate-hikaricp'
|
|||
include 'hibernate-vibur'
|
||||
include 'hibernate-agroal'
|
||||
|
||||
//include 'hibernate-jcache'
|
||||
include 'hibernate-jcache'
|
||||
|
||||
include 'hibernate-micrometer'
|
||||
include 'hibernate-graalvm'
|
||||
|
|
Loading…
Reference in New Issue