add forRemoval = true to some @deprecated tags

gavinking · gavinking · commit 7e9ff01ab3a5 · 2025-01-05T20:46:40.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
@@ -23,6 +23,6 @@
  *             {@link org.hibernate.metamodel.RuntimeMetamodels},
  *             or {@link MappingContext} to access such information
  */
-@Deprecated(since = "6.0")
+@Deprecated(since = "6.0", forRemoval = true)
 public interface Mapping extends MappingContext {
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
@@ -381,7 +381,7 @@ public void setFetchMode(FetchMode fetchMode) {
 	/**
 	 * @deprecated use {@link #validate(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public void validate(Mapping mapping) throws MappingException {
 		validate( (MappingContext) mapping);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java
@@ -284,7 +284,7 @@ public boolean equals(Column column) {
 	/**
 	 * @deprecated use {@link #getSqlTypeCode(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public int getSqlTypeCode(Mapping mapping) throws MappingException{
 		return getSqlTypeCode((MappingContext) mapping);
 	}
@@ -425,7 +425,7 @@ public String getSqlType(Metadata mapping) {
 	/**
 	 * @deprecated use {@link #getSqlType(Metadata)}
 	 */
-	@Deprecated(since = "6.2")
+	@Deprecated(since = "6.2", forRemoval = true)
 	public String getSqlType(TypeConfiguration typeConfiguration, Dialect dialect, Mapping mapping) {
 		return getSqlTypeName( typeConfiguration, dialect, mapping );
 	}
@@ -463,7 +463,7 @@ public int getDecimalDigits() {
 	/**
 	 * @deprecated use {@link #getColumnSize(Dialect, MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public Size getColumnSize(Dialect dialect, Mapping mapping) {
 		return getColumnSize(dialect, (MappingContext) mapping);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java
@@ -66,6 +66,7 @@ void createPrimaryKey() {
 		// create an index on the key columns??
 	}
 
+	@Deprecated(forRemoval = true)
 	public void validate(Mapping mapping) throws MappingException {
 		validate( (MappingContext) mapping);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java
@@ -96,7 +96,7 @@ void createPrimaryKey() {
 //		}
 	}
 
-	@Deprecated
+	@Deprecated(forRemoval = true)
 	public void validate(Mapping mapping) throws MappingException {
 		validate( (MappingContext) mapping);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
@@ -279,7 +279,7 @@ public void setMetaAttributes(Map<String, MetaAttribute> metas) {
 	/**
 	 * @deprecated use {@link #isValid(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public boolean isValid(Mapping mapping) throws MappingException {
 		return isValid( (MappingContext) mapping);
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
@@ -48,6 +48,7 @@ public Set copy() {
 		return new Set( this );
 	}
 
+	@Deprecated(forRemoval = true)
 	public void validate(Mapping mapping) throws MappingException {
 		validate( (MappingContext) mapping );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java
@@ -75,7 +75,7 @@ default List<Column> getConstraintColumns() {
 	/**
 	 * @deprecated use {@link #getSelectableType(MappingContext, int)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	default JdbcMapping getSelectableType(Mapping factory, int index) throws MappingException {
 		return getSelectableType( (MappingContext) factory, index );
 	}
@@ -146,7 +146,7 @@ private Type getIdType(EntityType entityType) {
 	/**
 	 * @deprecated use {@link #isValid(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	default boolean isValid(Mapping mapping) throws MappingException{
 		return isValid( (MappingContext) mapping );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
@@ -575,7 +575,7 @@ public boolean isLogicalOneToOne() {
 	 * @return The identifier type
 	 * @deprecated use {@link #getIdentifierType(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	Type getIdentifierType(final Mapping factory) {
 		return getIdentifierType( (MappingContext) factory );
 	}
@@ -625,7 +625,7 @@ Type getIdentifierType(final SharedSessionContractImplementor session) {
 	 * or unique key property name.
 	 * @deprecated use {@link  #getIdentifierOrUniqueKeyType(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public final Type getIdentifierOrUniqueKeyType(Mapping factory) throws MappingException {
 		return getIdentifierOrUniqueKeyType( (MappingContext) factory );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java
@@ -123,7 +123,7 @@ public String toXMLString(Object value, SessionFactoryImplementor factory) throw
 	/**
 	 * @deprecated use {@link #fromXMLString(String, MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	public Object fromXMLString(String xml, Mapping factory) throws HibernateException {
 		return fromXMLString( xml, (MappingContext) factory );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/Type.java b/hibernate-core/src/main/java/org/hibernate/type/Type.java
@@ -103,7 +103,7 @@ public interface Type extends Serializable {
 	 * @throws MappingException Generally indicates an issue accessing the passed mapping object.
 	 * @deprecated use {@link  #getColumnSpan(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	default int getColumnSpan(Mapping mapping) throws MappingException{
 		return getColumnSpan( (MappingContext) mapping);
 	}
@@ -134,7 +134,7 @@ default int getColumnSpan(Mapping mapping) throws MappingException{
 	 * @throws MappingException Generally indicates an issue accessing the passed mapping object.
 	 * @deprecated use {@link #getSqlTypeCodes(MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	default int[] getSqlTypeCodes(Mapping mapping) throws MappingException{
 		return getSqlTypeCodes((MappingContext) mapping);
 	}
@@ -544,7 +544,7 @@ String toLoggableString(@Nullable Object value, SessionFactoryImplementor factor
 	 * @return array indicating column nullness for a value instance
 	 * @deprecated use {@link #toColumnNullness(Object, MappingContext)}
 	 */
-	@Deprecated(since = "7.0")
+	@Deprecated(since = "7.0", forRemoval = true)
 	default boolean[] toColumnNullness(@Nullable Object value, Mapping mapping){
 		return toColumnNullness( value,(MappingContext) mapping);
 	}

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`* {@link org.hibernate.metamodel.RuntimeMetamodels},`
`24`	`24`	`* or {@link MappingContext} to access such information`
`25`	`25`	`*/`
`26`		`-@Deprecated(since = "6.0")`
	`26`	`+@Deprecated(since = "6.0", forRemoval = true)`
`27`	`27`	`public interface Mapping extends MappingContext {`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ public void setFetchMode(FetchMode fetchMode) {`
`381`	`381`	`/**`
`382`	`382`	`* @deprecated use {@link #validate(MappingContext)}`
`383`	`383`	`*/`
`384`		`- @Deprecated(since = "7.0")`
	`384`	`+ @Deprecated(since = "7.0", forRemoval = true)`
`385`	`385`	`public void validate(Mapping mapping) throws MappingException {`
`386`	`386`	`validate( (MappingContext) mapping);`
`387`	`387`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ void createPrimaryKey() {`
`66`	`66`	`// create an index on the key columns??`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ @Deprecated(forRemoval = true)`
`69`	`70`	`public void validate(Mapping mapping) throws MappingException {`
`70`	`71`	`validate( (MappingContext) mapping);`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void createPrimaryKey() {`
`96`	`96`	`// }`
`97`	`97`	`}`
`98`	`98`
`99`		`- @Deprecated`
	`99`	`+ @Deprecated(forRemoval = true)`
`100`	`100`	`public void validate(Mapping mapping) throws MappingException {`
`101`	`101`	`validate( (MappingContext) mapping);`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public void setMetaAttributes(Map<String, MetaAttribute> metas) {`
`279`	`279`	`/**`
`280`	`280`	`* @deprecated use {@link #isValid(MappingContext)}`
`281`	`281`	`*/`
`282`		`- @Deprecated(since = "7.0")`
	`282`	`+ @Deprecated(since = "7.0", forRemoval = true)`
`283`	`283`	`public boolean isValid(Mapping mapping) throws MappingException {`
`284`	`284`	`return isValid( (MappingContext) mapping);`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public Set copy() {`
`48`	`48`	`return new Set( this );`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ @Deprecated(forRemoval = true)`
`51`	`52`	`public void validate(Mapping mapping) throws MappingException {`
`52`	`53`	`validate( (MappingContext) mapping );`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public String toXMLString(Object value, SessionFactoryImplementor factory) throw`
`123`	`123`	`/**`
`124`	`124`	`* @deprecated use {@link #fromXMLString(String, MappingContext)}`
`125`	`125`	`*/`
`126`		`- @Deprecated(since = "7.0")`
	`126`	`+ @Deprecated(since = "7.0", forRemoval = true)`
`127`	`127`	`public Object fromXMLString(String xml, Mapping factory) throws HibernateException {`
`128`	`128`	`return fromXMLString( xml, (MappingContext) factory );`
`129`	`129`	`}`