From c4067f611c6d7be3896b084d297835e9364ec2d3 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Mon, 11 Dec 2017 21:17:11 +0000 Subject: [PATCH] Resolve whitespace formatting issues spotted by Checkstyle --- .../main/java/org/hibernate/engine/spi/ActionQueue.java | 2 +- .../org/hibernate/loader/criteria/CriteriaLoader.java | 2 +- .../loader/criteria/CriteriaQueryTranslator.java | 8 ++++---- .../hibernate/procedure/internal/ProcedureCallImpl.java | 2 +- .../query/internal/QueryParameterBindingsImpl.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java index 9dd45e4119..2c8e810d01 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java @@ -1215,7 +1215,7 @@ public class ActionQueue { if ( iterations > maxIterations ) { 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. diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java index 6a8b9e5120..e1f7855c2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java @@ -223,7 +223,7 @@ public class CriteriaLoader extends OuterJoinLoader { ( (Session) session ).buildLockRequest( lockOptionsToUse ) .lock( persister.getEntityName(), entity ); } - } + } ); parameters.setLockOptions( new LockOptions() ); return sql; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java index 0bbb86dd6a..a41c42daa2 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java @@ -185,8 +185,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery { String testAlias = StringHelper.root( path ); if ( !testAlias.equals( subcriteria.getAlias() ) ) { // and the qualifier is not the alias of this criteria - // -> check to see if we belong to some criteria other - // than the one that created us + // -> check to see if we belong to some criteria other + // than the one that created us parent = aliasCriteriaMap.get( testAlias ); } } @@ -552,8 +552,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery { //first look for a reference to a projection alias final Projection projection = rootCriteria.getProjection(); Type[] projectionTypes = projection == null ? - null : - projection.getTypes( propertyName, subcriteria, this ); + null : + projection.getTypes( propertyName, subcriteria, this ); if ( projectionTypes == null ) { try { diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index 3de67ddbce..e4cc8971ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -292,7 +292,7 @@ public class ProcedureCallImpl ); registerParameter( procedureParameter ); - return procedureParameter; + return procedureParameter; } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java index dca5687a76..c114ad601f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java @@ -573,7 +573,7 @@ public class QueryParameterBindingsImpl implements QueryParameterBindings { // 3) create a new synthetic binding for just that single value under the synthetic name final String syntheticName; if ( sourceParam instanceof NamedParameterDescriptor ) { - syntheticName = NamedParameterDescriptor.class.cast( sourceParam ).getName() + '_' + i; + syntheticName = NamedParameterDescriptor.class.cast( sourceParam ).getName() + '_' + i; } else { syntheticName = "x" + OrdinalParameterDescriptor.class.cast( sourceParam ).getPosition() + '_' + i;