Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-25 21:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-12332 Fix a couple of formatting issues

Browse Source
This commit is contained in:
Guillaume Smet 2018-03-05 23:55:11 +01:00 committed by Andrea Boriero
parent 1e5a8d3c43
commit 0577033193
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java
View File

@ -44,15 +44,15 @@ public boolean isSame(Collection other) {
}
public boolean isSame(IndexedCollection other) {
return super.isSame( other )
&& isSame( index, other.index );
return super.isSame( other )
&& isSame( index, other.index );
}
void createPrimaryKey() {
if ( !isOneToMany() ) {
PrimaryKey pk = new PrimaryKey( getCollectionTable() );
pk.addColumns( getKey().getColumnIterator() );
// index should be last column listed
boolean isFormula = false;
Iterator iter = getIndex().getColumnIterator();
@ -66,7 +66,7 @@ void createPrimaryKey() {
pk.addColumns( getElement().getColumnIterator() );
}
else {
pk.addColumns( getIndex().getColumnIterator() );
pk.addColumns( getIndex().getColumnIterator() );
}
getCollectionTable().setPrimaryKey(pk);
}
@ -95,7 +95,7 @@ public void validate(Mapping mapping) throws MappingException {
);
}
}
public boolean isList() {
return false;
}

3
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractPropertyMapping.java
View File

@ -193,7 +193,8 @@ else if ( type instanceof CollectionType ) {
return;
}
throw new IllegalStateException( "Collection mapping in abstract entity type with a type variable is unsupported! Couldn't add property '" + path + "' with type: " + type );
throw new IllegalStateException( "Collection mapping in abstract entity type with a type variable is unsupported! Couldn't add property '"
+ path + "' with type: " + type );
}
else if ( type instanceof EntityType ) {
EntityType entityType1 = (EntityType) existingType;