HBX-2789: Review WrapperFactory class and create only new Wrapper intances

  - Interface method 'org.hibernate.tool.orm.jbt.api.wrp.SessionWrapper#createCriteria(Class<?>)' returns in instance of interface 'org.hibernate.tool.orm.jbt.api.wrp.QueryWrapper'
  - Adapt implementation of method 'org.hibernate.tool.orm.jbt.internal.factory.SessionWrapperFactory.SessionWrapperImpl#createCriteria(Class<?>)'
  - Adapt test method 'org.hibernate.tool.orm.jbt.internal.factory.
SessionWrapperFactoryTest#testCreateCriteria()'

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapper.java

@@ -1,7 +1,5 @@
 package org.hibernate.tool.orm.jbt.api.wrp;
 
-import jakarta.persistence.Query;
-
 public interface SessionWrapper extends Wrapper {
 
 	String getEntityName(Object o) ;
@@ -10,6 +8,6 @@ public interface SessionWrapper extends Wrapper {
 	boolean isOpen();
 	void close();
 	boolean contains(Object o);
-	Query createCriteria(Class<?> c);
+	QueryWrapper createCriteria(Class<?> c);
 
 }

jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/SessionWrapperFactory.java

@@ -2,11 +2,11 @@
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.query.Query;
 import org.hibernate.tool.orm.jbt.api.wrp.QueryWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.SessionFactoryWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.SessionWrapper;
 
-import jakarta.persistence.Query;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
@@ -72,12 +72,12 @@ public boolean contains(Object o) {
 		}
 
 		@Override 
-		public Query createCriteria(Class<?> c) {
+		public QueryWrapper createCriteria(Class<?> c) {
 			CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
 			CriteriaQuery<?> criteriaQuery = criteriaBuilder.createQuery(c);
-			Root root = criteriaQuery.from(c);
-			criteriaQuery.select(root);
-			return ((Session)getWrappedObject()).createQuery(criteriaQuery);
+			criteriaQuery.select((Root)criteriaQuery.from(c));
+			Query<?> query = ((Session)getWrappedObject()).createQuery(criteriaQuery);
+			return QueryWrapperFactory.createQueryWrapper(query);
 		}
 
 	}

jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/SessionWrapperTest.java

@@ -16,6 +16,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.query.Query;
 import org.hibernate.tool.orm.jbt.internal.factory.SessionWrapperFactory;
 import org.hibernate.tool.orm.jbt.util.MockConnectionProvider;
 import org.hibernate.tool.orm.jbt.util.MockDialect;
@@ -126,8 +127,10 @@ public void testContains() {
 
 	@Test
 	public void testCreateCriteria() {
-		jakarta.persistence.Query query = sessionWrapper.createCriteria(Foo.class);
-		assertNotNull(query);
+		QueryWrapper queryWrapper = sessionWrapper.createCriteria(Foo.class);
+		assertNotNull(queryWrapper);
+		Query<?> q = (Query)queryWrapper.getWrappedObject();
+		assertSame(q.getSession(), sessionWrapper.getWrappedObject());
 	}
 
 }