HHH-19265 deprecate hibernate.jdbc.use_scrollable_resultset

Author: gavinking

hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java

@@ -405,21 +405,23 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
 	String STATEMENT_FETCH_SIZE = "hibernate.jdbc.fetch_size";
 
 	/**
-	 * Controls how Hibernate should handle scrollable results - <ul>
-	 * 	 <li>
-	 * 	     {@code true} indicates that {@linkplain java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE insensitive} scrolling can be used
-	 * 	 </li>
-	 * 	 <li>
-	 * 	     {@code false} indicates that {@linkplain java.sql.ResultSet#TYPE_SCROLL_SENSITIVE sensitive} scrolling must be used
-	 * 	 </li>
+	 * Controls how Hibernate should handle scrollable results:
+	 * <ul>
+	 * <li>{@code true} indicates that {@linkplain java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE insensitive}
+	 *     scrolling can be used;
+	 * <li>{@code false} indicates that {@linkplain java.sql.ResultSet#TYPE_FORWARD_ONLY forward-only}
+	 *     scrolling must be used.
 	 * </ul>
 	 *
 	 * @settingDefault {@code true} if the underlying driver supports scrollable results
 	 *
 	 * @see org.hibernate.boot.SessionFactoryBuilder#applyScrollableResultsSupport(boolean)
 	 * @see Query#scroll
 	 * @see ExtractedDatabaseMetaData#supportsScrollableResults()
+	 *
+	 * @deprecated It's not necessary to set this explicitly
 	 */
+	@Deprecated(since = "7", forRemoval = true)
 	String USE_SCROLLABLE_RESULTSET = "hibernate.jdbc.use_scrollable_resultset";
 
 	/**

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java

@@ -132,8 +132,8 @@ public PreparedStatement prepareQueryStatement(
 			boolean isCallable,
 			@Nullable ScrollMode scrollMode) {
 		final int resultSetType;
-		if ( scrollMode != null && !scrollMode.equals( ScrollMode.FORWARD_ONLY ) ) {
-			if ( ! settings().isScrollableResultSetsEnabled() ) {
+		if ( scrollMode != null && scrollMode != ScrollMode.FORWARD_ONLY ) {
+			if ( !settings().isScrollableResultSetsEnabled() ) {
 				throw new AssertionFailure("scrollable result sets are not enabled");
 			}
 			resultSetType = scrollMode.toResultSetType();