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

HHH-13496 Some formatting fixes

This commit is contained in:
Sanne Grinovero 2019-07-05 12:49:14 +01:00
parent dd7d798d77
commit e636eaf990
6 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java
View File

@ -1124,8 +1124,8 @@ public class BinderHelper {
public static Map<String,String> toAliasTableMap(SqlFragmentAlias[] aliases){ public static Map<String,String> toAliasTableMap(SqlFragmentAlias[] aliases){
Map<String,String> ret = new HashMap<>(); Map<String,String> ret = new HashMap<>();
for ( int i = 0; i < aliases.length; i++ ){ for ( int i = 0; i < aliases.length; i++ ) {
if ( StringHelper.isNotEmpty( aliases[i].table() ) ){ if ( StringHelper.isNotEmpty( aliases[i].table() ) ) {
ret.put( aliases[i].alias(), aliases[i].table() ); ret.put( aliases[i].alias(), aliases[i].table() );
} }
} }
@ -1134,8 +1134,8 @@ public class BinderHelper {
public static Map<String,String> toAliasEntityMap(SqlFragmentAlias[] aliases){ public static Map<String,String> toAliasEntityMap(SqlFragmentAlias[] aliases){
Map<String,String> ret = new HashMap<>(); Map<String,String> ret = new HashMap<>();
for (int i = 0; i < aliases.length; i++){ for ( int i = 0; i < aliases.length; i++ ) {
if (aliases[i].entity() != void.class){ if ( aliases[i].entity() != void.class ) {
ret.put( aliases[i].alias(), aliases[i].entity().getName() ); ret.put( aliases[i].alias(), aliases[i].entity().getName() );
} }
} }

10
hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentList.java
View File

@ -104,7 +104,7 @@ public class PersistentList extends AbstractPersistentCollection implements List
public boolean equalsSnapshot(CollectionPersister persister) throws HibernateException { public boolean equalsSnapshot(CollectionPersister persister) throws HibernateException {
final Type elementType = persister.getElementType(); final Type elementType = persister.getElementType();
final List sn = (List) getSnapshot(); final List sn = (List) getSnapshot();
if ( sn.size()!=this.list.size() ) { if ( sn.size() != this.list.size() ) {
return false; return false;
} }
final Iterator itr = list.iterator(); final Iterator itr = list.iterator();
@ -215,7 +215,7 @@ public class PersistentList extends AbstractPersistentCollection implements List
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public boolean addAll(Collection values) { public boolean addAll(Collection values) {
if ( values.size()==0 ) { if ( values.size() == 0 ) {
return false; return false;
} }
if ( !isOperationQueueEnabled() ) { if ( !isOperationQueueEnabled() ) {
@ -226,14 +226,14 @@ public class PersistentList extends AbstractPersistentCollection implements List
for ( Object value : values ) { for ( Object value : values ) {
queueOperation( new SimpleAdd( value ) ); queueOperation( new SimpleAdd( value ) );
} }
return values.size()>0; return values.size() > 0;
} }
} }
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public boolean addAll(int index, Collection coll) { public boolean addAll(int index, Collection coll) {
if ( coll.size()>0 ) { if ( coll.size() > 0 ) {
write(); write();
return list.addAll( index, coll ); return list.addAll( index, coll );
} }
@ -245,7 +245,7 @@ public class PersistentList extends AbstractPersistentCollection implements List
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public boolean removeAll(Collection coll) { public boolean removeAll(Collection coll) {
if ( coll.size()>0 ) { if ( coll.size() > 0 ) {
initialize( true ); initialize( true );
if ( list.removeAll( coll ) ) { if ( list.removeAll( coll ) ) {
elementRemoved = true; elementRemoved = true;

4
hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/TimeTypeDescriptor.java
View File

@ -49,7 +49,7 @@ public class TimeTypeDescriptor implements SqlTypeDescriptor {
if ( value instanceof Calendar ) { if ( value instanceof Calendar ) {
st.setTime( index, time, (Calendar) value ); st.setTime( index, time, (Calendar) value );
} }
else if (options.getJdbcTimeZone() != null) { else if ( options.getJdbcTimeZone() != null ) {
st.setTime( index, time, Calendar.getInstance( options.getJdbcTimeZone() ) ); st.setTime( index, time, Calendar.getInstance( options.getJdbcTimeZone() ) );
} }
else { else {
@ -64,7 +64,7 @@ public class TimeTypeDescriptor implements SqlTypeDescriptor {
if ( value instanceof Calendar ) { if ( value instanceof Calendar ) {
st.setTime( name, time, (Calendar) value ); st.setTime( name, time, (Calendar) value );
} }
else if (options.getJdbcTimeZone() != null) { else if ( options.getJdbcTimeZone() != null ) {
st.setTime( name, time, Calendar.getInstance( options.getJdbcTimeZone() ) ); st.setTime( name, time, Calendar.getInstance( options.getJdbcTimeZone() ) );
} }
else { else {

4
hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/TimestampTypeDescriptor.java
View File

@ -49,7 +49,7 @@ public class TimestampTypeDescriptor implements SqlTypeDescriptor {
if ( value instanceof Calendar ) { if ( value instanceof Calendar ) {
st.setTimestamp( index, timestamp, (Calendar) value ); st.setTimestamp( index, timestamp, (Calendar) value );
} }
else if (options.getJdbcTimeZone() != null) { else if ( options.getJdbcTimeZone() != null ) {
st.setTimestamp( index, timestamp, Calendar.getInstance( options.getJdbcTimeZone() ) ); st.setTimestamp( index, timestamp, Calendar.getInstance( options.getJdbcTimeZone() ) );
} }
else { else {
@ -64,7 +64,7 @@ public class TimestampTypeDescriptor implements SqlTypeDescriptor {
if ( value instanceof Calendar ) { if ( value instanceof Calendar ) {
st.setTimestamp( name, timestamp, (Calendar) value ); st.setTimestamp( name, timestamp, (Calendar) value );
} }
else if (options.getJdbcTimeZone() != null) { else if ( options.getJdbcTimeZone() != null ) {
st.setTimestamp( name, timestamp, Calendar.getInstance( options.getJdbcTimeZone() ) ); st.setTimestamp( name, timestamp, Calendar.getInstance( options.getJdbcTimeZone() ) );
} }
else { else {

94
hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java
View File

@ -171,35 +171,35 @@ public class HQLTest extends QueryTranslatorTestCase {
} ) } )
public void testRowValueConstructorSyntaxInInListBeingTranslated() { public void testRowValueConstructorSyntaxInInListBeingTranslated() {
QueryTranslatorImpl translator = createNewQueryTranslator("from LineItem l where l.id in (?1)"); QueryTranslatorImpl translator = createNewQueryTranslator( "from LineItem l where l.id in (?1)" );
assertInExist("'in' should be translated to 'and'", false, translator); assertInExist( "'in' should be translated to 'and'", false, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in ?1"); translator = createNewQueryTranslator("from LineItem l where l.id in ?1" );
assertInExist("'in' should be translated to 'and'", false, translator); assertInExist( "'in' should be translated to 'and'", false, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in (('a1',1,'b1'),('a2',2,'b2'))"); translator = createNewQueryTranslator("from LineItem l where l.id in (('a1',1,'b1'),('a2',2,'b2'))" );
assertInExist("'in' should be translated to 'and'", false, translator); assertInExist( "'in' should be translated to 'and'", false, translator );
translator = createNewQueryTranslator("from Animal a where a.id in (?1)"); translator = createNewQueryTranslator("from Animal a where a.id in (?1)" );
assertInExist("only translated tuple has 'in' syntax", true, translator); assertInExist( "only translated tuple has 'in' syntax", true, translator );
translator = createNewQueryTranslator("from Animal a where a.id in ?1"); translator = createNewQueryTranslator("from Animal a where a.id in ?1" );
assertInExist("only translated tuple has 'in' syntax", true, translator); assertInExist( "only translated tuple has 'in' syntax", true, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in (select a1 from Animal a1 left join a1.offspring o where a1.id = 1)"); translator = createNewQueryTranslator("from LineItem l where l.id in (select a1 from Animal a1 left join a1.offspring o where a1.id = 1)" );
assertInExist("do not translate sub-queries", true, translator); assertInExist( "do not translate sub-queries", true, translator );
} }
@Test @Test
@RequiresDialectFeature( DialectChecks.SupportsRowValueConstructorSyntaxInInListCheck.class ) @RequiresDialectFeature( DialectChecks.SupportsRowValueConstructorSyntaxInInListCheck.class )
public void testRowValueConstructorSyntaxInInList() { public void testRowValueConstructorSyntaxInInList() {
QueryTranslatorImpl translator = createNewQueryTranslator("from LineItem l where l.id in (?1)"); QueryTranslatorImpl translator = createNewQueryTranslator("from LineItem l where l.id in (?1)" );
assertInExist(" 'in' should be kept, since the dialect supports this syntax", true, translator); assertInExist( " 'in' should be kept, since the dialect supports this syntax", true, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in ?1"); translator = createNewQueryTranslator("from LineItem l where l.id in ?1" );
assertInExist(" 'in' should be kept, since the dialect supports this syntax", true, translator); assertInExist( " 'in' should be kept, since the dialect supports this syntax", true, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in (('a1',1,'b1'),('a2',2,'b2'))"); translator = createNewQueryTranslator("from LineItem l where l.id in (('a1',1,'b1'),('a2',2,'b2'))" );
assertInExist(" 'in' should be kept, since the dialect supports this syntax", true,translator); assertInExist( " 'in' should be kept, since the dialect supports this syntax", true, translator );
translator = createNewQueryTranslator("from Animal a where a.id in (?1)"); translator = createNewQueryTranslator("from Animal a where a.id in (?1)" );
assertInExist("only translated tuple has 'in' syntax", true, translator); assertInExist( "only translated tuple has 'in' syntax", true, translator );
translator = createNewQueryTranslator("from Animal a where a.id in ?1"); translator = createNewQueryTranslator("from Animal a where a.id in ?1" );
assertInExist("only translated tuple has 'in' syntax", true, translator); assertInExist( "only translated tuple has 'in' syntax", true, translator );
translator = createNewQueryTranslator("from LineItem l where l.id in (select a1 from Animal a1 left join a1.offspring o where a1.id = 1)"); translator = createNewQueryTranslator("from LineItem l where l.id in (select a1 from Animal a1 left join a1.offspring o where a1.id = 1)" );
assertInExist("do not translate sub-queries", true, translator); assertInExist( "do not translate sub-queries", true, translator );
} }
private void assertInExist( String message, boolean expected, QueryTranslatorImpl translator ) { private void assertInExist( String message, boolean expected, QueryTranslatorImpl translator ) {
@ -348,41 +348,41 @@ public class HQLTest extends QueryTranslatorTestCase {
@Test @Test
public void testSubselectBetween() { public void testSubselectBetween() {
assertTranslation("from Animal x where (select max(a.bodyWeight) from Animal a) between :min and :max"); assertTranslation( "from Animal x where (select max(a.bodyWeight) from Animal a) between :min and :max" );
assertTranslation("from Animal x where (select max(a.description) from Animal a) like 'big%'"); assertTranslation( "from Animal x where (select max(a.description) from Animal a) like 'big%'" );
assertTranslation("from Animal x where (select max(a.bodyWeight) from Animal a) is not null"); assertTranslation( "from Animal x where (select max(a.bodyWeight) from Animal a) is not null" );
assertTranslation("from Animal x where exists (select max(a.bodyWeight) from Animal a)"); assertTranslation( "from Animal x where exists (select max(a.bodyWeight) from Animal a)" );
assertTranslation("from Animal x where (select max(a.bodyWeight) from Animal a) in (1,2,3)"); assertTranslation( "from Animal x where (select max(a.bodyWeight) from Animal a) in (1,2,3)" );
} }
@Test @Test
public void testFetchOrderBy() { public void testFetchOrderBy() {
assertTranslation("from Animal a left outer join fetch a.offspring where a.mother.id = :mid order by a.description"); assertTranslation( "from Animal a left outer join fetch a.offspring where a.mother.id = :mid order by a.description");
} }
@Test @Test
public void testCollectionOrderBy() { public void testCollectionOrderBy() {
assertTranslation("from Animal a join a.offspring o order by a.description"); assertTranslation( "from Animal a join a.offspring o order by a.description" );
assertTranslation("from Animal a join fetch a.offspring order by a.description"); assertTranslation( "from Animal a join fetch a.offspring order by a.description" );
assertTranslation("from Animal a join fetch a.offspring o order by o.description"); assertTranslation( "from Animal a join fetch a.offspring o order by o.description" );
assertTranslation("from Animal a join a.offspring o order by a.description, o.description"); assertTranslation( "from Animal a join a.offspring o order by a.description, o.description" );
} }
@Test @Test
public void testExpressionWithParamInFunction() { public void testExpressionWithParamInFunction() {
assertTranslation("from Animal a where abs(a.bodyWeight-:param) < 2.0"); assertTranslation("from Animal a where abs(a.bodyWeight-:param) < 2.0" );
assertTranslation("from Animal a where abs(:param - a.bodyWeight) < 2.0"); assertTranslation("from Animal a where abs(:param - a.bodyWeight) < 2.0" );
assertTranslation("from Animal where abs(:x - :y) < 2.0"); assertTranslation("from Animal where abs(:x - :y) < 2.0" );
assertTranslation("from Animal where lower(upper(:foo)) like 'f%'"); assertTranslation("from Animal where lower(upper(:foo)) like 'f%'" );
if ( ! ( getDialect() instanceof SybaseDialect ) && ! ( getDialect() instanceof Sybase11Dialect ) && ! ( getDialect() instanceof SybaseASE15Dialect ) && ! ( getDialect() instanceof SQLServerDialect ) && ! ( getDialect() instanceof TeradataDialect ) ) { if ( ! ( getDialect() instanceof SybaseDialect ) && ! ( getDialect() instanceof Sybase11Dialect ) && ! ( getDialect() instanceof SybaseASE15Dialect ) && ! ( getDialect() instanceof SQLServerDialect ) && ! ( getDialect() instanceof TeradataDialect ) ) {
// Transact-SQL dialects (except SybaseAnywhereDialect) map the length function -> len; // Transact-SQL dialects (except SybaseAnywhereDialect) map the length function -> len;
// classic translator does not consider that *when nested*; // classic translator does not consider that *when nested*;
// SybaseAnywhereDialect supports the length function // SybaseAnywhereDialect supports the length function
assertTranslation("from Animal a where abs(abs(a.bodyWeight - 1.0 + :param) * abs(length('ffobar')-3)) = 3.0"); assertTranslation( "from Animal a where abs(abs(a.bodyWeight - 1.0 + :param) * abs(length('ffobar')-3)) = 3.0" );
} }
if ( !( getDialect() instanceof MySQLDialect ) && ! ( getDialect() instanceof SybaseDialect ) && ! ( getDialect() instanceof Sybase11Dialect ) && !( getDialect() instanceof SybaseASE15Dialect ) && ! ( getDialect() instanceof SybaseAnywhereDialect ) && ! ( getDialect() instanceof SQLServerDialect ) && ! ( getDialect() instanceof TeradataDialect ) ) { if ( !( getDialect() instanceof MySQLDialect ) && ! ( getDialect() instanceof SybaseDialect ) && ! ( getDialect() instanceof Sybase11Dialect ) && !( getDialect() instanceof SybaseASE15Dialect ) && ! ( getDialect() instanceof SybaseAnywhereDialect ) && ! ( getDialect() instanceof SQLServerDialect ) && ! ( getDialect() instanceof TeradataDialect ) ) {
assertTranslation("from Animal where lower(upper('foo') || upper(:bar)) like 'f%'"); assertTranslation( "from Animal where lower(upper('foo') || upper(:bar)) like 'f%'" );
} }
if ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect || getDialect() instanceof TeradataDialect) { if ( getDialect() instanceof PostgreSQLDialect || getDialect() instanceof PostgreSQL81Dialect || getDialect() instanceof TeradataDialect) {
return; return;
@ -398,7 +398,7 @@ public class HQLTest extends QueryTranslatorTestCase {
// parser does not; so the outputs do not match here... // parser does not; so the outputs do not match here...
return; return;
} }
assertTranslation("from Animal where abs(cast(1 as float) - cast(:param as float)) = 1.0"); assertTranslation( "from Animal where abs(cast(1 as float) - cast(:param as float)) = 1.0" );
} }
@Test @Test
@ -795,7 +795,7 @@ public class HQLTest extends QueryTranslatorTestCase {
// uses '+' operator; updated Ingres9Dialect to use "||". // uses '+' operator; updated Ingres9Dialect to use "||".
return; return;
} }
assertTranslation("from Human h where h.nickName = '1' || 'ov' || 'tha' || 'few'"); assertTranslation("from Human h where h.nickName = '1' || 'ov' || 'tha' || 'few'" );
} }
@Test @Test
@ -823,10 +823,10 @@ public class HQLTest extends QueryTranslatorTestCase {
assertTranslation( "from Animal an where an.bodyWeight > abs(3/5)" ); assertTranslation( "from Animal an where an.bodyWeight > abs(3/5)" );
assertTranslation( "from Animal an where an.bodyWeight > abs(3+5)" ); assertTranslation( "from Animal an where an.bodyWeight > abs(3+5)" );
assertTranslation( "from Animal an where an.bodyWeight > abs(3*5)" ); assertTranslation( "from Animal an where an.bodyWeight > abs(3*5)" );
SQLFunction concat = sessionFactory().getSqlFunctionRegistry().findSQLFunction( "concat"); SQLFunction concat = sessionFactory().getSqlFunctionRegistry().findSQLFunction( "concat" );
List list = new ArrayList(); List list = new ArrayList();
list.add("'fat'"); list.add( "'fat'" );
list.add("'skinny'"); list.add( "'skinny'" );
assertTranslation( assertTranslation(
"from Animal an where an.description = " + "from Animal an where an.description = " +
concat.render( StringType.INSTANCE, list, sessionFactory() ) concat.render( StringType.INSTANCE, list, sessionFactory() )
@ -1563,7 +1563,7 @@ public class HQLTest extends QueryTranslatorTestCase {
@Test @Test
public void testAssociationPropertyWithoutAlias() throws Exception { public void testAssociationPropertyWithoutAlias() throws Exception {
// The classic translator doesn't do this right, so don't bother asserting. // The classic translator doesn't do this right, so don't bother asserting.
compileWithAstQueryTranslator("from Animal where zoo is null", false); compileWithAstQueryTranslator( "from Animal where zoo is null", false );
} }
private void compileWithAstQueryTranslator(String hql, boolean scalar) { private void compileWithAstQueryTranslator(String hql, boolean scalar) {
@ -1577,7 +1577,7 @@ public class HQLTest extends QueryTranslatorTestCase {
@Test @Test
public void testComponentNoAlias() throws Exception { public void testComponentNoAlias() throws Exception {
// The classic translator doesn't do this right, so don't bother asserting. // The classic translator doesn't do this right, so don't bother asserting.
compileWithAstQueryTranslator( "from Human where name.first = 'Gavin'", false); compileWithAstQueryTranslator( "from Human where name.first = 'Gavin'", false );
} }
} }

5
hibernate-core/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java
View File

@ -100,12 +100,13 @@ public abstract class QueryTranslatorTestCase extends BaseCoreFunctionalTestCase
e.printStackTrace(); e.printStackTrace();
cf = e; cf = e;
} }
if ("false".equals(System.getProperty("org.hibernate.test.hql.SkipScalarQuery","false"))) { if ( "false".equals( System.getProperty( "org.hibernate.test.hql.SkipScalarQuery", "false" ) ) ) {
// Run the scalar translation anyway, even if there was a comparison failure. // Run the scalar translation anyway, even if there was a comparison failure.
assertTranslation( hql, replacements, true, null ); assertTranslation( hql, replacements, true, null );
} }
if (cf != null) if ( cf != null ) {
throw cf; throw cf;
}
} }
protected void assertTranslation(String hql, Map replacements, boolean scalar, String sql) { protected void assertTranslation(String hql, Map replacements, boolean scalar, String sql) {