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

add since to some @Deprecated operations and delete a couple 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-08-29 19:07:21 +02:00
parent b53728f727
commit f1d7d86c2d
20 changed files with 19 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/annotations/Cache.java
View File

@ -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";
}

2
hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java
View File

@ -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;
/**

2
hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ScanOptions.java
View File

@ -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();
}

1
hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java
View File

@ -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;

8
hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumns.java
View File

@ -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 );
}

11
hibernate-core/src/main/java/org/hibernate/boot/model/relational/SqlStringGenerationContext.java
View File

@ -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.
* <p>
* 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.

5
hibernate-core/src/main/java/org/hibernate/boot/model/relational/internal/SqlStringGenerationContextImpl.java
View File

@ -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 );

16
hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeProviderInitiator.java
View File

@ -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<BytecodeProvider> {
/**
* @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
*/

2
hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java vendored
View File

@ -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 {
}

6
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -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";
/**

2
hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java
View File

@ -68,6 +68,6 @@ public interface BatchSettings {
/**
* @deprecated Use {@link #BUILDER} instead
*/
@Deprecated
@Deprecated(since="6.4")
String BATCH_STRATEGY = "hibernate.jdbc.factory_class";
}

2
hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View File

@ -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<values.length; i++ ) {

4
hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View File

@ -204,7 +204,7 @@ public class MySQLDialect extends Dialect {
registerKeywords( info );
}
@Deprecated
@Deprecated(since="6.6")
protected static DatabaseVersion createVersion(DialectResolutionInfo info) {
return createVersion( info, MINIMUM_VERSION );
}
@ -443,7 +443,7 @@ public class MySQLDialect extends Dialect {
ddlTypeRegistry.addDescriptor( new NativeOrdinalEnumDdlTypeImpl( this ) );
}
@Deprecated
@Deprecated(since="6.4")
protected static int getCharacterSetBytesPerCharacter(DatabaseMetaData databaseMetaData) {
if ( databaseMetaData != null ) {
try (java.sql.Statement s = databaseMetaData.getConnection().createStatement() ) {

2
hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java
View File

@ -10,6 +10,6 @@ package org.hibernate.dialect.identity;
* @author Jan Schatteman
* @deprecated use {@code DB2zIdentityColumnSupport}
*/
@Deprecated
@Deprecated(since="6.4")
public class DB2390IdentityColumnSupport extends DB2zIdentityColumnSupport {
}

2
hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java
View File

@ -15,7 +15,7 @@ import org.hibernate.MappingException;
*
* @deprecated use {@code DB2SequenceSupport}
*/
@Deprecated
@Deprecated(since="6.4")
public class LegacyDB2SequenceSupport implements SequenceSupport {
public static final SequenceSupport INSTANCE = new LegacyDB2SequenceSupport();

2
hibernate-core/src/main/java/org/hibernate/query/NullPrecedence.java
View File

@ -19,7 +19,7 @@ import jakarta.persistence.criteria.Nulls;
*
* @deprecated Use Jakarta Persistence {@linkplain Nulls} instead.
*/
@Deprecated
@Deprecated(since="7")
public enum NullPrecedence {
/**
* Null precedence not specified. Relies on the RDBMS implementation.

17
hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JavaType.java
View File

@ -319,17 +319,6 @@ public interface JavaType<T> 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<T> 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<T> extends Serializable {
* @since 6.1
*/
@Incubating
default JavaType<T> createJavaType(
ParameterizedType parameterizedType,
TypeConfiguration typeConfiguration) {
return createJavaType( parameterizedType );
default JavaType<T> createJavaType(ParameterizedType parameterizedType, TypeConfiguration typeConfiguration) {
return this;
}
/**

2
hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampJdbcType.java
View File

@ -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();
}

2
hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/InstantAsTimestampWithTimeZoneJdbcType.java
View File

@ -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();
}

6
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
View File

@ -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;