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

Resolve whitespace formatting issues spotted by Checkstyle

This commit is contained in:
Sanne Grinovero 2017-12-11 21:17:11 +00:00 committed by Steve Ebersole
parent a7f1173e65
commit c4067f611c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
View File

@ -1215,7 +1215,7 @@ public class ActionQueue {
if ( iterations > maxIterations ) { if ( iterations > maxIterations ) {
LOG.warn( "The batch containing " + latestBatches.size() + " statements could not be sorted after " + maxIterations + " iterations. " + LOG.warn( "The batch containing " + latestBatches.size() + " statements could not be sorted after " + maxIterations + " iterations. " +
"This might indicate a circular entity relationship." ); "This might indicate a circular entity relationship." );
} }
// Now, rebuild the insertions list. There is a batch for each entry in the name list. // Now, rebuild the insertions list. There is a batch for each entry in the name list.

2
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
View File

@ -223,7 +223,7 @@ public class CriteriaLoader extends OuterJoinLoader {
( (Session) session ).buildLockRequest( lockOptionsToUse ) ( (Session) session ).buildLockRequest( lockOptionsToUse )
.lock( persister.getEntityName(), entity ); .lock( persister.getEntityName(), entity );
} }
} }
); );
parameters.setLockOptions( new LockOptions() ); parameters.setLockOptions( new LockOptions() );
return sql; return sql;

8
hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
View File

@ -185,8 +185,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
String testAlias = StringHelper.root( path ); String testAlias = StringHelper.root( path );
if ( !testAlias.equals( subcriteria.getAlias() ) ) { if ( !testAlias.equals( subcriteria.getAlias() ) ) {
// and the qualifier is not the alias of this criteria // and the qualifier is not the alias of this criteria
// -> check to see if we belong to some criteria other // -> check to see if we belong to some criteria other
// than the one that created us // than the one that created us
parent = aliasCriteriaMap.get( testAlias ); parent = aliasCriteriaMap.get( testAlias );
} }
} }
@ -552,8 +552,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
//first look for a reference to a projection alias //first look for a reference to a projection alias
final Projection projection = rootCriteria.getProjection(); final Projection projection = rootCriteria.getProjection();
Type[] projectionTypes = projection == null ? Type[] projectionTypes = projection == null ?
null : null :
projection.getTypes( propertyName, subcriteria, this ); projection.getTypes( propertyName, subcriteria, this );
if ( projectionTypes == null ) { if ( projectionTypes == null ) {
try { try {

2
hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java
View File

@ -292,7 +292,7 @@ public class ProcedureCallImpl<R>
); );
registerParameter( procedureParameter ); registerParameter( procedureParameter );
return procedureParameter; return procedureParameter;
} }
@Override @Override

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

@ -573,7 +573,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings {
// 3) create a new synthetic binding for just that single value under the synthetic name // 3) create a new synthetic binding for just that single value under the synthetic name
final String syntheticName; final String syntheticName;
if ( sourceParam instanceof NamedParameterDescriptor ) { if ( sourceParam instanceof NamedParameterDescriptor ) {
syntheticName = NamedParameterDescriptor.class.cast( sourceParam ).getName() + '_' + i; syntheticName = NamedParameterDescriptor.class.cast( sourceParam ).getName() + '_' + i;
} }
else { else {
syntheticName = "x" + OrdinalParameterDescriptor.class.cast( sourceParam ).getPosition() + '_' + i; syntheticName = "x" + OrdinalParameterDescriptor.class.cast( sourceParam ).getPosition() + '_' + i;