HHH-7771 : Deprecate obsolete Type, AssociationType, and TypeFactory methods
This commit is contained in:
parent
005cc6cd2a
commit
349d4ab36f
|
@ -63,7 +63,7 @@ public class Array extends List {
|
||||||
public CollectionType getDefaultCollectionType() throws MappingException {
|
public CollectionType getDefaultCollectionType() throws MappingException {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.array( getRole(), getReferencedPropertyName(), isEmbedded(), getElementClass() );
|
.array( getRole(), getReferencedPropertyName(), getElementClass() );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class Bag extends Collection {
|
||||||
public CollectionType getDefaultCollectionType() {
|
public CollectionType getDefaultCollectionType() {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.bag( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.bag( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void createPrimaryKey() {
|
void createPrimaryKey() {
|
||||||
|
|
|
@ -384,7 +384,7 @@ public abstract class Collection implements Fetchable, Value, Filterable {
|
||||||
else {
|
else {
|
||||||
return mappings.getTypeResolver()
|
return mappings.getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.customCollection( typeName, typeParameters, role, referencedPropertyName, isEmbedded() );
|
.customCollection( typeName, typeParameters, role, referencedPropertyName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class IdentifierBag extends IdentifierCollection {
|
||||||
public CollectionType getDefaultCollectionType() {
|
public CollectionType getDefaultCollectionType() {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.idbag( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.idbag( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object accept(ValueVisitor visitor) {
|
public Object accept(ValueVisitor visitor) {
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class List extends IndexedCollection {
|
||||||
public CollectionType getDefaultCollectionType() throws MappingException {
|
public CollectionType getDefaultCollectionType() throws MappingException {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.list( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.list( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object accept(ValueVisitor visitor) {
|
public Object accept(ValueVisitor visitor) {
|
||||||
|
|
|
@ -49,7 +49,6 @@ public class ManyToOne extends ToOne {
|
||||||
getReferencedPropertyName(),
|
getReferencedPropertyName(),
|
||||||
isLazy(),
|
isLazy(),
|
||||||
isUnwrapProxy(),
|
isUnwrapProxy(),
|
||||||
isEmbedded(),
|
|
||||||
isIgnoreNotFound(),
|
isIgnoreNotFound(),
|
||||||
isLogicalOneToOne
|
isLogicalOneToOne
|
||||||
);
|
);
|
||||||
|
|
|
@ -44,17 +44,17 @@ public class Map extends IndexedCollection {
|
||||||
if ( isSorted() ) {
|
if ( isSorted() ) {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.sortedMap( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );
|
.sortedMap( getRole(), getReferencedPropertyName(), getComparator() );
|
||||||
}
|
}
|
||||||
else if ( hasOrder() ) {
|
else if ( hasOrder() ) {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.orderedMap( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.orderedMap( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.map( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.map( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,6 @@ public class OneToMany implements Value {
|
||||||
null,
|
null,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
isEmbedded(),
|
|
||||||
isIgnoreNotFound(),
|
isIgnoreNotFound(),
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
|
|
@ -84,7 +84,6 @@ public class OneToOne extends ToOne {
|
||||||
referencedPropertyName,
|
referencedPropertyName,
|
||||||
isLazy(),
|
isLazy(),
|
||||||
isUnwrapProxy(),
|
isUnwrapProxy(),
|
||||||
isEmbedded(),
|
|
||||||
entityName,
|
entityName,
|
||||||
propertyName
|
propertyName
|
||||||
);
|
);
|
||||||
|
|
|
@ -61,17 +61,17 @@ public class Set extends Collection {
|
||||||
if ( isSorted() ) {
|
if ( isSorted() ) {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.sortedSet( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );
|
.sortedSet( getRole(), getReferencedPropertyName(), getComparator() );
|
||||||
}
|
}
|
||||||
else if ( hasOrder() ) {
|
else if ( hasOrder() ) {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.orderedSet( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.orderedSet( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return getMappings().getTypeResolver()
|
return getMappings().getTypeResolver()
|
||||||
.getTypeFactory()
|
.getTypeFactory()
|
||||||
.set( getRole(), getReferencedPropertyName(), isEmbedded() );
|
.set( getRole(), getReferencedPropertyName() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -159,9 +159,7 @@ class HibernateTypeResolver {
|
||||||
typeName,
|
typeName,
|
||||||
getTypeParameters( attributeBinding.getHibernateTypeDescriptor() ),
|
getTypeParameters( attributeBinding.getHibernateTypeDescriptor() ),
|
||||||
attributeBinding.getAttribute().getName(),
|
attributeBinding.getAttribute().getName(),
|
||||||
attributeBinding.getReferencedPropertyName(),
|
attributeBinding.getReferencedPropertyName()
|
||||||
attributeBinding.getCollectionElement().getCollectionElementNature() ==
|
|
||||||
CollectionElementNature.COMPOSITE
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -182,16 +180,13 @@ class HibernateTypeResolver {
|
||||||
case SET: {
|
case SET: {
|
||||||
return typeFactory.set(
|
return typeFactory.set(
|
||||||
attributeBinding.getAttribute().getName(),
|
attributeBinding.getAttribute().getName(),
|
||||||
attributeBinding.getReferencedPropertyName(),
|
attributeBinding.getReferencedPropertyName()
|
||||||
attributeBinding.getCollectionElement().getCollectionElementNature() == CollectionElementNature.COMPOSITE
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
case BAG: {
|
case BAG: {
|
||||||
return typeFactory.bag(
|
return typeFactory.bag(
|
||||||
attributeBinding.getAttribute().getName(),
|
attributeBinding.getAttribute().getName(),
|
||||||
attributeBinding.getReferencedPropertyName(),
|
attributeBinding.getReferencedPropertyName()
|
||||||
attributeBinding.getCollectionElement()
|
|
||||||
.getCollectionElementNature() == CollectionElementNature.COMPOSITE
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
|
|
Loading…
Reference in New Issue