From 877e790995fe81cd3d20b6c51483545d203f4644 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Mon, 20 Nov 2017 11:48:44 +0000 Subject: [PATCH] HHH-5645 - Fix Checkstyle errors --- .../org/hibernate/loader/OuterJoinLoader.java | 6 +-- .../loader/criteria/CriteriaLoader.java | 8 +-- .../criteria/CriteriaQueryTranslator.java | 52 +++++++++---------- .../org/hibernate/type/CollectionType.java | 4 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java index c27c36a651..e10270b8ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java @@ -36,11 +36,11 @@ public abstract class OuterJoinLoader extends BasicLoader { protected String[] suffixes; protected String[] collectionSuffixes; - private LoadQueryInfluencers loadQueryInfluencers; + private LoadQueryInfluencers loadQueryInfluencers; protected final Dialect getDialect() { - return getFactory().getDialect(); - } + return getFactory().getDialect(); + } public OuterJoinLoader( SessionFactoryImplementor factory, 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 96d82928ce..6a8b9e5120 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 @@ -154,7 +154,7 @@ public class CriteriaLoader extends OuterJoinLoader { for ( int i=0, pos=0; i 1 ) { - String[] typeColumnAliases = ArrayHelper.slice( columnAliases, pos, numColumns ); + String[] typeColumnAliases = ArrayHelper.slice( columnAliases, pos, numColumns ); result[i] = types[i].nullSafeGet(rs, typeColumnAliases, session, null); } else { @@ -207,8 +207,8 @@ public class CriteriaLoader extends OuterJoinLoader { if ( ( parameters.getLockOptions().getFollowOnLocking() == null && dialect.useFollowOnLocking( parameters ) ) || ( parameters.getLockOptions().getFollowOnLocking() != null && parameters.getLockOptions().getFollowOnLocking() ) ) { - final LockMode lockMode = determineFollowOnLockMode( lockOptions ); - if( lockMode != LockMode.UPGRADE_SKIPLOCKED ) { + final LockMode lockMode = determineFollowOnLockMode( lockOptions ); + if ( lockMode != LockMode.UPGRADE_SKIPLOCKED ) { // Dialect prefers to perform locking in a separate step LOG.usingFollowOnLocking(); @@ -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 aac3a9430a..53fc9fb9b7 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 @@ -67,26 +67,26 @@ public class CriteriaQueryTranslator implements CriteriaQuery { private final Map associationPathCriteriaMap = new LinkedHashMap(); private final Map associationPathJoinTypesMap = new LinkedHashMap(); private final Map withClauseMap = new HashMap(); - private Set associations; + private Set associations; private final SessionFactoryImplementor sessionFactory; private final SessionFactoryHelper helper; public CriteriaQueryTranslator( final SessionFactoryImplementor factory, - final CriteriaImpl criteria, - final String rootEntityName, - final String rootSQLAlias, - CriteriaQuery outerQuery) throws HibernateException { + final CriteriaImpl criteria, + final String rootEntityName, + final String rootSQLAlias, + CriteriaQuery outerQuery) throws HibernateException { this( factory, criteria, rootEntityName, rootSQLAlias ); outerQueryTranslator = outerQuery; } public CriteriaQueryTranslator( final SessionFactoryImplementor factory, - final CriteriaImpl criteria, - final String rootEntityName, - final String rootSQLAlias) throws HibernateException { + final CriteriaImpl criteria, + final String rootEntityName, + final String rootSQLAlias) throws HibernateException { this.rootCriteria = criteria; this.rootEntityName = rootEntityName; this.sessionFactory = factory; @@ -344,17 +344,17 @@ public class CriteriaQueryTranslator implements CriteriaQuery { final Type[] typeArray = ArrayHelper.toTypeArray( types ); return new QueryParameters( typeArray, - valueArray, - lockOptions, - selection, - rootCriteria.isReadOnlyInitialized(), - ( rootCriteria.isReadOnlyInitialized() && rootCriteria.isReadOnly() ), - rootCriteria.getCacheable(), - rootCriteria.getCacheRegion(), - rootCriteria.getComment(), - rootCriteria.getQueryHints(), - rootCriteria.isLookupByNaturalKey(), - rootCriteria.getResultTransformer() + valueArray, + lockOptions, + selection, + rootCriteria.isReadOnlyInitialized(), + ( rootCriteria.isReadOnlyInitialized() && rootCriteria.isReadOnly() ), + rootCriteria.getCacheable(), + rootCriteria.getCacheRegion(), + rootCriteria.getComment(), + rootCriteria.getQueryHints(), + rootCriteria.isLookupByNaturalKey(), + rootCriteria.getResultTransformer() ); } @@ -375,8 +375,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery { public String getSelect() { return rootCriteria.getProjection().toSqlString( rootCriteria.getProjectionCriteria(), - 0, - this + 0, + this ); } @@ -458,7 +458,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery { @Override public String[] getColumnsUsingProjection( Criteria subcriteria, - String propertyName) throws HibernateException { + String propertyName) throws HibernateException { //first look for a reference to a projection alias final Projection projection = rootCriteria.getProjection(); @@ -512,11 +512,11 @@ public class CriteriaQueryTranslator implements CriteriaQuery { @Override public String[] getColumns( String propertyName, - Criteria subcriteria) throws HibernateException { + Criteria subcriteria) throws HibernateException { return getPropertyMapping( getEntityName( subcriteria, propertyName ) ) .toColumns( getSQLAlias( subcriteria, propertyName ), - getPropertyName( propertyName ) + getPropertyName( propertyName ) ); } @@ -549,8 +549,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/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java index 018f5b49d3..80dfdb9715 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java @@ -683,8 +683,8 @@ public abstract class CollectionType extends AbstractType implements Association // for a null target, or a target which is the same as the original, we // need to put the merged elements in a new collection Object result = ( target == null || - target == original || - target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) ? + target == original || + target == LazyPropertyInitializer.UNFETCHED_PROPERTY ) ? instantiateResult( original ) : target; //for arrays, replaceElements() may return a different reference, since