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

HHH-7771 : Deprecate obsolete Type, AssociationType, and TypeFactory methods

This commit is contained in:
Gail Badner 2012-12-12 10:37:40 -08:00
parent 32e8765615
commit cb4e92a98d
11 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/mapping/Array.java
View File

@ -63,7 +63,7 @@ public class Array extends List {
public CollectionType getDefaultCollectionType() throws MappingException {
return getMappings().getTypeResolver()
.getTypeFactory()
.array( getRole(), getReferencedPropertyName(), isEmbedded(), getElementClass() );
.array( getRole(), getReferencedPropertyName(), getElementClass() );
}
@Override

2
hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
View File

@ -39,7 +39,7 @@ public class Bag extends Collection {
public CollectionType getDefaultCollectionType() {
return getMappings().getTypeResolver()
.getTypeFactory()
.bag( getRole(), getReferencedPropertyName(), isEmbedded() );
.bag( getRole(), getReferencedPropertyName() );
}
void createPrimaryKey() {

2
hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
View File

@ -384,7 +384,7 @@ public abstract class Collection implements Fetchable, Value, Filterable {
else {
return mappings.getTypeResolver()
.getTypeFactory()
.customCollection( typeName, typeParameters, role, referencedPropertyName, isEmbedded() );
.customCollection( typeName, typeParameters, role, referencedPropertyName );
}
}

2
hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
View File

@ -38,7 +38,7 @@ public class IdentifierBag extends IdentifierCollection {
public CollectionType getDefaultCollectionType() {
return getMappings().getTypeResolver()
.getTypeFactory()
.idbag( getRole(), getReferencedPropertyName(), isEmbedded() );
.idbag( getRole(), getReferencedPropertyName() );
}
public Object accept(ValueVisitor visitor) {

2
hibernate-core/src/main/java/org/hibernate/mapping/List.java
View File

@ -46,7 +46,7 @@ public class List extends IndexedCollection {
public CollectionType getDefaultCollectionType() throws MappingException {
return getMappings().getTypeResolver()
.getTypeFactory()
.list( getRole(), getReferencedPropertyName(), isEmbedded() );
.list( getRole(), getReferencedPropertyName() );
}
public Object accept(ValueVisitor visitor) {

1
hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
View File

@ -49,7 +49,6 @@ public class ManyToOne extends ToOne {
getReferencedPropertyName(),
isLazy(),
isUnwrapProxy(),
isEmbedded(),
isIgnoreNotFound(),
isLogicalOneToOne
);

6
hibernate-core/src/main/java/org/hibernate/mapping/Map.java
View File

@ -44,17 +44,17 @@ public class Map extends IndexedCollection {
if ( isSorted() ) {
return getMappings().getTypeResolver()
.getTypeFactory()
.sortedMap( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );
.sortedMap( getRole(), getReferencedPropertyName(), getComparator() );
}
else if ( hasOrder() ) {
return getMappings().getTypeResolver()
.getTypeFactory()
.orderedMap( getRole(), getReferencedPropertyName(), isEmbedded() );
.orderedMap( getRole(), getReferencedPropertyName() );
}
else {
return getMappings().getTypeResolver()
.getTypeFactory()
.map( getRole(), getReferencedPropertyName(), isEmbedded() );
.map( getRole(), getReferencedPropertyName() );
}
}

1
hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
View File

@ -51,7 +51,6 @@ public class OneToMany implements Value {
null,
false,
false,
isEmbedded(),
isIgnoreNotFound(),
false
);

1
hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
View File

@ -84,7 +84,6 @@ public class OneToOne extends ToOne {
referencedPropertyName,
isLazy(),
isUnwrapProxy(),
isEmbedded(),
entityName,
propertyName
);

6
hibernate-core/src/main/java/org/hibernate/mapping/Set.java
View File

@ -61,17 +61,17 @@ public class Set extends Collection {
if ( isSorted() ) {
return getMappings().getTypeResolver()
.getTypeFactory()
.sortedSet( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );
.sortedSet( getRole(), getReferencedPropertyName(), getComparator() );
}
else if ( hasOrder() ) {
return getMappings().getTypeResolver()
.getTypeFactory()
.orderedSet( getRole(), getReferencedPropertyName(), isEmbedded() );
.orderedSet( getRole(), getReferencedPropertyName() );
}
else {
return getMappings().getTypeResolver()
.getTypeFactory()
.set( getRole(), getReferencedPropertyName(), isEmbedded() );
.set( getRole(), getReferencedPropertyName() );
}
}

11
hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
View File

@ -159,9 +159,7 @@ class HibernateTypeResolver {
typeName,
getTypeParameters( attributeBinding.getHibernateTypeDescriptor() ),
attributeBinding.getAttribute().getName(),
attributeBinding.getReferencedPropertyName(),
attributeBinding.getCollectionElement().getCollectionElementNature() ==
CollectionElementNature.COMPOSITE
attributeBinding.getReferencedPropertyName()
);
}
else {
@ -182,16 +180,13 @@ class HibernateTypeResolver {
case SET: {
return typeFactory.set(
attributeBinding.getAttribute().getName(),
attributeBinding.getReferencedPropertyName(),
attributeBinding.getCollectionElement().getCollectionElementNature() == CollectionElementNature.COMPOSITE
attributeBinding.getReferencedPropertyName()
);
}
case BAG: {
return typeFactory.bag(
attributeBinding.getAttribute().getName(),
attributeBinding.getReferencedPropertyName(),
attributeBinding.getCollectionElement()
.getCollectionElementNature() == CollectionElementNature.COMPOSITE
attributeBinding.getReferencedPropertyName()
);
}
default: {