Skip to content

Commit 3d629c8

Browse files
committed
Drop TypedParameterValue handling for stored procedures.
Hibernate resolved hibernate/hibernate-orm#5438, allowing us to no longer implement special handling. Resolves #2902.
1 parent 07c1e05 commit 3d629c8

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

src/main/java/org/springframework/data/jpa/repository/query/QueryParameterSetter.java

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.jpa.repository.query;
1717

18-
import static org.springframework.data.jpa.repository.query.QueryParameterSetter.ErrorHandling.LENIENT;
18+
import static org.springframework.data.jpa.repository.query.QueryParameterSetter.ErrorHandling.*;
1919

2020
import java.lang.reflect.Proxy;
2121
import java.util.Collections;
@@ -27,13 +27,11 @@
2727

2828
import javax.persistence.Parameter;
2929
import javax.persistence.Query;
30-
import javax.persistence.StoredProcedureQuery;
3130
import javax.persistence.TemporalType;
3231
import javax.persistence.criteria.ParameterExpression;
3332

3433
import org.apache.commons.logging.Log;
3534
import org.apache.commons.logging.LogFactory;
36-
import org.hibernate.jpa.TypedParameterValue;
3735
import org.springframework.lang.Nullable;
3836
import org.springframework.util.Assert;
3937

@@ -85,21 +83,7 @@ class NamedOrIndexedQueryParameterSetter implements QueryParameterSetter {
8583
public void setParameter(BindableQuery query, JpaParametersParameterAccessor accessor,
8684
ErrorHandling errorHandling) {
8785

88-
final Object value;
89-
90-
// TODO: When https://github.com/hibernate/hibernate-orm/pull/5438 is merged we should be able to drop this.
91-
if (query.getQuery() instanceof StoredProcedureQuery) {
92-
93-
Object extractedValue = valueExtractor.apply(accessor);
94-
95-
if (extractedValue instanceof TypedParameterValue) {
96-
value = ((TypedParameterValue) extractedValue).getValue();
97-
} else {
98-
value = extractedValue;
99-
}
100-
} else {
101-
value = valueExtractor.apply(accessor);
102-
}
86+
final Object value = valueExtractor.apply(accessor);
10387

10488
if (temporalType != null) {
10589

0 commit comments

Comments
 (0)