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 index a3e14d6bef25..96d2a42af1d0 100644 --- 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 index deabdbd9587b..d8fc57e5d2fc 100644 --- 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 index 6d75ebfdf843..d76b1d0fbe78 100644 --- 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 index 500e646b963e..6400141ad318 100644 --- 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 index 1523c28f2ca8..d5762b53fcef 100644 --- 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 index 86af377bf737..5cb6139f6e5e 100644 --- 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 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 index e2377d786343..ba55206f6e82 100644 --- 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 index 9ab6200ddd81..e4ffa5cb9deb 100644 --- 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 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 index ec574dd5dbbc..b91cda6ec61a 100644 --- 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 index 763b96c758bd..93ee26c4b3a3 100644 --- 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 index 8800c70799aa..da6aa6f73ec3 100644 --- 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); }