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

Checkstyle fixups.

This commit is contained in:
Chris Cranford 2016-06-15 23:21:32 -05:00
parent 2852ca21d0
commit 66172dd30e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View File

@ -698,7 +698,7 @@ public abstract class Dialect implements ConversionContext {
* @param name The Hibernate {@link org.hibernate.type.Type} name
*/
protected void registerHibernateType(int code, long capacity, String name) {
hibernateTypeNames.put( code, capacity, name);
hibernateTypeNames.put( code, capacity, name );
}
/**
@ -709,7 +709,7 @@ public abstract class Dialect implements ConversionContext {
* @param name The Hibernate {@link org.hibernate.type.Type} name
*/
protected void registerHibernateType(int code, String name) {
hibernateTypeNames.put( code, name);
hibernateTypeNames.put( code, name );
}
@ -1240,7 +1240,7 @@ public abstract class Dialect implements ConversionContext {
public String getWriteLockString(String aliases, int timeout) {
// by default we simply return the getWriteLockString(timeout) result since
// the default is to say no support for "FOR UPDATE OF ..."
return getWriteLockString(timeout);
return getWriteLockString( timeout );
}
/**
@ -1268,7 +1268,7 @@ public abstract class Dialect implements ConversionContext {
public String getReadLockString(String aliases, int timeout) {
// by default we simply return the getReadLockString(timeout) result since
// the default is to say no support for "FOR UPDATE OF ..."
return getReadLockString(timeout);
return getReadLockString( timeout );
}
/**
@ -1796,7 +1796,7 @@ public abstract class Dialect implements ConversionContext {
protected void registerKeyword(String word) {
// When tokens are checked for keywords, they are always compared against the lower-case version of the token.
// For instance, Template#renderWhereStringTemplate transforms all tokens to lower-case too.
sqlKeywords.add(word.toLowerCase(Locale.ROOT));
sqlKeywords.add( word.toLowerCase( Locale.ROOT ) );
}
/**
@ -2407,7 +2407,7 @@ public abstract class Dialect implements ConversionContext {
orderByElement.append( " " ).append( order );
}
if ( nulls != NullPrecedence.NONE ) {
orderByElement.append( " nulls " ).append( nulls.name().toLowerCase(Locale.ROOT) );
orderByElement.append( " nulls " ).append( nulls.name().toLowerCase( Locale.ROOT ) );
}
return orderByElement.toString();
}
@ -2650,6 +2650,7 @@ public abstract class Dialect implements ConversionContext {
*
* @return {@code true} indicates that the dialect requests that locking be applied by subsequent select;
* {@code false} (the default) indicates that locking should be applied to the main SQL statement..
* @deprecated Use {@link #useFollowOnLocking(QueryParameters)} instead.
*/
@Deprecated
public boolean useFollowOnLocking() {

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

@ -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();