remove a superfluous overload of createMutationQuery()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java

@@ -46,7 +46,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.spi.QueryProducerImplementor;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
@@ -530,15 +529,9 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaD
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insert) {
 		//noinspection resource
-		return delegate().createMutationQuery( insertSelect );
-	}
-
-	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
-		//noinspection resource
-		return delegate().createMutationQuery( insertSelect );
+		return delegate().createMutationQuery( insert );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java

@@ -39,7 +39,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.stat.SessionStatistics;
 
 import jakarta.persistence.ConnectionConsumer;
@@ -694,13 +693,8 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaD
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
-		return this.lazySession.get().createMutationQuery( insertSelect );
-	}
-
-	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
-		return this.lazySession.get().createMutationQuery( insertSelect );
+	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insert) {
+		return this.lazySession.get().createMutationQuery( insert );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java

@@ -35,7 +35,6 @@
 import org.hibernate.query.SelectionQuery;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.query.spi.QueryProducerImplementor;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
@@ -98,15 +97,9 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaD
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insert) {
 		//noinspection resource
-		return delegate().createMutationQuery( insertSelect );
-	}
-
-	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
-		//noinspection resource
-		return delegate().createMutationQuery( insertSelect );
+		return delegate().createMutationQuery( insert );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -75,7 +75,6 @@
 import org.hibernate.query.criteria.CriteriaDefinition;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 import org.hibernate.query.hql.spi.SqmQueryImplementor;
 import org.hibernate.query.named.NamedObjectRepository;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
@@ -91,8 +90,6 @@
 import org.hibernate.query.sqm.tree.SqmDmlStatement;
 import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
-import org.hibernate.query.sqm.tree.insert.SqmInsertSelectStatement;
-import org.hibernate.query.sqm.tree.insert.SqmInsertStatement;
 import org.hibernate.query.sqm.tree.select.SqmQueryGroup;
 import org.hibernate.query.sqm.tree.select.SqmQuerySpec;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -1322,21 +1319,10 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaD
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insert) {
 		checkOpen();
 		try {
-			return createCriteriaQuery( (SqmInsertSelectStatement<?>) insertSelect, null );
-		}
-		catch ( RuntimeException e ) {
-			throw getExceptionConverter().convert( e );
-		}
-	}
-
-	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
-		checkOpen();
-		try {
-			return createCriteriaQuery( (SqmInsertStatement<?>) insertSelect, null );
+			return createCriteriaQuery( (SqmStatement<?>) insert, null );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );

hibernate-core/src/main/java/org/hibernate/query/Query.java

@@ -234,6 +234,10 @@ default Stream<R> stream() {
 	 * @return the number of affected entity instances
 	 *         (may differ from the number of affected rows)
 	 *
+	 * @apiNote This method is needed because this interface extends
+	 *          {@link jakarta.persistence.Query}, which defines this method.
+	 *          See {@link MutationQuery} and {@link SelectionQuery}.
+	 *
 	 * @see QueryProducer#createMutationQuery
 	 * @see QueryProducer#createMutationQuery(String)
 	 * @see QueryProducer#createNamedMutationQuery(String)
@@ -242,12 +246,6 @@ default Stream<R> stream() {
 	 * @see QueryProducer#createMutationQuery(jakarta.persistence.criteria.CriteriaDelete)
 	 *
 	 * @see jakarta.persistence.Query#executeUpdate()
-	 *
-	 * @apiNote This method is needed because this interface extends
-	 *          {@link jakarta.persistence.Query}, which defines this method.
-	 *          See {@link MutationQuery} and {@link SelectionQuery}.
-	 *
-	 * @see QueryProducer#createMutationQuery
 	 */
 	@Override
 	int executeUpdate();

hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java

@@ -5,7 +5,6 @@
 package org.hibernate.query;
 
 import org.hibernate.query.criteria.JpaCriteriaInsert;
-import org.hibernate.query.criteria.JpaCriteriaInsertSelect;
 
 import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaDelete;
@@ -368,15 +367,10 @@ public interface QueryProducer {
 	 */
 	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery);
 
-	/**
-	 * Create a {@link MutationQuery} from the given insert-select criteria tree
-	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect);
-
 	/**
 	 * Create a {@link MutationQuery} from the given insert criteria tree
 	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect);
+	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insert);
 
 	/**
 	 * Create a {@link NativeQuery} instance for the given native SQL statement.