HHH-19021 completely remove Mapping

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java

@@ -21,7 +21,6 @@
 import org.hibernate.collection.internal.CustomCollectionTypeSemantics;
 import org.hibernate.collection.spi.CollectionSemantics;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.internal.FilterConfiguration;
 import org.hibernate.internal.util.PropertiesHelper;
 import org.hibernate.internal.util.StringHelper;
@@ -378,14 +377,6 @@ public void setFetchMode(FetchMode fetchMode) {
 		this.fetchMode = fetchMode;
 	}
 
-	/**
-	 * @deprecated use {@link #validate(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	public void validate(Mapping mapping) throws MappingException {
-		validate( (MappingContext) mapping);
-	}
-
 	public void validate(MappingContext mappingContext) throws MappingException {
 		assert getKey() != null : "Collection key not bound : " + getRole();
 		assert getElement() != null : "Collection element not bound : " + getRole();

hibernate-core/src/main/java/org/hibernate/mapping/Collection.java

@@ -19,7 +19,6 @@
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.Size;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.loader.internal.AliasConstantsHelper;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -281,14 +280,6 @@ public boolean equals(Column column) {
 				: name.equalsIgnoreCase( column.name ) );
 	}
 
-	/**
-	 * @deprecated use {@link #getSqlTypeCode(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	public int getSqlTypeCode(Mapping mapping) throws MappingException{
-		return getSqlTypeCode((MappingContext) mapping);
-	}
-
 	public int getSqlTypeCode(MappingContext mapping) throws MappingException {
 		if ( sqlTypeCode == null ) {
 			final Type type = getValue().getType();
@@ -422,14 +413,6 @@ public String getSqlType(Metadata mapping) {
 		return getSqlTypeName( database.getTypeConfiguration(), database.getDialect(), mapping );
 	}
 
-	/**
-	 * @deprecated use {@link #getSqlType(Metadata)}
-	 */
-	@Deprecated(since = "6.2", forRemoval = true)
-	public String getSqlType(TypeConfiguration typeConfiguration, Dialect dialect, Mapping mapping) {
-		return getSqlTypeName( typeConfiguration, dialect, mapping );
-	}
-
 	@Override
 	public String getTypeName() {
 		return sqlTypeName;
@@ -460,14 +443,6 @@ public int getDecimalDigits() {
 		return scale == null ? 0 : scale;
 	}
 
-	/**
-	 * @deprecated use {@link #getColumnSize(Dialect, MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	public Size getColumnSize(Dialect dialect, Mapping mapping) {
-		return getColumnSize(dialect, (MappingContext) mapping);
-	}
-
 	public Size getColumnSize(Dialect dialect, MappingContext mappingContext) {
 		if ( columnSize == null ) {
 			columnSize = calculateColumnSize( dialect, mappingContext );

hibernate-core/src/main/java/org/hibernate/mapping/Column.java

@@ -8,7 +8,6 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.type.MappingContext;
 import org.hibernate.usertype.UserCollectionType;
@@ -66,11 +65,6 @@ void createPrimaryKey() {
 		// create an index on the key columns??
 	}
 
-	@Deprecated(forRemoval = true)
-	public void validate(Mapping mapping) throws MappingException {
-		validate( (MappingContext) mapping);
-	}
-
 	public void validate(MappingContext mappingContext) throws MappingException {
 		super.validate( mappingContext );
 

hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java

@@ -8,7 +8,6 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.type.MappingContext;
 import org.hibernate.usertype.UserCollectionType;
@@ -96,11 +95,6 @@ void createPrimaryKey() {
 //		}
 	}
 
-	@Deprecated(forRemoval = true)
-	public void validate(Mapping mapping) throws MappingException {
-		validate( (MappingContext) mapping);
-	}
-
 	public void validate(MappingContext mappingContext) throws MappingException {
 		super.validate( mappingContext );
 

hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java

@@ -18,7 +18,6 @@
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.CascadeStyle;
 import org.hibernate.engine.spi.CascadeStyles;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.jpa.event.spi.CallbackDefinition;
 import org.hibernate.metamodel.RepresentationMode;
 import org.hibernate.metamodel.spi.RuntimeModelCreationContext;
@@ -276,14 +275,6 @@ public void setMetaAttributes(Map<String, MetaAttribute> metas) {
 		this.metaAttributes = metas;
 	}
 
-	/**
-	 * @deprecated use {@link #isValid(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	public boolean isValid(Mapping mapping) throws MappingException {
-		return isValid( (MappingContext) mapping);
-	}
-
 	public boolean isValid(MappingContext mappingContext) throws MappingException {
 		final Value value = getValue();
 		if ( value instanceof BasicValue basicValue && basicValue.isDisallowedWrapperArray() ) {

hibernate-core/src/main/java/org/hibernate/mapping/Property.java

@@ -8,7 +8,6 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.type.CollectionType;
 import org.hibernate.type.OrderedSetType;
@@ -48,11 +47,6 @@ public Set copy() {
 		return new Set( this );
 	}
 
-	@Deprecated(forRemoval = true)
-	public void validate(Mapping mapping) throws MappingException {
-		validate( (MappingContext) mapping );
-	}
-
 	public void validate(MappingContext mappingContext) throws MappingException {
 		super.validate( mappingContext );
 		//for backward compatibility, disable this:

hibernate-core/src/main/java/org/hibernate/mapping/Set.java

@@ -13,7 +13,6 @@
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.CompositeType;
@@ -72,14 +71,6 @@ default List<Column> getConstraintColumns() {
 
 	Type getType() throws MappingException;
 
-	/**
-	 * @deprecated use {@link #getSelectableType(MappingContext, int)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	default JdbcMapping getSelectableType(Mapping factory, int index) throws MappingException {
-		return getSelectableType( (MappingContext) factory, index );
-	}
-
 	@Incubating
 	default JdbcMapping getSelectableType(MappingContext mappingContext, int index) throws MappingException {
 		return getType( mappingContext, getType(), index );
@@ -143,14 +134,6 @@ private Type getIdType(EntityType entityType) {
 
 	boolean isSimpleValue();
 
-	/**
-	 * @deprecated use {@link #isValid(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	default boolean isValid(Mapping mapping) throws MappingException{
-		return isValid( (MappingContext) mapping );
-	}
-
 	boolean isValid(MappingContext mappingContext) throws MappingException;
 
 	void setTypeUsingReflection(String className, String propertyName) throws MappingException;

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

@@ -8,7 +8,6 @@
 import java.util.List;
 
 import org.hibernate.dialect.Dialect;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.Value;
@@ -55,34 +54,6 @@ private static void resolveJdbcMappings(List<JdbcMapping> jdbcMappings, MappingC
 		}
 	}
 
-	/**
-	 * @deprecated use {@link #from(String, Value, int[], MappingContext, TypeConfiguration, boolean[], boolean[], Dialect, SqmFunctionRegistry, RuntimeModelCreationContext)}
-	 */
-	@Deprecated(since = "7.0")
-	public static SelectableMappings from(
-			String containingTableExpression,
-			Value value,
-			int[] propertyOrder,
-			Mapping mapping,
-			TypeConfiguration typeConfiguration,
-			boolean[] insertable,
-			boolean[] updateable,
-			Dialect dialect,
-			SqmFunctionRegistry sqmFunctionRegistry,
-			RuntimeModelCreationContext creationContext) {
-		return from(
-				containingTableExpression,
-				value, propertyOrder,
-				(MappingContext) mapping,
-				typeConfiguration,
-				insertable,
-				updateable,
-				dialect,
-				sqmFunctionRegistry,
-				creationContext
-		);
-	}
-
 	public static SelectableMappings from(
 			String containingTableExpression,
 			Value value,

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SelectableMappingsImpl.java

@@ -13,7 +13,6 @@
 import org.hibernate.MappingException;
 import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
 import org.hibernate.engine.spi.EntityUniqueKey;
-import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -567,19 +566,6 @@ public boolean isLogicalOneToOne() {
 		return isOneToOne();
 	}
 
-	/**
-	 * Convenience method to locate the identifier type of the associated entity.
-	 *
-	 * @param factory The mappings...
-	 *
-	 * @return The identifier type
-	 * @deprecated use {@link #getIdentifierType(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	Type getIdentifierType(final Mapping factory) {
-		return getIdentifierType( (MappingContext) factory );
-	}
-
 	Type getIdentifierType(final MappingContext mappingContext) {
 		final Type type = associatedIdentifierType;
 		//The following branch implements a simple lazy-initialization, but rather than the canonical
@@ -612,24 +598,6 @@ Type getIdentifierType(final SharedSessionContractImplementor session) {
 		}
 	}
 
-	/**
-	 * Determine the type of either (1) the identifier if we reference the
-	 * associated entity's PK or (2) the unique key to which we refer (i.e.
-	 * the property-ref).
-	 *
-	 * @param factory The mappings...
-	 *
-	 * @return The appropriate type.
-	 *
-	 * @throws MappingException Generally, if unable to resolve the associated entity name
-	 * or unique key property name.
-	 * @deprecated use {@link  #getIdentifierOrUniqueKeyType(MappingContext)}
-	 */
-	@Deprecated(since = "7.0", forRemoval = true)
-	public final Type getIdentifierOrUniqueKeyType(Mapping factory) throws MappingException {
-		return getIdentifierOrUniqueKeyType( (MappingContext) factory );
-	}
-
 	/**
 	 * Determine the type of either:
 	 * <ol>
@@ -657,24 +625,6 @@ public final Type getIdentifierOrUniqueKeyType(MappingContext mappingContext) th
 		}
 	}
 
-	/**
-	 * The name of the property on the associated entity to which our FK
-	 * refers
-	 *
-	 * @param factory The mappings...
-	 *
-	 * @return The appropriate property name.
-	 *
-	 * @throws MappingException Generally, if unable to resolve the associated entity name
-	 *
-	 * @deprecated No longer used
-	 */
-	@Deprecated(since = "7", forRemoval = true)
-	public final String getIdentifierOrUniqueKeyPropertyName(Mapping factory)
-			throws MappingException {
-		return getIdentifierOrUniqueKeyPropertyName( (MappingContext) factory);
-	}
-
 	/**
 	 * The name of the property on the associated entity to which our FK
 	 * refers