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

deprecate two operations that are no longer called 

... and return deprecated types
This commit is contained in:
Gavin King 2022-01-29 11:15:55 +01:00
parent ea36099571
commit e8d7c98798
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
View File

@ -2035,7 +2035,7 @@ public abstract class AbstractCollectionPersister
protected abstract void doProcessQueuedOps(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session)
throws HibernateException;
@Override
@Override @Deprecated
public CollectionMetadata getCollectionMetadata() {
return this;
}

6
hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java
View File

@ -264,6 +264,12 @@ public interface CollectionPersister extends CollectionDefinition, Restrictable
*/
Serializable[] getCollectionSpaces();
/**
* Get the user-visible metadata for the collection (optional operation)
*
* @deprecated This operation is no longer called by Hibernate.
*/
@Deprecated(since = "6.0")
CollectionMetadata getCollectionMetadata();
/**

10
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -2345,7 +2345,7 @@ public abstract class AbstractEntityPersister
}
private DiscriminatorMetadata buildTypeDiscriminatorMetadata() {
return () -> new DiscriminatorType( (BasicType<?>) getDiscriminatorType(), AbstractEntityPersister.this );
return () -> new DiscriminatorType<>( (BasicType<?>) getDiscriminatorType(), AbstractEntityPersister.this );
}
public static String generateTableAlias(String rootAlias, int tableNumber) {
@ -5039,6 +5039,7 @@ public abstract class AbstractEntityPersister
return getPropertyValue( baseValue, baseValueType, propertyName, nextDotIndex );
}
@Override @Deprecated
public Object getIdentifier(Object object) {
return getIdentifier( object, null );
}
@ -5144,6 +5145,7 @@ public abstract class AbstractEntityPersister
}
}
@Override @Deprecated
public boolean isMultiTable() {
return false;
}
@ -5477,7 +5479,7 @@ public abstract class AbstractEntityPersister
.getBootModel()
.getEntityBinding( getEntityName() );
EntityMappingType rootEntityDescriptor;
// EntityMappingType rootEntityDescriptor;
if ( superMappingType != null ) {
( (InFlightEntityMappingType) superMappingType ).prepareMappingModel( creationProcess );
if ( shouldProcessSuperMapping() ) {
@ -5490,11 +5492,11 @@ public abstract class AbstractEntityPersister
else {
prepareMappingModel( creationProcess, bootEntityDescriptor );
}
rootEntityDescriptor = superMappingType.getRootEntityDescriptor();
// rootEntityDescriptor = superMappingType.getRootEntityDescriptor();
}
else {
prepareMappingModel( creationProcess, bootEntityDescriptor );
rootEntityDescriptor = this;
// rootEntityDescriptor = this;
}
final EntityMetamodel currentEntityMetamodel = this.getEntityMetamodel();

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

@ -668,7 +668,10 @@ public interface EntityPersister
/**
* Get the user-visible metadata for the class (optional operation)
*
* @deprecated This operation is no longer called by Hibernate.
*/
@Deprecated(since = "6.0")
ClassMetadata getClassMetadata();
/**