fix signature of Query.setOrder()

gavinking · gavinking · commit 7c599ad7a3a4 · 2024-11-13T23:05:56.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
@@ -413,7 +413,7 @@ public QueryParameterBindings getParameterBindings() {
 	}
 
 	@Override
-	public Query<R> setOrder(List<Order<? super R>> orderList) {
+	public Query<R> setOrder(List<? extends Order<? super R>> orderList) {
 		throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/Query.java b/hibernate-core/src/main/java/org/hibernate/query/Query.java
@@ -922,7 +922,7 @@ default Query<R> setPage(Page page) {
 	Query<R> setLockMode(LockModeType lockMode);
 
 	@Override @Incubating
-	Query<R> setOrder(List<Order<? super R>> orderList);
+	Query<R> setOrder(List<? extends Order<? super R>> orderList);
 
 	@Override @Incubating
 	Query<R> setOrder(Order<? super R> order);
diff --git a/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java
@@ -590,7 +590,7 @@ default Stream<R> stream() {
 	 * @since 6.3
 	 */
 	@Incubating
-	SelectionQuery<R> setOrder(List<Order<? super R>> orderList);
+	SelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList);
 
 	/**
 	 * If the result type of this query is an entity class, add a
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java b/hibernate-core/src/main/java/org/hibernate/query/spi/AbstractQuery.java
@@ -295,7 +295,7 @@ public QueryImplementor<R> setLockMode(LockModeType lockModeType) {
 	}
 
 	@Override
-	public Query<R> setOrder(List<Order<? super R>> orders) {
+	public Query<R> setOrder(List<? extends Order<? super R>> orders) {
 		throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -1581,7 +1581,7 @@ public NativeQueryImplementor<R> setFirstResult(int startPosition) {
 	}
 
 	@Override
-	public Query<R> setOrder(List<Order<? super R>> orderList) {
+	public Query<R> setOrder(List<? extends Order<? super R>> orderList) {
 		throw new UnsupportedOperationException("Ordering not currently supported for native queries");
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -122,29 +122,26 @@ private SqmSelectStatement<R> getSqmSelectStatement() {
 	}
 
 	@Override
-	public SelectionQuery<R> setOrder(List<Order<? super R>> orderList) {
-		SqmSelectStatement<R> sqm = getSqmSelectStatement();
-		sqm = sqm.copy( noParamCopyContext() );
-		final SqmSelectStatement<R> select = sqm;
-		sqm.orderBy( orderList.stream().map( order -> sortSpecification( select, order ) )
+	public SelectionQuery<R> setOrder(List<? extends Order<? super R>> orderList) {
+		final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
+		selectStatement.orderBy( orderList.stream().map( order -> sortSpecification( selectStatement, order ) )
 				.collect( toList() ) );
 		// TODO: when the QueryInterpretationCache can handle caching criteria queries,
 		//       simply cache the new SQM as if it were a criteria query, and remove this:
 		getQueryOptions().setQueryPlanCachingEnabled( false );
-		setSqmStatement( sqm );
+		setSqmStatement( selectStatement );
 		return this;
 	}
 
 
 	@Override
 	public SelectionQuery<R> setOrder(Order<? super R> order) {
-		SqmSelectStatement<R> sqm = getSqmSelectStatement();
-		sqm = sqm.copy( noParamCopyContext() );
-		sqm.orderBy( sortSpecification( sqm, order ) );
+		final SqmSelectStatement<R> selectStatement = getSqmSelectStatement().copy( noParamCopyContext() );
+		selectStatement.orderBy( sortSpecification( selectStatement, order ) );
 		// TODO: when the QueryInterpretationCache can handle caching criteria queries,
 		//       simply cache the new SQM as if it were a criteria query, and remove this:
 		getQueryOptions().setQueryPlanCachingEnabled( false );
-		setSqmStatement( sqm );
+		setSqmStatement( selectStatement );
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
@@ -758,7 +758,7 @@ public Query<R> setOrder(Order<? super R> order) {
 	}
 
 	@Override
-	public Query<R> setOrder(List<Order<? super R>> orders) {
+	public Query<R> setOrder(List<? extends Order<? super R>> orders) {
 		super.setOrder(orders);
 		return this;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java
@@ -295,7 +295,7 @@ public SqmSelectionQueryImplementor<R> setLockMode(String alias, LockMode lockMo
 
 	@Override
 	@Incubating
-	public SqmSelectionQueryImplementor<R> setOrder(List<Order<? super R>> orders) {
+	public SqmSelectionQueryImplementor<R> setOrder(List<? extends Order<? super R>> orders) {
 		getDelegate().setOrder( orders );
 		return this;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ConfigurationObjectSettingTest.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.hibernate.HibernateException;
@@ -216,6 +217,13 @@ public void testJdbcSettings() {
 		);
 	}
 
+	public static void applyToProperties(Properties properties, Object... pairs) {
+		assert pairs.length % 2 == 0;
+		for ( int i = 0; i < pairs.length; i+=2 ) {
+			properties.put( pairs[i], pairs[i+1] );
+		}
+	}
+
 	private void verifyJdbcSettings(String jdbcUrl, String jdbcDriver, String jdbcUser, String jdbcPassword) {
 		final String urlValue = "some:url";
 		final String driverValue = "some.jdbc.Driver";
@@ -228,7 +236,7 @@ private void verifyJdbcSettings(String jdbcUrl, String jdbcDriver, String jdbcUs
 		{
 			builder = (EntityManagerFactoryBuilderImpl) Bootstrap.getEntityManagerFactoryBuilder(
 					empty,
-					CollectionHelper.toMap(
+					Map.of(
 							jdbcUrl, urlValue,
 							jdbcDriver, driverValue,
 							jdbcUser, userValue,
@@ -246,7 +254,7 @@ private void verifyJdbcSettings(String jdbcUrl, String jdbcDriver, String jdbcUs
 		}
 
 		PersistenceUnitInfoAdapter pui = new PersistenceUnitInfoAdapter();
-		CollectionHelper.applyToProperties(
+		applyToProperties(
 				pui.getProperties(),
 				jdbcUrl, urlValue,
 				jdbcDriver, driverValue,
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/jakarta/JakartaSchemaToolingTests.java
@@ -13,7 +13,6 @@
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jpa.boot.spi.Bootstrap;
 import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder;
 import org.hibernate.tool.schema.Action;
@@ -137,6 +136,13 @@ public void sessionFactoryCreated(org.hibernate.SessionFactory factory) {
 		}
 	}
 
+	public static void applyToProperties(Properties properties, Object... pairs) {
+		assert pairs.length % 2 == 0;
+		for ( int i = 0; i < pairs.length; i+=2 ) {
+			properties.put( pairs[i], pairs[i+1] );
+		}
+	}
+
 	private SessionFactoryImplementor buildSessionFactory(Object... settingPairs) {
 		final Properties settings = new Properties();
 		settings.setProperty( AvailableSettings.AUTOCOMMIT, "false" );
@@ -146,7 +152,7 @@ private SessionFactoryImplementor buildSessionFactory(Object... settingPairs) {
 				DriverManagerConnectionProviderImpl.INIT_SQL,
 				Environment.getProperties().getProperty( DriverManagerConnectionProviderImpl.INIT_SQL )
 		);
-		CollectionHelper.applyToProperties( settings, settingPairs );
+		applyToProperties( settings, settingPairs );
 		ServiceRegistryUtil.applySettings( settings );
 
 		final PersistenceUnitDescriptorAdapter puDescriptor = new PersistenceUnitDescriptorAdapter() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/depth/NoDepthTests.java
@@ -6,13 +6,13 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 import jakarta.persistence.EntityManagerFactory;
 
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.tool.schema.Action;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -85,12 +85,12 @@ private void testItJpa(boolean configureMax) {
 		par.addAsResource( "units/many2many/fetch-depth.xml", "META-INF/persistence.xml" );
 
 		try ( final ShrinkWrapClassLoader classLoader = new ShrinkWrapClassLoader( par ) ) {
-			final Map<String, ?> settings = CollectionHelper.toMap(
+			final Map<String, Object> settings = new HashMap<>( Map.of(
 					CLASSLOADERS, Arrays.asList( classLoader, getClass().getClassLoader() ),
 					MAX_FETCH_DEPTH, configureMax ? "10" : "",
 					HBM2DDL_AUTO, Action.CREATE_DROP,
 					FORMAT_SQL, "true"
-			);
+			) );
 			ServiceRegistryUtil.applySettings( settings );
 
 			final EntityManagerFactory emf = createEntityManagerFactory( "fetch-depth", settings );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/mutability/converted/MapConverter.java
@@ -6,28 +6,25 @@
 
 import java.util.Map;
 
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 
 import jakarta.persistence.AttributeConverter;
 
+import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.internal.util.StringHelper.join;
+import static org.hibernate.internal.util.StringHelper.split;
+
 /**
  * @author Steve Ebersole
  */
 public class MapConverter implements AttributeConverter<Map<String, String>, String> {
 	@Override
 	public String convertToDatabaseColumn(Map<String, String> map) {
-		if ( CollectionHelper.isEmpty( map ) ) {
-			return null;
-		}
-		return StringHelper.join( ", ", CollectionHelper.asPairs( map ) );
+		return CollectionHelper.isEmpty( map ) ? null : join( ", ", CollectionHelper.asPairs( map ) );
 	}
 
 	@Override
 	public Map<String, String> convertToEntityAttribute(String pairs) {
-		if ( StringHelper.isEmpty( pairs ) ) {
-			return null;
-		}
-		return CollectionHelper.toMap( StringHelper.split( ", ", pairs ) );
+		return isEmpty( pairs ) ? null : CollectionHelper.toMap( split( ", ", pairs ) );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java
@@ -24,7 +24,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hibernate.internal.util.collections.CollectionHelper.toSettingsMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -60,14 +59,8 @@ public class WhereFragmentTests {
 	 * Loads a User, fetching their detail and skills using an entity-graph
 	 */
 	public User findUserByIdUsingEntityGraph(Integer id, SessionFactoryScope factoryScope) {
-		return factoryScope.fromTransaction( (session) -> {
-			final Map<String, Object> properties = toSettingsMap(
-					SpecHints.HINT_SPEC_FETCH_GRAPH,
-					session.getEntityGraph("user-entity-graph")
-			);
-
-			return session.find(User.class, id, properties);
-		} );
+		return factoryScope.fromTransaction( (session) -> session.find( User.class, id,
+				Map.of( SpecHints.HINT_SPEC_FETCH_GRAPH, session.getEntityGraph("user-entity-graph") ) ) );
 	}
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java
@@ -6,7 +6,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,8 +24,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static java.util.Collections.singletonMap;
 import static org.hamcrest.Matchers.is;
-import static org.hibernate.internal.util.collections.CollectionHelper.toMap;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -57,34 +56,26 @@ public void testSetPropertiesMapWithNullValues(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				(s) -> {
-					Map<String,String> parameters = toMap( "nickName", null );
-
 					Query<Human> q = s.createQuery(
 							"from Human h where h.nickName = :nickName or (h.nickName is null and :nickName is null)",
 							Human.class
 					);
-					q.setProperties( (parameters) );
+					q.setProperties( singletonMap( "nickName", null ) );
 					assertThat( q.list().size(), is( 0 ) );
 
 					Human human1 = new Human();
 					human1.setId( 2L );
 					human1.setNickName( null );
 					s.persist( human1 );
 
-					parameters = new HashMap<>();
-
-					parameters.put( "nickName", null );
 					q = s.createQuery( "from Human h where h.nickName = :nickName or (h.nickName is null and :nickName is null)", Human.class );
-					q.setProperties( (parameters) );
+					q.setProperties( singletonMap( "nickName", null ) );
 					assertThat( q.list().size(), is( 1 ) );
 					Human found = q.list().get( 0 );
 					assertThat( found.getId(), is( human1.getId() ) );
 
-					parameters = new HashMap<>();
-					parameters.put( "nickName", "nick" );
-
 					q = s.createQuery( "from Human h where h.nickName = :nickName or (h.nickName is null and :nickName is null)", Human.class );
-					q.setProperties( (parameters) );
+					q.setProperties( singletonMap( "nickName", "nick" ) );
 					assertThat( q.list().size(), is( 1 ) );
 					found = q.list().get( 0 );
 					assertThat( found.getId(), is( 1L ) );
@@ -97,16 +88,14 @@ public void testSetPropertiesMapWithNullValues(SessionFactoryScope scope) {
 	public void testSetPropertiesMapNotContainingAllTheParameters(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(s) -> {
-					Map<String,String> parameters = toMap( "nickNames", "nick" );
-
 					List<Integer> intValues = new ArrayList<>();
 					intValues.add( 1 );
 					//noinspection unchecked
 					Query<Human> q = s.createQuery(
 							"from Human h where h.nickName in (:nickNames) and h.intValue in (:intValues)"
 					);
 					q.setParameterList( "intValues" , intValues);
-					q.setProperties( (parameters) );
+					q.setProperties( Map.of( "nickNames", "nick" ) );
 					assertThat( q.list().size(), is( 1 ) );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tenantid/TenantIdTest.java
@@ -40,7 +40,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.cfg.AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION;
-import static org.hibernate.internal.util.collections.CollectionHelper.toMap;
 import static org.hibernate.jpa.HibernateHints.HINT_TENANT_ID;
 import static org.junit.Assert.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -50,6 +49,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.List;
+import java.util.Map;
 
 @SessionFactory
 @DomainModel(annotatedClasses = { Account.class, Client.class, Record.class })
@@ -254,7 +254,7 @@ public void testEntityManagerHint(SessionFactoryScope scope) {
 
 		currentTenant = null;
 		final EntityManagerFactory emf = scope.getSessionFactory();
-		try (EntityManager em = emf.createEntityManager( toMap( HINT_TENANT_ID, "mine" ) ) ) {
+		try (EntityManager em = emf.createEntityManager( Map.of( HINT_TENANT_ID, "mine" ) ) ) {
 			Record r = em.find( Record.class, record.id );
 			assertEquals( "mine", r.state.tenantId );
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java b/hibernate-testing/src/main/java/org/hibernate/testing/util/ServiceRegistryUtil.java
@@ -46,12 +46,13 @@ public static StandardServiceRegistryBuilder applySettings(StandardServiceRegist
 
 	public static void applySettings(Map<?, ?> properties) {
 		if ( !properties.containsKey( AvailableSettings.CONNECTION_PROVIDER ) ) {
-			//noinspection unchecked
-			( (Map<Object, Object>) properties ).put(
+			@SuppressWarnings( "unchecked" )
+			final Map<Object, Object> objectMap = (Map<Object, Object>) properties;
+			objectMap.put(
 					AvailableSettings.CONNECTION_PROVIDER,
 					SharedDriverManagerConnectionProviderImpl.getInstance()
 			);
-			( (Map<Object, Object>) properties ).put(
+			objectMap.put(
 					AvailableSettings.CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT,
 					Boolean.TRUE
 			);

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ public QueryParameterBindings getParameterBindings() {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`@Override`
`416`		`- public Query<R> setOrder(List<Order<? super R>> orderList) {`
	`416`	`+ public Query<R> setOrder(List<? extends Order<? super R>> orderList) {`
`417`	`417`	`throw new UnsupportedOperationException("Ordering not supported for stored procedure calls");`
`418`	`418`	`}`
`419`	`419`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public QueryImplementor<R> setLockMode(LockModeType lockModeType) {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`@Override`
`298`		`- public Query<R> setOrder(List<Order<? super R>> orders) {`
	`298`	`+ public Query<R> setOrder(List<? extends Order<? super R>> orders) {`
`299`	`299`	`throw new UnsupportedOperationException( "Should be implemented by " + this.getClass().getName() );`
`300`	`300`	`}`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -1581,7 +1581,7 @@ public NativeQueryImplementor<R> setFirstResult(int startPosition) {`
`1581`	`1581`	`}`
`1582`	`1582`
`1583`	`1583`	`@Override`
`1584`		`- public Query<R> setOrder(List<Order<? super R>> orderList) {`
	`1584`	`+ public Query<R> setOrder(List<? extends Order<? super R>> orderList) {`
`1585`	`1585`	`throw new UnsupportedOperationException("Ordering not currently supported for native queries");`
`1586`	`1586`	`}`
`1587`	`1587`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ public Query<R> setOrder(Order<? super R> order) {`
`758`	`758`	`}`
`759`	`759`
`760`	`760`	`@Override`
`761`		`- public Query<R> setOrder(List<Order<? super R>> orders) {`
	`761`	`+ public Query<R> setOrder(List<? extends Order<? super R>> orders) {`
`762`	`762`	`super.setOrder(orders);`
`763`	`763`	`return this;`
`764`	`764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public SqmSelectionQueryImplementor<R> setLockMode(String alias, LockMode lockMo`
`295`	`295`
`296`	`296`	`@Override`
`297`	`297`	`@Incubating`
`298`		`- public SqmSelectionQueryImplementor<R> setOrder(List<Order<? super R>> orders) {`
	`298`	`+ public SqmSelectionQueryImplementor<R> setOrder(List<? extends Order<? super R>> orders) {`
`299`	`299`	`getDelegate().setOrder( orders );`
`300`	`300`	`return this;`
`301`	`301`	`}`