eliminate unnecessary use of raw types in QueryProducer

gavinking · gavinking · commit 1320db3f3bd2 · 2025-01-31T14:14:39.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java
@@ -1356,13 +1356,13 @@ public interface Session extends SharedSessionContract, EntityManager {
 	 * @deprecated use {@link #createMutationQuery(CriteriaDelete)}
 	 */
 	@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
-	Query createQuery(CriteriaDelete deleteQuery);
+	Query createQuery(CriteriaDelete<?> deleteQuery);
 
 	/**
 	 * Create a {@link Query} for the given JPA {@link CriteriaUpdate}.
 	 *
 	 * @deprecated use {@link #createMutationQuery(CriteriaUpdate)}
 	 */
 	@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
-	Query createQuery(CriteriaUpdate updateQuery);
+	Query createQuery(CriteriaUpdate<?> updateQuery);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java
@@ -518,25 +518,25 @@ private QueryProducerImplementor queryDelegate() {
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {
+	public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {
 		//noinspection resource
 		return delegate().createMutationQuery( updateQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {
+	public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {
 		//noinspection resource
 		return delegate().createMutationQuery( deleteQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {
 		//noinspection resource
 		return delegate().createMutationQuery( insertSelect );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {
 		//noinspection resource
 		return delegate().createMutationQuery( insertSelect );
 	}
@@ -547,12 +547,12 @@ public <T> QueryImplementor<T> createQuery(CriteriaQuery<T> criteriaQuery) {
 	}
 
 	@Override @SuppressWarnings("rawtypes")
-	public QueryImplementor createQuery(CriteriaUpdate updateQuery) {
+	public QueryImplementor createQuery(CriteriaUpdate<?> updateQuery) {
 		return queryDelegate().createQuery( updateQuery );
 	}
 
 	@Override @SuppressWarnings("rawtypes")
-	public QueryImplementor createQuery(CriteriaDelete deleteQuery) {
+	public QueryImplementor createQuery(CriteriaDelete<?> deleteQuery) {
 		return queryDelegate().createQuery( deleteQuery );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionLazyDelegator.java
@@ -503,14 +503,14 @@ public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
 	@SuppressWarnings("rawtypes")
 	@Override
 	@Deprecated
-	public Query createQuery(CriteriaDelete deleteQuery) {
+	public Query createQuery(CriteriaDelete<?> deleteQuery) {
 		return this.lazySession.get().createQuery( deleteQuery );
 	}
 
 	@SuppressWarnings("rawtypes")
 	@Override
 	@Deprecated
-	public Query createQuery(CriteriaUpdate updateQuery) {
+	public Query createQuery(CriteriaUpdate<?> updateQuery) {
 		return this.lazySession.get().createQuery( updateQuery );
 	}
 
@@ -684,22 +684,22 @@ public MutationQuery createMutationQuery(String hqlString) {
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {
+	public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {
 		return this.lazySession.get().createMutationQuery( updateQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {
+	public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {
 		return this.lazySession.get().createMutationQuery( deleteQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {
 		return this.lazySession.get().createMutationQuery( insertSelect );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {
 		return this.lazySession.get().createMutationQuery( insertSelect );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java
@@ -86,25 +86,25 @@ private QueryProducerImplementor queryDelegate() {
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {
+	public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {
 		//noinspection resource
 		return delegate().createMutationQuery( updateQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {
+	public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {
 		//noinspection resource
 		return delegate().createMutationQuery( deleteQuery );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {
 		//noinspection resource
 		return delegate().createMutationQuery( insertSelect );
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {
 		//noinspection resource
 		return delegate().createMutationQuery( insertSelect );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -1303,7 +1303,7 @@ protected SqmQueryImplementor<?> createSqmQueryImplementor(String queryName, Nam
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {
+	public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmUpdateStatement<?>) updateQuery, null );
@@ -1314,7 +1314,7 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaU
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {
+	public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmDeleteStatement<?>) deleteQuery, null );
@@ -1325,7 +1325,7 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaD
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmInsertSelectStatement<?>) insertSelect, null );
@@ -1336,7 +1336,7 @@ public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriter
 	}
 
 	@Override
-	public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {
+	public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmInsertStatement<?>) insertSelect, null );
@@ -1486,7 +1486,7 @@ public <T> QueryImplementor<T> createQuery(CriteriaQuery<T> criteriaQuery) {
 	}
 
 	@Override @SuppressWarnings({"unchecked", "rawtypes"})
-	public QueryImplementor createQuery(@SuppressWarnings("rawtypes") CriteriaUpdate criteriaUpdate) {
+	public QueryImplementor createQuery(CriteriaUpdate<?> criteriaUpdate) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmUpdateStatement<Void>) criteriaUpdate, null );
@@ -1500,7 +1500,7 @@ public QueryImplementor createQuery(@SuppressWarnings("rawtypes") CriteriaUpdate
 	}
 
 	@Override @SuppressWarnings({"unchecked", "rawtypes"})
-	public QueryImplementor createQuery(@SuppressWarnings("rawtypes") CriteriaDelete criteriaDelete) {
+	public QueryImplementor createQuery(CriteriaDelete<?> criteriaDelete) {
 		checkOpen();
 		try {
 			return createCriteriaQuery( (SqmDeleteStatement<Void>) criteriaDelete, null );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java
@@ -145,15 +145,15 @@ public interface QueryProducer {
 	 * @deprecated use {@link #createMutationQuery(CriteriaUpdate)}
 	 */
 	@Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
-	Query createQuery(CriteriaUpdate updateQuery);
+	Query createQuery(CriteriaUpdate<?> updateQuery);
 
 	/**
 	 * Create a {@link MutationQuery} for the given JPA {@link CriteriaDelete}
 	 *
 	 * @deprecated use {@link #createMutationQuery(CriteriaDelete)}
 	 */
 	@Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
-	Query createQuery(CriteriaDelete deleteQuery);
+	Query createQuery(CriteriaDelete<?> deleteQuery);
 
 	/**
 	 * Create a {@link NativeQuery} instance for the given native SQL query.
@@ -361,22 +361,22 @@ public interface QueryProducer {
 	/**
 	 * Create a {@link MutationQuery} from the given update criteria tree
 	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery);
+	MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery);
 
 	/**
 	 * Create a {@link MutationQuery} from the given delete criteria tree
 	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery);
+	MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery);
 
 	/**
 	 * Create a {@link MutationQuery} from the given insert-select criteria tree
 	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect);
+	MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect);
 
 	/**
 	 * Create a {@link MutationQuery} from the given insert criteria tree
 	 */
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect);
+	MutationQuery createMutationQuery(JpaCriteriaInsert<?> insert);
 
 	/**
 	 * Create a {@link NativeQuery} instance for the given native SQL statement.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryProducerImplementor.java
@@ -77,17 +77,17 @@ public interface QueryProducerImplementor extends QueryProducer {
 	MutationQuery createNativeMutationQuery(String sqlString);
 
 	@Override
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery);
+	MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery);
 
 	@Override
-	MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery);
+	MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery);
 
 	@Override
 	<R> QueryImplementor<R> createQuery(CriteriaQuery<R> criteriaQuery);
 
 	@Override @Deprecated @SuppressWarnings("rawtypes")
-	QueryImplementor createQuery(CriteriaUpdate updateQuery);
+	QueryImplementor createQuery(CriteriaUpdate<?> updateQuery);
 
 	@Override @Deprecated @SuppressWarnings("rawtypes")
-	QueryImplementor createQuery(CriteriaDelete deleteQuery);
+	QueryImplementor createQuery(CriteriaDelete<?> deleteQuery);
 }

Original file line number	Diff line number	Diff line change
`@@ -518,25 +518,25 @@ private QueryProducerImplementor queryDelegate() {`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`@Override`
`521`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {`
	`521`	`+ public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {`
`522`	`522`	`//noinspection resource`
`523`	`523`	`return delegate().createMutationQuery( updateQuery );`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`@Override`
`527`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {`
	`527`	`+ public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {`
`528`	`528`	`//noinspection resource`
`529`	`529`	`return delegate().createMutationQuery( deleteQuery );`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`@Override`
`533`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {`
	`533`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {`
`534`	`534`	`//noinspection resource`
`535`	`535`	`return delegate().createMutationQuery( insertSelect );`
`536`	`536`	`}`
`537`	`537`
`538`	`538`	`@Override`
`539`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {`
	`539`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {`
`540`	`540`	`//noinspection resource`
`541`	`541`	`return delegate().createMutationQuery( insertSelect );`
`542`	`542`	`}`
`@@ -547,12 +547,12 @@ public <T> QueryImplementor<T> createQuery(CriteriaQuery<T> criteriaQuery) {`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`@Override @SuppressWarnings("rawtypes")`
`550`		`- public QueryImplementor createQuery(CriteriaUpdate updateQuery) {`
	`550`	`+ public QueryImplementor createQuery(CriteriaUpdate<?> updateQuery) {`
`551`	`551`	`return queryDelegate().createQuery( updateQuery );`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`@Override @SuppressWarnings("rawtypes")`
`555`		`- public QueryImplementor createQuery(CriteriaDelete deleteQuery) {`
	`555`	`+ public QueryImplementor createQuery(CriteriaDelete<?> deleteQuery) {`
`556`	`556`	`return queryDelegate().createQuery( deleteQuery );`
`557`	`557`	`}`
`558`	`558`
Original file line number	Diff line number	Diff line change
`@@ -503,14 +503,14 @@ public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {`
`503`	`503`	`@SuppressWarnings("rawtypes")`
`504`	`504`	`@Override`
`505`	`505`	`@Deprecated`
`506`		`- public Query createQuery(CriteriaDelete deleteQuery) {`
	`506`	`+ public Query createQuery(CriteriaDelete<?> deleteQuery) {`
`507`	`507`	`return this.lazySession.get().createQuery( deleteQuery );`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`@SuppressWarnings("rawtypes")`
`511`	`511`	`@Override`
`512`	`512`	`@Deprecated`
`513`		`- public Query createQuery(CriteriaUpdate updateQuery) {`
	`513`	`+ public Query createQuery(CriteriaUpdate<?> updateQuery) {`
`514`	`514`	`return this.lazySession.get().createQuery( updateQuery );`
`515`	`515`	`}`
`516`	`516`
`@@ -684,22 +684,22 @@ public MutationQuery createMutationQuery(String hqlString) {`
`684`	`684`	`}`
`685`	`685`
`686`	`686`	`@Override`
`687`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {`
	`687`	`+ public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {`
`688`	`688`	`return this.lazySession.get().createMutationQuery( updateQuery );`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`@Override`
`692`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {`
	`692`	`+ public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {`
`693`	`693`	`return this.lazySession.get().createMutationQuery( deleteQuery );`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`@Override`
`697`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {`
	`697`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {`
`698`	`698`	`return this.lazySession.get().createMutationQuery( insertSelect );`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`@Override`
`702`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {`
	`702`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {`
`703`	`703`	`return this.lazySession.get().createMutationQuery( insertSelect );`
`704`	`704`	`}`
`705`	`705`
Original file line number	Diff line number	Diff line change
`@@ -86,25 +86,25 @@ private QueryProducerImplementor queryDelegate() {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaUpdate updateQuery) {`
	`89`	`+ public MutationQuery createMutationQuery(CriteriaUpdate<?> updateQuery) {`
`90`	`90`	`//noinspection resource`
`91`	`91`	`return delegate().createMutationQuery( updateQuery );`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") CriteriaDelete deleteQuery) {`
	`95`	`+ public MutationQuery createMutationQuery(CriteriaDelete<?> deleteQuery) {`
`96`	`96`	`//noinspection resource`
`97`	`97`	`return delegate().createMutationQuery( deleteQuery );`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsertSelect insertSelect) {`
	`101`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsertSelect<?> insertSelect) {`
`102`	`102`	`//noinspection resource`
`103`	`103`	`return delegate().createMutationQuery( insertSelect );`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`@Override`
`107`		`- public MutationQuery createMutationQuery(@SuppressWarnings("rawtypes") JpaCriteriaInsert insertSelect) {`
	`107`	`+ public MutationQuery createMutationQuery(JpaCriteriaInsert<?> insertSelect) {`
`108`	`108`	`//noinspection resource`
`109`	`109`	`return delegate().createMutationQuery( insertSelect );`
`110`	`110`	`}`