HHH-20028 - Update to Jakarta Persistence 4.0 #11558

sebersole · 2026-01-06T19:35:39Z

HHH-20028 - Update to Jakarta Persistence 4.0

Initial work...

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

https://hibernate.atlassian.net/browse/HHH-20028

hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java

hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java

@@ -114,7 +114,7 @@
 			// no-ops
 			session.getTransaction().begin();

-			Number customerCount = (Number) session.createSelectionQuery("select count(c) from Customer c").uniqueResult();
+			Number customerCount = session.createSelectionQuery("select count(c) from Customer c", Number.class).uniqueResult();


hibernate-core/src/test/java/org/hibernate/orm/test/transactions/TransactionsTest.java

@@ -176,7 +176,7 @@
 			session.getTransaction().begin();

 			session.persist(new Customer());
-			Customer customer = (Customer) session.createSelectionQuery("select c from Customer c").uniqueResult();
+			Customer customer = (Customer) session.createSelectionQuery("select c from Customer c", Customer.class).uniqueResult();


hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TimeoutMarshalling.java

+/// @author Steve Ebersole
+public class TimeoutMarshalling {
+	public static Timeout fromXml(String value) {
+		return value == null ? null : Timeout.seconds( Integer.parseInt( value ) );


hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java

 		if ( hasMapKeyProperty ) {
 			// JPA says: if missing, use primary key of associated entity
-			mapKeyPropertyName = nullIfEmpty( key.name() );
+			mapKeyPropertyName = coalesce( key.value(), key.name() );


hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java

 	}

+	@Override
+	public void setTimeout(int timeout) {


hibernate-core/src/test/java/org/hibernate/orm/test/hql/ManyToOneJoinReuseTest.java


 					JpaRoot<BookList> root = query.from( BookList.class );
-					Join<Object, Object> join = root.join( "book", JoinType.INNER );
+					Join<BookList, Object> join = root.join( "book", JoinType.INNER );


hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java

 			//tag::example-hql-selection-query[]
 			// can be validated while creating the SelectionQuery
-			SelectionQuery<?> badQuery = session.createSelectionQuery( "delete Person" );
+			SelectionQuery<?> badQuery = session.createSelectionQuery( "delete Person", Person.class );


hibernate-core/src/test/java/org/hibernate/orm/test/hql/SelectionQueryExampleTests.java

 			//tag::example-hql-named-selection-query[]
 			// can be validated while creating the SelectionQuery
-			SelectionQuery<?> badQuery = session.getNamedQuery( "delete_Person" );
+			SelectionQuery<?> badQuery = session.createNamedQuery( "delete_Person" );


hibernate-core/src/test/java/org/hibernate/orm/test/query/Jpa4ParameterBindingTests.java

+	public static class StringToIntConverter implements AttributeConverter<String,Integer> {
+		@Override
+		public Integer convertToDatabaseColumn(String domainValue) {
+			return domainValue == null ? null : Integer.parseInt( domainValue );


hibernate-core/src/main/java/org/hibernate/query/named/FetchMemento.java

 	 */
 	FetchBuilder resolve(Parent parent, Consumer<String> querySpaceConsumer, ResultSetMappingResolutionContext context);
+
+	default MemberMapping<?> toJpaMemberMapping(Parent parent, SessionFactory sessionFactory) {


hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java

+
 	ResultBuilder resolve(Consumer<String> querySpaceConsumer, ResultSetMappingResolutionContext context);
+
+	default <R> boolean canBeTreatedAsResultSetMapping(Class<R> resultType, SessionFactory sessionFactory) {


hibernate-core/src/main/java/org/hibernate/query/named/ResultMemento.java

+
+	<R> ResultSetMapping<R> toJpaMapping(SessionFactory sessionFactory);
+
+	default <R> MappingElement<R> toJpaMappingElement(SessionFactory sessionFactory) {
