Upgrade Hibernate to version 6.1.1.Final

Author: fmbenhassine

pom.xml

@@ -68,7 +68,7 @@
 		<spring-ldap.version>3.0.0-SNAPSHOT</spring-ldap.version>
 		<avro.version>1.9.2</avro.version>
 		<gson.version>2.9.0</gson.version>
-		<hibernate-core-jakarta.version>5.6.9.Final</hibernate-core-jakarta.version>
+		<hibernate-core.version>6.1.1.Final</hibernate-core.version>
 		<jakarta.annotation-api.version>2.0.0</jakarta.annotation-api.version>
 		<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
 		<jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>

spring-batch-infrastructure/pom.xml

@@ -96,9 +96,9 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-core-jakarta.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2019 the original author or authors.
+ * Copyright 2006-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@
  *
  * @author Robert Kasanicky
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  */
 public class HibernateCursorItemReader<T> extends AbstractItemCountingItemStreamItemReader<T>
 		implements InitializingBean {
@@ -62,7 +63,7 @@ public HibernateCursorItemReader() {
 		setName(ClassUtils.getShortName(HibernateCursorItemReader.class));
 	}
 
-	private ScrollableResults cursor;
+	private ScrollableResults<? extends T> cursor;
 
 	private boolean initialized = false;
 
@@ -143,25 +144,7 @@ public void setUseStatelessSession(boolean useStatelessSession) {
 	@Override
 	protected T doRead() throws Exception {
 		if (cursor.next()) {
-			Object[] data = cursor.get();
-
-			if (data.length > 1) {
-				// If there are multiple items this must be a projection
-				// and T is an array type.
-				@SuppressWarnings("unchecked")
-				T item = (T) data;
-				return item;
-			}
-			else {
-				// Assume if there is only one item that it is the data the user
-				// wants.
-				// If there is only one item this is going to be a nasty shock
-				// if T is an array type but there's not much else we can do...
-				@SuppressWarnings("unchecked")
-				T item = (T) data[0];
-				return item;
-			}
-
+			return cursor.get();
 		}
 		return null;
 	}

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java

@@ -111,7 +111,7 @@ public void afterPropertiesSet() throws Exception {
 	 * @param parameterValues the parameter values to use (or null if none).
 	 * @return a forward-only {@link ScrollableResults}
 	 */
-	public ScrollableResults getForwardOnlyCursor(int fetchSize, Map<String, Object> parameterValues) {
+	public ScrollableResults<? extends T> getForwardOnlyCursor(int fetchSize, Map<String, Object> parameterValues) {
 		Query<? extends T> query = createQuery();
 		if (!CollectionUtils.isEmpty(parameterValues)) {
 			query.setProperties(parameterValues);
@@ -123,7 +123,6 @@ public ScrollableResults getForwardOnlyCursor(int fetchSize, Map<String, Object>
 	 * Open appropriate type of hibernate session and create the query.
 	 * @return a Hibernate Query
 	 */
-	@SuppressWarnings("unchecked") // Hibernate APIs do not use a typed Query
 	public Query<? extends T> createQuery() {
 
 		if (useStatelessSession) {

spring-batch-samples/pom.xml

@@ -72,9 +72,9 @@
 			<version>${aspectj.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core-jakarta</artifactId>
-			<version>${hibernate-core-jakarta.version}</version>
+			<groupId>org.hibernate.orm</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate-core.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>