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

remove more obsolete things annotated @Remove 

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-08-29 00:45:35 +02:00
parent 8eb4d8da0d
commit 9e745b4e79
12 changed files with 8 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/Comment.java
View File

@ -58,7 +58,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Target({METHOD, FIELD, TYPE})
@Retention(RUNTIME)
@Repeatable(Comments.class)
@Deprecated
@Deprecated(since="7")
@Remove
public @interface Comment {
/**

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

@ -33,7 +33,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@AttributeBinderType(binder = CommentsBinder.class)
@Target({METHOD, FIELD, TYPE})
@Retention(RUNTIME)
@Deprecated
@Deprecated(since="7")
@Remove
public @interface Comments {
Comment[] value();

1
hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java
View File

@ -13,7 +13,6 @@ import java.lang.annotation.Target;
import jakarta.persistence.CacheRetrieveMode;
import jakarta.persistence.CacheStoreMode;
import org.hibernate.CacheMode;
import org.hibernate.Remove;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.TYPE;

6
hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java
View File

@ -11,7 +11,6 @@ import java.util.List;
import java.util.Set;
import org.hibernate.MappingException;
import org.hibernate.Remove;
import org.hibernate.boot.Metadata;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.internal.CoreLogging;
@ -29,11 +28,6 @@ import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
public class RootClass extends PersistentClass implements TableOwner, SoftDeletable {
private static final CoreMessageLogger LOG = CoreLogging.messageLogger( RootClass.class );
@Deprecated(since = "6.2") @Remove
public static final String DEFAULT_IDENTIFIER_COLUMN_NAME = "id";
@Deprecated(since = "6.2") @Remove
public static final String DEFAULT_DISCRIMINATOR_COLUMN_NAME = "class";
private Property identifierProperty;
private KeyValue identifier;
private Property version;

15
hibernate-core/src/main/java/org/hibernate/mapping/Table.java
View File

@ -17,11 +17,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import org.hibernate.HibernateException;
import org.hibernate.Internal;
import org.hibernate.MappingException;
import org.hibernate.Remove;
import org.hibernate.boot.Metadata;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.ImplicitUniqueKeyNameSource;
import org.hibernate.boot.model.relational.ContributableDatabaseObject;
@ -32,9 +29,7 @@ import org.hibernate.boot.model.relational.SqlStringGenerationContext;
import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.dialect.Dialect;
import org.hibernate.tool.schema.extract.spi.TableInformation;
import org.hibernate.tool.schema.internal.StandardTableMigrator;
import org.jboss.logging.Logger;
import static java.util.Collections.emptyList;
@ -440,16 +435,6 @@ public class Table implements Serializable, ContributableDatabaseObject {
}
}
@Deprecated(since = "6.2") @Remove
public Iterator<String> sqlAlterStrings(
Dialect dialect,
Metadata metadata,
TableInformation tableInfo,
SqlStringGenerationContext sqlStringGenerationContext) throws HibernateException {
return StandardTableMigrator.sqlAlterStrings(this, dialect, metadata, tableInfo, sqlStringGenerationContext )
.iterator();
}
public boolean isPrimaryKey(Column column) {
return hasPrimaryKey()
&& getPrimaryKey().getColumnSpan() == 1

9
hibernate-core/src/main/java/org/hibernate/query/Query.java
View File

@ -355,11 +355,10 @@ public interface Query<R> extends SelectionQuery<R>, MutationQuery, TypedQuery<R
* Apply the given {@linkplain LockOptions lock options} to this
* query. Alias-specific lock modes in the given lock options are
* merged with any alias-specific lock mode which have already been
* {@linkplain #setAliasSpecificLockMode(String, LockMode) set}. If
* a lock mode has already been specified for an alias that is among
* the aliases in the given lock options, the lock mode specified in
* the given lock options overrides the lock mode that was already
* set.
* {@linkplain #setLockMode(String, LockMode) set}. If a lock mode
* has already been specified for an alias that is among the aliases
* in the given lock options, the lock mode specified in the given
* lock options overrides the lock mode that was already set.
*
* @param lockOptions The lock options to apply to the query.
*

9
hibernate-core/src/main/java/org/hibernate/query/SelectionQuery.java
View File

@ -24,7 +24,6 @@ import org.hibernate.Incubating;
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.NonUniqueResultException;
import org.hibernate.Remove;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.Session;
@ -588,14 +587,6 @@ public interface SelectionQuery<R> extends CommonQueryContract {
@Incubating
SelectionQuery<R> setOrder(Order<? super R> order);
/**
* Specify a {@link LockMode} to apply to a specific alias defined in the query
*
* @deprecated use {@link #setLockMode(String, LockMode)}
*/
@Deprecated(since = "6.2") @Remove
SelectionQuery<R> setAliasSpecificLockMode(String alias, LockMode lockMode);
/**
* Specifies whether follow-on locking should be applied
*/

11
hibernate-core/src/main/java/org/hibernate/query/spi/AbstractSelectionQuery.java
View File

@ -429,17 +429,6 @@ public abstract class AbstractSelectionQuery<R>
return this;
}
/**
* Specify a LockMode to apply to a specific alias defined in the query
*
* @deprecated use {{@link #setLockMode(String, LockMode)}}
*/
@Override @Deprecated
public SelectionQuery<R> setAliasSpecificLockMode(String alias, LockMode lockMode) {
getLockOptions().setAliasSpecificLockMode( alias, lockMode );
return this;
}
/**
* Specifies whether follow-on locking should be applied?
*/

11
hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmSelectionQueryImpl.java
View File

@ -435,17 +435,6 @@ public class SqmSelectionQueryImpl<R> extends AbstractSqmSelectionQuery<R>
return this;
}
/**
* Specify a {@link LockMode} to apply to a specific alias defined in the query
*
* @deprecated use {{@link #setLockMode(String, LockMode)}}
*/
@Override @Deprecated
public SqmSelectionQuery<R> setAliasSpecificLockMode(String alias, LockMode lockMode) {
super.setAliasSpecificLockMode( alias, lockMode );
return this;
}
/**
* Specify a {@link LockMode} to apply to a specific alias defined in the query
*/

9
hibernate-core/src/main/java/org/hibernate/query/sqm/spi/DelegatingSqmSelectionQueryImplementor.java
View File

@ -20,7 +20,6 @@ import org.hibernate.FlushMode;
import org.hibernate.Incubating;
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.Remove;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
import org.hibernate.graph.GraphSemantic;
@ -298,14 +297,6 @@ public abstract class DelegatingSqmSelectionQueryImplementor<R> implements SqmSe
return this;
}
@Override
@Remove
@Deprecated(since = "6.2")
public SqmSelectionQueryImplementor<R> setAliasSpecificLockMode(String alias, LockMode lockMode) {
getDelegate().setAliasSpecificLockMode( alias, lockMode );
return this;
}
@Override
public SqmSelectionQueryImplementor<R> setFollowOnLocking(boolean enable) {
getDelegate().setFollowOnLocking( enable );

7
hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
View File

@ -18,14 +18,12 @@ import org.hibernate.FetchMode;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
import org.hibernate.PropertyNotFoundException;
import org.hibernate.Remove;
import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
import org.hibernate.engine.spi.CascadeStyle;
import org.hibernate.engine.spi.CascadeStyles;
import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.generator.Generator;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.mapping.Component;
@ -458,11 +456,6 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
return propertyTypes;
}
@Deprecated(since = "6.2") @Remove
public Generator[] getPropertyValueGenerationStrategies() {
return null;
}
@Override
public String getName() {
return "component" + ArrayHelper.toString( propertyNames );

3
hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateSchemaNameTest.java
View File

@ -20,6 +20,7 @@ import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.tool.schema.internal.StandardTableMigrator;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@ -29,7 +30,7 @@ import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.util.ServiceRegistryUtil;
/**
* Test to illustrate that the {@link org.hibernate.mapping.Table#sqlAlterStrings} method
* Test to illustrate that the {@link StandardTableMigrator#sqlAlterStrings} method
* uses legacy logic for building table names and doesn't adequately specify the catalog
* or schema name properly.
*