HHH-17314 - Fix inconsistent Exception throwing in ParameterRecognizerImpl

jrenaat · jrenaat · commit 26600ae4a6df · 2023-10-23T17:42:00.000+02:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ParameterRecognizerImpl.java
@@ -100,7 +100,7 @@ public void ordinalParameter(int sourcePosition) {
 			parameterStyle = ParameterStyle.JDBC;
 		}
 		else if ( parameterStyle != ParameterStyle.JDBC ) {
-			throw new IllegalStateException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );
+			throw new ParameterRecognitionException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );
 		}
 
 		int implicitPosition = ordinalParameterImplicitPosition++;
@@ -164,7 +164,7 @@ public void jpaPositionalParameter(int position, int sourcePosition) {
 			parameterStyle = ParameterStyle.NAMED;
 		}
 		else if ( parameterStyle != ParameterStyle.NAMED ) {
-			throw new IllegalStateException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );
+			throw new ParameterRecognitionException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );
 		}
 
 		if ( position < 1 ) {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public void ordinalParameter(int sourcePosition) {`
`100`	`100`	`parameterStyle = ParameterStyle.JDBC;`
`101`	`101`	`}`
`102`	`102`	`else if ( parameterStyle != ParameterStyle.JDBC ) {`
`103`		`- throw new IllegalStateException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );`
	`103`	`+ throw new ParameterRecognitionException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`int implicitPosition = ordinalParameterImplicitPosition++;`
`@@ -164,7 +164,7 @@ public void jpaPositionalParameter(int position, int sourcePosition) {`
`164`	`164`	`parameterStyle = ParameterStyle.NAMED;`
`165`	`165`	`}`
`166`	`166`	`else if ( parameterStyle != ParameterStyle.NAMED ) {`
`167`		`- throw new IllegalStateException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );`
	`167`	`+ throw new ParameterRecognitionException( "Cannot mix parameter styles between JDBC-style, ordinal and named in the same query" );`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if ( position < 1 ) {`