Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10885 - QueryParameterBindingsImpl refactoring

This commit is contained in:
Andrea Boriero 2016-06-23 23:05:44 +02:00
parent 92f5032cc0
commit d889b412cd
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java
View File

@ -6,12 +6,10 @@
*/ */
package org.hibernate.query.internal; package org.hibernate.query.internal;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
@ -54,7 +52,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
private Map<QueryParameter, QueryParameterBinding> parameterBindingMap; private Map<QueryParameter, QueryParameterBinding> parameterBindingMap;
private Map<QueryParameter, QueryParameterListBinding> parameterListBindingMap; private Map<QueryParameter, QueryParameterListBinding> parameterListBindingMap;
private List<QueryParameterBinding> positionalParameterBindings; private Map<Integer, QueryParameterBinding> positionalParameterBindings;
public static QueryParameterBindingsImpl from(ParameterMetadata parameterMetadata, public static QueryParameterBindingsImpl from(ParameterMetadata parameterMetadata,
SessionFactoryImplementor sessionFactory) { SessionFactoryImplementor sessionFactory) {
@ -75,7 +73,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
ParameterMetadata parameterMetadata) { ParameterMetadata parameterMetadata) {
this.sessionFactory = sessionFactory; this.sessionFactory = sessionFactory;
this.parameterMetadata = parameterMetadata; this.parameterMetadata = parameterMetadata;
this.positionalParameterBindings = new ArrayList<>( 4 ); this.positionalParameterBindings = new TreeMap<>( );
if ( queryParameters == null || queryParameters.isEmpty() ) { if ( queryParameters == null || queryParameters.isEmpty() ) {
parameterBindingMap = Collections.emptyMap(); parameterBindingMap = Collections.emptyMap();
@ -209,20 +207,10 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
} }
else { else {
try { try {
if ( position + positionAdjustment < positionalParameterBindings.size() ) { binding = positionalParameterBindings.get( position + positionAdjustment );
binding = positionalParameterBindings.get( position + positionAdjustment ); if ( binding == null ) {
if ( binding == null ) { binding = makeBinding( parameterMetadata.getQueryParameter( position ) );
binding = makeBinding( parameterMetadata.getQueryParameter( position ) ); positionalParameterBindings.put( position + positionAdjustment, binding );
positionalParameterBindings.set( position + positionAdjustment, binding );
}
}
else {
for ( int i = 0; i < position + positionAdjustment - positionalParameterBindings.size(); i++ ) {
positionalParameterBindings.add( null );
}
QueryParameter queryParameter = parameterMetadata.getQueryParameter( position );
binding = makeBinding( queryParameter );
positionalParameterBindings.add( binding );
} }
} }
catch (QueryParameterException e) { catch (QueryParameterException e) {
@ -290,7 +278,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
private int calculatePositionalValueSpan(boolean reserveFirstParameter) { private int calculatePositionalValueSpan(boolean reserveFirstParameter) {
int positionalValueSpan = 0; int positionalValueSpan = 0;
for ( QueryParameterBinding binding : positionalParameterBindings ) { for ( QueryParameterBinding binding : positionalParameterBindings.values() ) {
if ( binding.isBound() ) { if ( binding.isBound() ) {
Type bindType = binding.getBindType(); Type bindType = binding.getBindType();
if ( bindType == null ) { if ( bindType == null ) {
@ -329,13 +317,12 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
*/ */
@Deprecated @Deprecated
public Type[] collectPositionalBindTypes() { public Type[] collectPositionalBindTypes() {
TreeMap<Integer, QueryParameterBinding> positionalParameterBindingMap = collectPositionalParameterBindings(); Type[] types = new Type[ positionalParameterBindings.size() ];
Type[] types = new Type[ positionalParameterBindingMap.size() ];
// NOTE : bindings should be ordered by position by nature of a TreeMap... // NOTE : bindings should be ordered by position by nature of a TreeMap...
// NOTE : we also assume the contiguity of the positions // NOTE : we also assume the contiguity of the positions
for ( Map.Entry<Integer, QueryParameterBinding> entry : positionalParameterBindingMap.entrySet() ) { for ( Map.Entry<Integer, QueryParameterBinding> entry : positionalParameterBindings.entrySet() ) {
final int position = entry.getKey(); final int position = entry.getKey();
Type type = entry.getValue().getBindType(); Type type = entry.getValue().getBindType();
@ -350,27 +337,17 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
return types; return types;
} }
private TreeMap<Integer, QueryParameterBinding> collectPositionalParameterBindings() {
final TreeMap<Integer, QueryParameterBinding> bindings = new TreeMap<>();
for ( int i = 0; i < positionalParameterBindings.size(); i++ ) {
bindings.put( i, positionalParameterBindings.get( i ) );
}
return bindings;
}
/** /**
* @deprecated (since 5.2) expect a different approach to org.hibernate.engine.spi.QueryParameters in 6.0 * @deprecated (since 5.2) expect a different approach to org.hibernate.engine.spi.QueryParameters in 6.0
*/ */
@Deprecated @Deprecated
public Object[] collectPositionalBindValues() { public Object[] collectPositionalBindValues() {
TreeMap<Integer, QueryParameterBinding> positionalParameterBindingMap = collectPositionalParameterBindings(); Object[] values = new Object[ positionalParameterBindings.size() ];
Object[] values = new Object[ positionalParameterBindingMap.size() ];
// NOTE : bindings should be ordered by position by nature of a TreeMap... // NOTE : bindings should be ordered by position by nature of a TreeMap...
// NOTE : we also assume the contiguity of the positions // NOTE : we also assume the contiguity of the positions
for ( Map.Entry<Integer, QueryParameterBinding> entry : positionalParameterBindingMap.entrySet() ) { for ( Map.Entry<Integer, QueryParameterBinding> entry : positionalParameterBindings.entrySet() ) {
final int position = entry.getKey(); final int position = entry.getKey();
values[ position ] = entry.getValue().getBindValue(); values[ position ] = entry.getValue().getBindValue();
} }