diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java index 9a1bbdd654..728bd5d707 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java @@ -103,6 +103,6 @@ public @interface Cache { * * @deprecated Use {@link #includeLazy()} for the sake of typesafety. */ - @Deprecated + @Deprecated(since="6.4") String include() default "all"; } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java index e58595bd8d..05b61984e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java @@ -99,7 +99,7 @@ public final class QueryHints { * Use {@link org.hibernate.procedure.ProcedureCall} or * {@link jakarta.persistence.StoredProcedureQuery} instead. */ - @Deprecated + @Deprecated(since="6") public static final String CALLABLE_FUNCTION = HibernateHints.HINT_CALLABLE_FUNCTION; /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java index beeca79507..4a0f92cbc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java @@ -37,6 +37,6 @@ public interface ScanOptions { * @deprecated With move to unified schema, this setting is now deprecated and will * be removed once support for reading {@code hbm.xml} files is fully removed. */ - @Deprecated + @Deprecated(since="5") boolean canDetectHibernateMappingFiles(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java index 51df5ccc86..d298c70b8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java @@ -69,7 +69,6 @@ import org.hibernate.cfg.MappingSettings; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.TimeZoneSupport; import org.hibernate.engine.config.spi.ConfigurationService; -import org.hibernate.engine.config.spi.StandardConverters; import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.internal.CoreLogging; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java index cc9a9d7115..476eef6251 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java @@ -140,14 +140,6 @@ public class AnnotatedColumns { this.table = table; } - /** - * @deprecated Use {@link #setTable(Table)} instead - */ - @Deprecated - void setTableInternal(Table table) { - this.table = table; - } - public void addColumn(AnnotatedColumn child) { columns.add( child ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java index 3793de0a98..63529b699d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java @@ -8,7 +8,6 @@ package org.hibernate.boot.model.relational; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; /** * A context provided to methods responsible for generating SQL strings on startup. @@ -21,16 +20,6 @@ public interface SqlStringGenerationContext { */ Dialect getDialect(); - /** - * @return The helper for dealing with identifiers in the current JDBC environment. - *

- * Note that the Identifiers returned from this helper already account for auto-quoting. - * - * @deprecated Use {@link #toIdentifier(String)} instead. - */ - @Deprecated - IdentifierHelper getIdentifierHelper(); - /** * Generate an Identifier instance from its simple name as obtained from mapping * information. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java index dd98a6fec8..cdf07bc4e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java @@ -138,11 +138,6 @@ public class SqlStringGenerationContextImpl return dialect; } - @Override - public IdentifierHelper getIdentifierHelper() { - return identifierHelper; - } - @Override public Identifier toIdentifier(String text) { return identifierHelper != null ? identifierHelper.toIdentifier( text ) : Identifier.toIdentifier( text ); diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java index 10fa9213ed..9f57e04996 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java @@ -17,28 +17,14 @@ import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.bytecode.spi.BytecodeProvider; import org.hibernate.service.spi.ServiceRegistryImplementor; -import static org.hibernate.internal.util.NullnessUtil.castNonNull; - public final class BytecodeProviderInitiator implements StandardServiceInitiator { /** * @deprecated Register a {@link BytecodeProvider} through Java {@linkplain java.util.ServiceLoader services}. */ - @Deprecated( forRemoval = true ) + @Deprecated( forRemoval = true, since = "6.2" ) public static final String BYTECODE_PROVIDER_NAME_BYTEBUDDY = "bytebuddy"; - /** - * @deprecated Register a {@link BytecodeProvider} through Java {@linkplain java.util.ServiceLoader services}. - */ - @Deprecated( forRemoval = true ) - public static final String BYTECODE_PROVIDER_NAME_NONE = "none"; - - /** - * @deprecated Deprecated with no replacement - */ - @Deprecated( forRemoval = true ) - public static final String BYTECODE_PROVIDER_NAME_DEFAULT = BYTECODE_PROVIDER_NAME_BYTEBUDDY; - /** * Singleton access */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java index e17689eb0f..77b039ac0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java @@ -13,6 +13,6 @@ package org.hibernate.cache; * * @deprecated Moved, but still need this definition for ehcache */ -@Deprecated +@Deprecated(since="4") public interface RegionFactory extends org.hibernate.cache.spi.RegionFactory { } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index c3c40ef5f8..3ea03b1280 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -61,14 +61,14 @@ public interface AvailableSettings /** * @deprecated Use {@link #JAKARTA_LOCK_SCOPE} instead */ - @Deprecated + @Deprecated(since="6.3") @SuppressWarnings("DeprecatedIsStillUsed") String JPA_LOCK_SCOPE = LegacySpecHints.HINT_JAVAEE_LOCK_SCOPE; /** * @deprecated Use {@link #JAKARTA_LOCK_TIMEOUT} instead */ - @Deprecated + @Deprecated(since="6.3") @SuppressWarnings("DeprecatedIsStillUsed") String JPA_LOCK_TIMEOUT = LegacySpecHints.HINT_JAVAEE_LOCK_TIMEOUT; @@ -137,7 +137,7 @@ public interface AvailableSettings * * @since 5.2 */ - @Deprecated(forRemoval = true) + @Deprecated(since="6.6", forRemoval = true) String ALLOW_REFRESH_DETACHED_ENTITY = "hibernate.allow_refresh_detached_entity"; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java index b46922803c..92f5dd6719 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java @@ -68,6 +68,6 @@ public interface BatchSettings { /** * @deprecated Use {@link #BUILDER} instead */ - @Deprecated + @Deprecated(since="6.4") String BATCH_STRATEGY = "hibernate.jdbc.factory_class"; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 2139373c8b..a9cae9178e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -852,7 +852,7 @@ public abstract class Dialect implements ConversionContext, TypeContributor, Fun * @return a SQL expression that will occur in a {@code check} constraint * @deprecated use {@link #getCheckCondition(String, Long[])} instead */ - @Deprecated(forRemoval = true) + @Deprecated(since="6.5", forRemoval = true) public String getCheckCondition(String columnName, long[] values) { Long[] boxedValues = new Long[values.length]; for ( int i = 0; i extends Serializable { return (T) value; } - /** - * Creates the {@link JavaType} for the given {@link ParameterizedType} - * based on this {@link JavaType} registered for the raw type. - * - * @deprecated Use {@link #createJavaType(ParameterizedType, TypeConfiguration)} instead - */ - @Deprecated(since = "6.1") - default JavaType createJavaType(ParameterizedType parameterizedType) { - return this; - } - /** * Creates the {@link JavaType} for the given {@link ParameterizedType} * based on this {@link JavaType} registered for the raw type. @@ -337,10 +326,8 @@ public interface JavaType extends Serializable { * @since 6.1 */ @Incubating - default JavaType createJavaType( - ParameterizedType parameterizedType, - TypeConfiguration typeConfiguration) { - return createJavaType( parameterizedType ); + default JavaType createJavaType(ParameterizedType parameterizedType, TypeConfiguration typeConfiguration) { + return this; } /** diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java index 7b62d7ee1e..c1d22c9e3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java @@ -14,7 +14,7 @@ import org.hibernate.type.SqlTypes; * @deprecated Use {@link TimestampUtcAsJdbcTimestampJdbcType} * @author Christian Beikov */ -@Deprecated(forRemoval = true) +@Deprecated(since="6.4", forRemoval = true) public class InstantAsTimestampJdbcType extends TimestampUtcAsJdbcTimestampJdbcType { public static final InstantAsTimestampJdbcType INSTANCE = new InstantAsTimestampJdbcType(); } diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java index ef6791ae08..d3b39d891f 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java @@ -14,7 +14,7 @@ import org.hibernate.type.SqlTypes; * @deprecated Use {@link TimestampUtcAsOffsetDateTimeJdbcType} * @author Christian Beikov */ -@Deprecated(forRemoval = true) +@Deprecated(since="6.4", forRemoval = true) public class InstantAsTimestampWithTimeZoneJdbcType extends TimestampUtcAsOffsetDateTimeJdbcType { public static final InstantAsTimestampWithTimeZoneJdbcType INSTANCE = new InstantAsTimestampWithTimeZoneJdbcType(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java index 9a32b9dfe7..ef0cfc2684 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java @@ -23,7 +23,6 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.QueryTimeoutException; import org.hibernate.dialect.unique.AlterTableUniqueDelegate; -import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; import org.hibernate.exception.LockAcquisitionException; import org.hibernate.exception.spi.SQLExceptionConversionDelegate; import org.hibernate.mapping.Table; @@ -160,11 +159,6 @@ public class PostgreSQLDialectTestCase extends BaseUnitTestCase { return null; } - @Override - public IdentifierHelper getIdentifierHelper() { - return null; - } - @Override public Identifier toIdentifier(String text) { return null;