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

gbadner · gbadner · commit cb4e92a98d6e · 2012-12-12T16:09:02.000-08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java
@@ -63,7 +63,7 @@ public Class getElementClass() throws MappingException {
     public CollectionType getDefaultCollectionType() throws MappingException {
 		return getMappings().getTypeResolver()
 				.getTypeFactory()
-				.array( getRole(), getReferencedPropertyName(), isEmbedded(), getElementClass() );
+				.array( getRole(), getReferencedPropertyName(), getElementClass() );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java b/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java
@@ -39,7 +39,7 @@ public Bag(Mappings mappings, PersistentClass owner) {
 	public CollectionType getDefaultCollectionType() {
 		return getMappings().getTypeResolver()
 				.getTypeFactory()
-				.bag( getRole(), getReferencedPropertyName(), isEmbedded() );
+				.bag( getRole(), getReferencedPropertyName() );
 	}
 
 	void createPrimaryKey() {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
@@ -384,7 +384,7 @@ public CollectionType getCollectionType() {
 		else {
 			return mappings.getTypeResolver()
 					.getTypeFactory()
-					.customCollection( typeName, typeParameters, role, referencedPropertyName, isEmbedded() );
+					.customCollection( typeName, typeParameters, role, referencedPropertyName );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java
@@ -38,7 +38,7 @@ public IdentifierBag(Mappings mappings, PersistentClass owner) {
 	public CollectionType getDefaultCollectionType() {
 		return getMappings().getTypeResolver()
 				.getTypeFactory()
-				.idbag( getRole(), getReferencedPropertyName(), isEmbedded() );
+				.idbag( getRole(), getReferencedPropertyName() );
 	}
 
 	public Object accept(ValueVisitor visitor) {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/List.java b/hibernate-core/src/main/java/org/hibernate/mapping/List.java
@@ -46,7 +46,7 @@ public List(Mappings mappings, PersistentClass owner) {
 	public CollectionType getDefaultCollectionType() throws MappingException {
 		return getMappings().getTypeResolver()
 				.getTypeFactory()
-				.list( getRole(), getReferencedPropertyName(), isEmbedded() );
+				.list( getRole(), getReferencedPropertyName() );
 	}
 	
 	public Object accept(ValueVisitor visitor) {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java
@@ -49,7 +49,6 @@ public Type getType() throws MappingException {
 				getReferencedPropertyName(),
 				isLazy(),
 				isUnwrapProxy(),
-				isEmbedded(),
 				isIgnoreNotFound(),
 				isLogicalOneToOne
 		);
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java
@@ -44,17 +44,17 @@ public CollectionType getDefaultCollectionType() {
 		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() );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java
@@ -51,7 +51,6 @@ private EntityType getEntityType() {
 				null, 
 				false,
 				false,
-				isEmbedded(),
 				isIgnoreNotFound(),
 				false
 			);
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java
@@ -84,7 +84,6 @@ public Type getType() throws MappingException {
 					referencedPropertyName,
 					isLazy(),
 					isUnwrapProxy(),
-					isEmbedded(),
 					entityName,
 					propertyName
 			);
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
@@ -61,17 +61,17 @@ public CollectionType getDefaultCollectionType() {
 		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() );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/HibernateTypeResolver.java
@@ -159,9 +159,7 @@ private void resolvePluralAttributeTypeInformation(AbstractPluralAttributeBindin
 									typeName,
 									getTypeParameters( attributeBinding.getHibernateTypeDescriptor() ),
 									attributeBinding.getAttribute().getName(),
-									attributeBinding.getReferencedPropertyName(),
-									attributeBinding.getCollectionElement().getCollectionElementNature() ==
-											CollectionElementNature.COMPOSITE
+									attributeBinding.getReferencedPropertyName()
 							);
 		}
 		else {
@@ -182,16 +180,13 @@ private Type determineDefaultCollectionInformation(AbstractPluralAttributeBindin
 			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: {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public Class getElementClass() throws MappingException {`
`63`	`63`	`public CollectionType getDefaultCollectionType() throws MappingException {`
`64`	`64`	`return getMappings().getTypeResolver()`
`65`	`65`	`.getTypeFactory()`
`66`		`- .array( getRole(), getReferencedPropertyName(), isEmbedded(), getElementClass() );`
	`66`	`+ .array( getRole(), getReferencedPropertyName(), getElementClass() );`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public Bag(Mappings mappings, PersistentClass owner) {`
`39`	`39`	`public CollectionType getDefaultCollectionType() {`
`40`	`40`	`return getMappings().getTypeResolver()`
`41`	`41`	`.getTypeFactory()`
`42`		`- .bag( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`42`	`+ .bag( getRole(), getReferencedPropertyName() );`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void createPrimaryKey() {`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ public CollectionType getCollectionType() {`
`384`	`384`	`else {`
`385`	`385`	`return mappings.getTypeResolver()`
`386`	`386`	`.getTypeFactory()`
`387`		`- .customCollection( typeName, typeParameters, role, referencedPropertyName, isEmbedded() );`
	`387`	`+ .customCollection( typeName, typeParameters, role, referencedPropertyName );`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public IdentifierBag(Mappings mappings, PersistentClass owner) {`
`38`	`38`	`public CollectionType getDefaultCollectionType() {`
`39`	`39`	`return getMappings().getTypeResolver()`
`40`	`40`	`.getTypeFactory()`
`41`		`- .idbag( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`41`	`+ .idbag( getRole(), getReferencedPropertyName() );`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public Object accept(ValueVisitor visitor) {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public List(Mappings mappings, PersistentClass owner) {`
`46`	`46`	`public CollectionType getDefaultCollectionType() throws MappingException {`
`47`	`47`	`return getMappings().getTypeResolver()`
`48`	`48`	`.getTypeFactory()`
`49`		`- .list( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`49`	`+ .list( getRole(), getReferencedPropertyName() );`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public Object accept(ValueVisitor visitor) {`
Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,17 @@ public CollectionType getDefaultCollectionType() {`
`44`	`44`	`if ( isSorted() ) {`
`45`	`45`	`return getMappings().getTypeResolver()`
`46`	`46`	`.getTypeFactory()`
`47`		`- .sortedMap( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );`
	`47`	`+ .sortedMap( getRole(), getReferencedPropertyName(), getComparator() );`
`48`	`48`	`}`
`49`	`49`	`else if ( hasOrder() ) {`
`50`	`50`	`return getMappings().getTypeResolver()`
`51`	`51`	`.getTypeFactory()`
`52`		`- .orderedMap( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`52`	`+ .orderedMap( getRole(), getReferencedPropertyName() );`
`53`	`53`	`}`
`54`	`54`	`else {`
`55`	`55`	`return getMappings().getTypeResolver()`
`56`	`56`	`.getTypeFactory()`
`57`		`- .map( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`57`	`+ .map( getRole(), getReferencedPropertyName() );`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -61,17 +61,17 @@ public CollectionType getDefaultCollectionType() {`
`61`	`61`	`if ( isSorted() ) {`
`62`	`62`	`return getMappings().getTypeResolver()`
`63`	`63`	`.getTypeFactory()`
`64`		`- .sortedSet( getRole(), getReferencedPropertyName(), isEmbedded(), getComparator() );`
	`64`	`+ .sortedSet( getRole(), getReferencedPropertyName(), getComparator() );`
`65`	`65`	`}`
`66`	`66`	`else if ( hasOrder() ) {`
`67`	`67`	`return getMappings().getTypeResolver()`
`68`	`68`	`.getTypeFactory()`
`69`		`- .orderedSet( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`69`	`+ .orderedSet( getRole(), getReferencedPropertyName() );`
`70`	`70`	`}`
`71`	`71`	`else {`
`72`	`72`	`return getMappings().getTypeResolver()`
`73`	`73`	`.getTypeFactory()`
`74`		`- .set( getRole(), getReferencedPropertyName(), isEmbedded() );`
	`74`	`+ .set( getRole(), getReferencedPropertyName() );`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`