HHH-18548 remove org.hibernate.annotations.QueryHints

Signed-off-by: Gavin King <[email protected]>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java

@@ -18,9 +18,9 @@
 import java.util.List;
 
 import org.hibernate.Session;
-import org.hibernate.annotations.QueryHints;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.OracleDialect;
+import org.hibernate.jpa.HibernateHints;
 import org.hibernate.procedure.ProcedureCall;
 import org.hibernate.query.procedure.ProcedureParameter;
 import org.hibernate.result.Output;
@@ -82,7 +82,7 @@ public class OracleStoredProcedureTest {
 	public void testUnRegisteredParameter(EntityManagerFactoryScope scope) {
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery function = em.createStoredProcedureQuery( "find_char", Integer.class );
-			function.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			function.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-string
 			function.registerStoredProcedureParameter( 1, String.class, ParameterMode.IN );
 			// source-string
@@ -101,7 +101,7 @@ public void testUnRegisteredParameter(EntityManagerFactoryScope scope) {
 	public void testUnRegisteredParameterByName2(EntityManagerFactoryScope scope) {
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery function = em.createStoredProcedureQuery( "find_char", Integer.class );
-			function.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			function.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-string
 			function.registerStoredProcedureParameter( "search_char", String.class, ParameterMode.IN );
 			// source-string
@@ -120,7 +120,7 @@ public void testUnRegisteredParameterByName2(EntityManagerFactoryScope scope) {
 	public void testUnRegisteredParameterByNameInvertedParameterRegistrationOrder(EntityManagerFactoryScope scope) {
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery function = em.createStoredProcedureQuery( "find_char", Integer.class );
-			function.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			function.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-string
 			function.registerStoredProcedureParameter( "string", String.class, ParameterMode.IN );
 			// source-string

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/OracleStoredProcedureTest.java

@@ -6,9 +6,9 @@
  */
 package org.hibernate.orm.test.procedure;
 
-import org.hibernate.annotations.QueryHints;
 import org.hibernate.dialect.H2Dialect;
 
+import org.hibernate.jpa.HibernateHints;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -41,7 +41,7 @@ public void testRegisteredParameter(EntityManagerFactoryScope scope) {
 		// registering and binding all 3 parameters
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery query = em.createStoredProcedureQuery("locate" );
-			query.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			query.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-tring
 			query.registerStoredProcedureParameter( 1, String.class, ParameterMode.IN );
 			// source-string
@@ -62,7 +62,7 @@ public void testRegisteredParameter(EntityManagerFactoryScope scope) {
 
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery query = em.createStoredProcedureQuery("locate" );
-			query.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			query.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-string
 			query.registerStoredProcedureParameter( 1, String.class, ParameterMode.IN );
 			// source-string
@@ -86,7 +86,7 @@ public void testUnRegisteredParameter(EntityManagerFactoryScope scope) {
 		// function's default value defined on the database to be applied
 		scope.inTransaction( (em) -> {
 			final StoredProcedureQuery query = em.createStoredProcedureQuery("locate" );
-			query.setHint( QueryHints.CALLABLE_FUNCTION, "true" );
+			query.setHint( HibernateHints.HINT_CALLABLE_FUNCTION, "true" );
 			// search-string
 			query.registerStoredProcedureParameter( 1, String.class, ParameterMode.IN );
 			// source-string