From 3489f75e1d455049cffd45694f025b97487b429f Mon Sep 17 00:00:00 2001 From: Philippe Marschall Date: Sat, 19 May 2018 22:53:07 +0200 Subject: [PATCH] HHH-12605 Boxed variables never null https://hibernate.atlassian.net/browse/HHH-12605 --- .../src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java | 2 +- .../hql/internal/classic/QueryTranslatorImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java index 5e17992064..a6c617a801 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java @@ -498,7 +498,7 @@ public class Ejb3JoinColumn extends Ejb3Column { boolean mappedBySide = mappedByTableName != null || mappedByPropertyName != null; boolean ownerSide = getPropertyName() != null; - Boolean isRefColumnQuoted = StringHelper.isQuoted( logicalReferencedColumn ); + boolean isRefColumnQuoted = StringHelper.isQuoted( logicalReferencedColumn ); final String unquotedLogicalReferenceColumn = isRefColumnQuoted ? StringHelper.unquote( logicalReferencedColumn ) : logicalReferencedColumn; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java index c36004cb42..24126fe58d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java @@ -543,7 +543,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator superQuery.addNamedParameter( name ); } - final Integer loc = parameterCount++; + final int loc = parameterCount++; final NamedParameterInformationImpl info = namedParameters.computeIfAbsent( name, @@ -571,12 +571,12 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator throw new QueryException( "Cannot mix legacy and labeled positional parameters" ); } - final Integer label = legacyPositionalParameterCount++; + final int label = legacyPositionalParameterCount++; final PositionalParameterInformationImpl paramInfo = new PositionalParameterInformationImpl( label ); ordinalParameters.put( label, paramInfo ); paramValueBinders.add( paramInfo ); - final Integer loc = parameterCount++; + final int loc = parameterCount++; paramInfo.addSourceLocation( loc ); } @@ -593,7 +593,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator throw new QueryException( "Cannot mix legacy and labeled positional parameters" ); } - final Integer loc = parameterCount++; + final int loc = parameterCount++; final PositionalParameterInformationImpl info = ordinalParameters.computeIfAbsent( label,