Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14837 - Move to Jakarta EE 

fix-ups from the latest rebase
This commit is contained in:
Steve Ebersole 2021-09-27 08:35:26 -05:00
parent 7bc1d55cdd
commit f07a36b78f
6 changed files with 4 additions and 2617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java
View File

@ -15,9 +15,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
import org.hibernate.EmptyInterceptor; import org.hibernate.EmptyInterceptor;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
@ -34,9 +31,7 @@ import org.hibernate.transform.Transformers;
import org.hibernate.type.Type; import org.hibernate.type.Type;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.DialectFeatureChecks;
import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.RequiresDialectFeature;
import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistry;
import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.SessionFactoryScope;
@ -45,6 +40,10 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;

2441
hibernate-core/src/test/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java
View File

File diff suppressed because it is too large Load Diff

20
hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheIgnoreResultTransformerTest.java
View File

@ -1,20 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.querycache;
import org.hibernate.CacheMode;
/**
* @author Gail Badner
*/
public class CriteriaQueryCacheIgnoreResultTransformerTest extends AbstractQueryCacheResultTransformerTest {
@Override
protected CacheMode getQueryCacheMode() {
return CacheMode.IGNORE;
}
}

19
hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCacheNormalResultTransformerTest.java
View File

@ -1,19 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.querycache;
import org.hibernate.CacheMode;
/**
* @author Gail Badner
*/
public class CriteriaQueryCacheNormalResultTransformerTest extends CriteriaQueryCachePutResultTransformerTest {
@Override
protected CacheMode getQueryCacheMode() {
return CacheMode.NORMAL;
}
}

24
hibernate-core/src/test/java/org/hibernate/test/querycache/CriteriaQueryCachePutResultTransformerTest.java
View File

@ -1,24 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.querycache;
import org.hibernate.CacheMode;
/**
* @author Gail Badner
*/
public class CriteriaQueryCachePutResultTransformerTest extends CriteriaQueryCacheIgnoreResultTransformerTest {
@Override
protected CacheMode getQueryCacheMode() {
return CacheMode.PUT;
}
@Override
protected boolean areDynamicNonLazyAssociationsChecked() {
return false;
}
}

108
hibernate-core/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java
View File

@ -1,108 +0,0 @@
package org.hibernate.test.querycache;
import java.util.List;
import org.hibernate.Hibernate;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.orm.test.querycache.CompositeKey;
import org.hibernate.orm.test.querycache.EntityWithCompositeKey;
import org.hibernate.orm.test.querycache.EntityWithStringCompositeKey;
import org.hibernate.orm.test.querycache.Item;
import org.hibernate.orm.test.querycache.StringCompositeKey;
import org.hibernate.stat.QueryStatistics;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.ServiceRegistry;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.testing.orm.junit.Setting;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@DomainModel(
xmlMappings = "org/hibernate/orm/test/querycache/Item.hbm.xml",
annotatedClasses = {
CompositeKey.class,
EntityWithCompositeKey.class,
StringCompositeKey.class,
EntityWithStringCompositeKey.class
},
concurrencyStrategy = "nonstrict-read-write"
)
@SessionFactory(generateStatistics = true)
@ServiceRegistry(
settings = {
@Setting(name = AvailableSettings.USE_QUERY_CACHE, value = "true"),
@Setting(name = AvailableSettings.CACHE_REGION_PREFIX, value = "foo"),
@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true")
}
)
public class QueryCacheTest {
/*
All the other tests of QueryCacheTest have been already moved into org.hibernate.orm test paxkage
*/
@Test
public void testQueryCacheFetch(SessionFactoryScope scope) throws Exception {
scope.getSessionFactory().getCache().evictQueryRegions();
scope.getSessionFactory().getStatistics().clear();
// persist our 2 items. This saves them to the db, but also into the second level entity cache region
scope.inTransaction(
session -> {
Item i = new Item();
i.setName( "widget" );
i.setDescription( "A really top-quality, full-featured widget." );
Item i2 = new Item();
i2.setName( "other widget" );
i2.setDescription( "Another decent widget." );
session.persist( i );
session.persist( i2 );
}
);
final String queryString = "from Item i where i.name like '%widget'";
QueryStatistics qs = scope.getSessionFactory().getStatistics().getQueryStatistics( queryString );
Thread.sleep( 200 );
// perform the cacheable query. this will execute the query (no query cache hit), but the Items will be
// found in second level entity cache region
scope.inTransaction(
session -> {
List result = session.createQuery( queryString ).setCacheable( true ).list();
assertEquals( 2, result.size() );
}
);
assertEquals( 0, qs.getCacheHitCount() );
assertEquals( 0, scope.getSessionFactory().getStatistics().getEntityFetchCount() );
// evict the Items from the second level entity cache region
scope.getSessionFactory().getCache().evictEntityRegion( Item.class );
// now, perform the cacheable query again. this time we should not execute the query (query cache hit).
// However, the Items will not be found in second level entity cache region this time (we evicted them above)
// nor are they in associated with the session.
scope.inTransaction(
session -> {
List result = session.createQuery( queryString ).setCacheable( true ).list();
assertEquals( 2, result.size() );
assertTrue( Hibernate.isInitialized( result.get( 0 ) ) );
assertTrue( Hibernate.isInitialized( result.get( 1 ) ) );
}
);
assertEquals( 1, qs.getCacheHitCount() );
assertEquals( 1, scope.getSessionFactory().getStatistics().getEntityFetchCount() );
scope.inTransaction(
session ->
session.createQuery( "delete Item" ).executeUpdate()
);
}
}