From 163d48d81cc564c386ad320aaa5c9337ed67d5ee Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 24 Jul 2024 07:44:40 -0500 Subject: [PATCH] HHH-18199 - Remove @Where and @WhereJoinTable --- .../chapters/domain/soft_delete.adoc | 9 --- .../annotations/DialectOverride.java | 27 ------- .../java/org/hibernate/annotations/Where.java | 78 ------------------- .../hibernate/annotations/WhereJoinTable.java | 45 ----------- .../boot/model/internal/CollectionBinder.java | 30 +------ .../boot/model/internal/EntityBinder.java | 5 -- .../models/DialectOverrideAnnotations.java | 11 --- .../boot/models/HibernateAnnotations.java | 8 -- .../internal/OverriddenWhereAnnotation.java | 67 ---------------- .../internal/OverriddenWheresAnnotation.java | 54 ------------- .../annotations/internal/WhereAnnotation.java | 59 -------------- .../internal/WhereJoinTableAnnotation.java | 59 -------------- .../org/hibernate/cfg/MappingSettings.java | 2 +- .../metamodel/mapping/Restrictable.java | 2 +- .../metamodel/mapping/WhereRestrictable.java | 4 +- .../AbstractCollectionPersister.java | 2 +- .../hibernate/sql/CompleteRestriction.java | 2 +- .../java/org/hibernate/sql/SimpleSelect.java | 2 +- .../orm/test/annotations/entity/Forest.java | 4 +- .../orm/test/extralazy/Championship.java | 11 +-- .../hibernate/orm/test/extralazy/School.java | 13 ++-- .../hql/size/WhereClauseOrderBySizeTest.java | 29 ++++--- .../InsertOrderingSelfReferenceTest.java | 26 +++---- ...ereAnnotationAndJoinedInheritanceTest.java | 4 +- .../mapping/where/WhereFragmentTests.java | 3 - .../orm/test/mapping/where/package-info.java | 12 --- .../manytomany/sametable/Child1Entity.java | 8 +- .../manytomany/BasicWhereTest.java | 35 ++++----- .../integration/onetomany/BasicWhereTest.java | 36 ++++----- 29 files changed, 89 insertions(+), 558 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/annotations/Where.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWhereAnnotation.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWheresAnnotation.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereAnnotation.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereJoinTableAnnotation.java delete mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/package-info.java diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/soft_delete.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/soft_delete.adoc index 2ea421a8ae..fd256437e6 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/soft_delete.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/soft_delete.adoc @@ -8,15 +8,6 @@ An occasional requirement seen in the wild is to never physically remove rows fr instead perform a "soft delete" where a column is updated to indicate that the row is no longer active. Hibernate offers first-class support for this behavior through its `@SoftDelete` annotation. -[NOTE] -==== -The `@SoftDelete` annotation is new in 6.4. - -It was possible to hack together support for soft deletes in previous versions using a combination of filters, -`@Where` and custom delete event handling. However, that approach was tedious and did not work in -all cases. `@SoftDelete` should be highly preferred. -==== - Hibernate supports soft delete for both <> and <>. Soft delete support is defined by 3 main parts - diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java index fe27632a6d..0d2d886f8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DialectOverride.java @@ -263,33 +263,6 @@ public interface DialectOverride { JoinFormula[] value(); } - /** - * Specializes a {@link org.hibernate.annotations.Where} - * in a certain dialect. - * - * @deprecated Use {@link SQLRestriction} - */ - @Target({METHOD, FIELD, TYPE}) - @Retention(RUNTIME) - @Repeatable(Wheres.class) - @OverridesAnnotation(org.hibernate.annotations.Where.class) - @Deprecated(since = "6.3") - @interface Where { - /** - * The {@link Dialect} in which this override applies. - */ - Class dialect(); - Version before() default @Version(major = MAX_VALUE); - Version sameOrAfter() default @Version(major = MIN_VALUE); - - org.hibernate.annotations.Where override(); - } - @Target({METHOD, FIELD}) - @Retention(RUNTIME) - @interface Wheres { - Where[] value(); - } - /** * Specializes a {@link org.hibernate.annotations.SQLRestriction} * in a certain dialect. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Where.java b/hibernate-core/src/main/java/org/hibernate/annotations/Where.java deleted file mode 100644 index f798986252..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Where.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Specifies a restriction written in native SQL to add to the generated - * SQL for entities or collections. - *

- * For example, {@code @Where} could be used to hide entity instances which - * have been soft-deleted, either for the entity class itself: - * 

- * @Entity
- * @Where(clause = "status <> 'DELETED'")
- * class Document {
- *     ...
- *     @Enumerated(STRING)
- *     Status status;
- *     ...
- * }
- *
- *

- * or, at the level of an association to the entity: - * 

- * @OneToMany(mappedBy = "owner")
- * @Where(clause = "status <> 'DELETED'")
- * List<Document> documents;
- *
- *

- * The {@link WhereJoinTable} annotation lets a restriction be applied to - * an {@linkplain jakarta.persistence.JoinTable association table}: - * 

- * @ManyToMany
- * @JoinTable(name = "collaborations")
- * @Where(clause = "status <> 'DELETED'")
- * @WhereJoinTable(clause = "status = 'ACTIVE'")
- * List<Document> documents;
- *
- *

- * By default, {@code @Where} restrictions declared for an entity are also - * applied when loading associations of that entity type. This behavior can - * be disabled using the setting - * {@value org.hibernate.cfg.AvailableSettings#USE_ENTITY_WHERE_CLAUSE_FOR_COLLECTIONS}. - * However, this setting is now deprecated. - *

- * Note that {@code @Where} restrictions are always applied and cannot be - * disabled. Nor may they be parameterized. They're therefore much - * less flexible than {@linkplain Filter filters}. - * - * @see Filter - * @see DialectOverride.Where - * @see org.hibernate.cfg.AvailableSettings#USE_ENTITY_WHERE_CLAUSE_FOR_COLLECTIONS - * @see WhereJoinTable - * - * @author Emmanuel Bernard - * - * @deprecated Use {@link SQLRestriction} - */ -@Target({TYPE, METHOD, FIELD}) -@Retention(RUNTIME) -@Deprecated(since = "6.3") -public @interface Where { - /** - * A predicate, written in native SQL. - */ - String clause(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java b/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java deleted file mode 100644 index 312382890a..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Specifies a restriction written in native SQL to add to the generated SQL - * when querying the {@linkplain jakarta.persistence.JoinTable join table} - * of a collection. - *

- * For example, @WhereJoinTable("status <> 'DELETED'") - * could be used to hide associations which have been soft-deleted from an - * association table. - * - * @apiNote This separate annotation is useful because it's possible to filter - * a many-to-many association both by a restriction on the - * join table, and, simultaneously, by a restriction on the - * associated entity table. The {@link Where @Where} annotation always - * filters entity tables. - * - * @author Emmanuel Bernard - * - * @see Where - * - * @deprecated Use {@link SQLJoinTableRestriction} - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -@Deprecated(since = "6.3") -public @interface WhereJoinTable { - /** - * A predicate, written in native SQL. - */ - String clause(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java index da0998010a..3775293dbf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java @@ -72,8 +72,6 @@ import org.hibernate.annotations.SortComparator; import org.hibernate.annotations.SortNatural; import org.hibernate.annotations.SqlFragmentAlias; import org.hibernate.annotations.Synchronize; -import org.hibernate.annotations.Where; -import org.hibernate.annotations.WhereJoinTable; import org.hibernate.boot.BootLogging; import org.hibernate.boot.model.IdentifierGeneratorDefinition; import org.hibernate.boot.model.TypeDefinition; @@ -168,10 +166,10 @@ import static org.hibernate.boot.model.internal.BinderHelper.createSyntheticProp import static org.hibernate.boot.model.internal.BinderHelper.extractFromPackage; import static org.hibernate.boot.model.internal.BinderHelper.getCascadeStrategy; import static org.hibernate.boot.model.internal.BinderHelper.getFetchMode; -import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation; import static org.hibernate.boot.model.internal.BinderHelper.getPath; import static org.hibernate.boot.model.internal.BinderHelper.isDefault; import static org.hibernate.boot.model.internal.BinderHelper.isPrimitive; +import static org.hibernate.boot.model.internal.DialectOverridesAnnotationHelper.getOverridableAnnotation; import static org.hibernate.boot.model.internal.EmbeddableBinder.fillEmbeddable; import static org.hibernate.boot.model.internal.GeneratorBinder.buildGenerators; import static org.hibernate.boot.model.internal.PropertyHolderBuilder.buildPropertyHolder; @@ -1876,11 +1874,7 @@ public abstract class CollectionBinder { private String getWhereJoinTableClause() { final SQLJoinTableRestriction joinTableRestriction = property.getDirectAnnotationUsage( SQLJoinTableRestriction.class ); - if ( joinTableRestriction != null ) { - return joinTableRestriction.value(); - } - final WhereJoinTable whereJoinTable = property.getDirectAnnotationUsage( WhereJoinTable.class ); - return whereJoinTable == null ? null : whereJoinTable.clause(); + return joinTableRestriction != null ? joinTableRestriction.value() : null; } private String getWhereClause() { @@ -1895,16 +1889,7 @@ public abstract class CollectionBinder { private String getWhereOnCollectionClause() { final SQLRestriction restrictionOnCollection = getOverridableAnnotation( property, SQLRestriction.class, getBuildingContext() ); - if ( restrictionOnCollection != null ) { - return restrictionOnCollection.value(); - } - - final Where whereOnCollection = getOverridableAnnotation( property, Where.class, buildingContext ); - if ( whereOnCollection != null ) { - return whereOnCollection.clause(); - } - - return null; + return restrictionOnCollection != null ? restrictionOnCollection.value() : null; } private String getWhereOnClassClause() { @@ -1915,14 +1900,7 @@ public abstract class CollectionBinder { SQLRestriction.class, buildingContext ); - if ( restrictionOnClass != null ) { - return restrictionOnClass.value(); - } - final Where whereOnClass = getOverridableAnnotation( property, Where.class, buildingContext ); - if ( whereOnClass != null ) { - return whereOnClass.clause(); - } - return null; + return restrictionOnClass != null ? restrictionOnClass.value() : null; } else { return null; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java index e0864d95e4..e0658ff83c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java @@ -54,7 +54,6 @@ import org.hibernate.annotations.Subselect; import org.hibernate.annotations.Synchronize; import org.hibernate.annotations.TypeBinderType; import org.hibernate.annotations.View; -import org.hibernate.annotations.Where; import org.hibernate.binder.TypeBinder; import org.hibernate.boot.model.IdentifierGeneratorDefinition; import org.hibernate.boot.model.NamedEntityGraphDefinition; @@ -1630,10 +1629,6 @@ public class EntityBinder { } public void bindWhere() { - final Where where = getOverridableAnnotation( annotatedClass, Where.class, context ); - if ( where != null ) { - this.where = where.clause(); - } final SQLRestriction restriction = getOverridableAnnotation( annotatedClass, SQLRestriction.class, context ); if ( restriction != null ) { this.where = restriction.value(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java index 723f6c437f..2562ce14ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/DialectOverrideAnnotations.java @@ -45,8 +45,6 @@ import org.hibernate.boot.models.annotations.internal.OverriddenSQLSelectAnnotat import org.hibernate.boot.models.annotations.internal.OverriddenSQLSelectsAnnotation; import org.hibernate.boot.models.annotations.internal.OverriddenSQLUpdateAnnotation; import org.hibernate.boot.models.annotations.internal.OverriddenSQLUpdatesAnnotation; -import org.hibernate.boot.models.annotations.internal.OverriddenWhereAnnotation; -import org.hibernate.boot.models.annotations.internal.OverriddenWheresAnnotation; import org.hibernate.boot.models.annotations.internal.OverrideVersionAnnotation; import org.hibernate.boot.models.internal.OrmAnnotationHelper; import org.hibernate.models.internal.OrmAnnotationDescriptor; @@ -146,15 +144,6 @@ public interface DialectOverrideAnnotations { OverriddenJoinFormulaAnnotation.class, DIALECT_OVERRIDE_JOIN_FORMULAS ); - OrmAnnotationDescriptor DIALECT_OVERRIDE_WHERES = new OrmAnnotationDescriptor<>( - DialectOverride.Wheres.class, - OverriddenWheresAnnotation.class - ); - OrmAnnotationDescriptor DIALECT_OVERRIDE_WHERE = new OrmAnnotationDescriptor<>( - DialectOverride.Where.class, - OverriddenWhereAnnotation.class, - DIALECT_OVERRIDE_WHERES - ); OrmAnnotationDescriptor DIALECT_OVERRIDE_SQL_INSERTS = new OrmAnnotationDescriptor<>( DialectOverride.SQLInserts.class, OverriddenSQLInsertsAnnotation.class diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java index 305e0f1841..26d50e82eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java @@ -645,14 +645,6 @@ public interface HibernateAnnotations { View.class, ViewAnnotation.class ); - OrmAnnotationDescriptor WHERE = new OrmAnnotationDescriptor<>( - Where.class, - WhereAnnotation.class - ); - OrmAnnotationDescriptor WHERE_JOIN_TABLE = new OrmAnnotationDescriptor<>( - WhereJoinTable.class, - WhereJoinTableAnnotation.class - ); static void forEachAnnotation(Consumer> consumer) { OrmAnnotationHelper.forEachOrmAnnotation( HibernateAnnotations.class, consumer ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWhereAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWhereAnnotation.java deleted file mode 100644 index 7a6187c600..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWhereAnnotation.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. - */ -package org.hibernate.boot.models.annotations.internal; - -import java.lang.annotation.Annotation; - -import org.hibernate.annotations.DialectOverride; -import org.hibernate.annotations.Where; -import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.boot.models.annotations.spi.AbstractOverrider; -import org.hibernate.boot.models.annotations.spi.DialectOverrider; -import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; - -import org.jboss.jandex.AnnotationInstance; - -import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_WHERE; -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue; -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; - -/** - * @author Steve Ebersole - */ -@SuppressWarnings("ClassExplicitlyAnnotation") -public class OverriddenWhereAnnotation - extends AbstractOverrider - implements DialectOverride.Where, DialectOverrider { - private Where override; - - public OverriddenWhereAnnotation(SourceModelBuildingContext sourceModelContext) { - } - - public OverriddenWhereAnnotation(DialectOverride.Where source, SourceModelBuildingContext sourceModelContext) { - dialect( source.dialect() ); - before( source.before() ); - sameOrAfter( source.sameOrAfter() ); - override( extractJdkValue( source, DIALECT_OVERRIDE_WHERE, "override", sourceModelContext ) ); - } - - public OverriddenWhereAnnotation(AnnotationInstance source, SourceModelBuildingContext sourceModelContext) { - super( source, DIALECT_OVERRIDE_WHERE, sourceModelContext ); - override( extractJandexValue( source, DIALECT_OVERRIDE_WHERE, "override", sourceModelContext ) ); - } - - @Override - public AnnotationDescriptor getOverriddenDescriptor() { - return HibernateAnnotations.WHERE; - } - - @Override - public Where override() { - return override; - } - - public void override(Where value) { - this.override = value; - } - - @Override - public Class annotationType() { - return DialectOverride.Where.class; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWheresAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWheresAnnotation.java deleted file mode 100644 index 43d5109a39..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenWheresAnnotation.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. - */ -package org.hibernate.boot.models.annotations.internal; - -import java.lang.annotation.Annotation; - -import org.hibernate.annotations.DialectOverride; -import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; - -import org.jboss.jandex.AnnotationInstance; - -import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_WHERES; -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue; -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; - -/** - * @author Steve Ebersole - */ -@SuppressWarnings("ClassExplicitlyAnnotation") -public class OverriddenWheresAnnotation - implements DialectOverride.Wheres, RepeatableContainer { - private DialectOverride.Where[] value; - - public OverriddenWheresAnnotation(SourceModelBuildingContext sourceModelContext) { - } - - public OverriddenWheresAnnotation(DialectOverride.Wheres source, SourceModelBuildingContext sourceModelContext) { - value = extractJdkValue( source, DIALECT_OVERRIDE_WHERES, "override", sourceModelContext ); - } - - public OverriddenWheresAnnotation(AnnotationInstance source, SourceModelBuildingContext sourceModelContext) { - value = extractJandexValue( source, DIALECT_OVERRIDE_WHERES, "override", sourceModelContext ); - } - - @Override - public DialectOverride.Where[] value() { - return value; - } - - @Override - public void value(DialectOverride.Where[] value) { - this.value = value; - } - - @Override - public Class annotationType() { - return DialectOverride.Wheres.class; - } -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereAnnotation.java deleted file mode 100644 index f6cf444db6..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereAnnotation.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. - */ -package org.hibernate.boot.models.annotations.internal; - -import java.lang.annotation.Annotation; - -import org.hibernate.annotations.Where; -import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; - -import org.jboss.jandex.AnnotationInstance; - -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue; - -@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) -@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") -public class WhereAnnotation implements Where { - private String clause; - - /** - * Used in creating dynamic annotation instances (e.g. from XML) - */ - public WhereAnnotation(SourceModelBuildingContext modelContext) { - } - - /** - * Used in creating annotation instances from JDK variant - */ - public WhereAnnotation(Where annotation, SourceModelBuildingContext modelContext) { - this.clause = annotation.clause(); - } - - /** - * Used in creating annotation instances from Jandex variant - */ - public WhereAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) { - this.clause = extractJandexValue( annotation, HibernateAnnotations.WHERE, "clause", modelContext ); - } - - @Override - public Class annotationType() { - return Where.class; - } - - @Override - public String clause() { - return clause; - } - - public void clause(String value) { - this.clause = value; - } - - -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereJoinTableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereJoinTableAnnotation.java deleted file mode 100644 index 08b14c2119..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/WhereJoinTableAnnotation.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. - */ -package org.hibernate.boot.models.annotations.internal; - -import java.lang.annotation.Annotation; - -import org.hibernate.annotations.WhereJoinTable; -import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; - -import org.jboss.jandex.AnnotationInstance; - -import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue; - -@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) -@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") -public class WhereJoinTableAnnotation implements WhereJoinTable { - private String clause; - - /** - * Used in creating dynamic annotation instances (e.g. from XML) - */ - public WhereJoinTableAnnotation(SourceModelBuildingContext modelContext) { - } - - /** - * Used in creating annotation instances from JDK variant - */ - public WhereJoinTableAnnotation(WhereJoinTable annotation, SourceModelBuildingContext modelContext) { - this.clause = annotation.clause(); - } - - /** - * Used in creating annotation instances from Jandex variant - */ - public WhereJoinTableAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) { - this.clause = extractJandexValue( annotation, HibernateAnnotations.WHERE_JOIN_TABLE, "clause", modelContext ); - } - - @Override - public Class annotationType() { - return WhereJoinTable.class; - } - - @Override - public String clause() { - return clause; - } - - public void clause(String value) { - this.clause = value; - } - - -} diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java index 4aaf42cd9a..79e8b39221 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java @@ -454,7 +454,7 @@ public interface MappingSettings { String DEFAULT_LIST_SEMANTICS = "hibernate.mapping.default_list_semantics"; /** - * The {@link org.hibernate.annotations.Where @Where} annotation specifies a + * The {@link org.hibernate.annotations.SQLRestriction @SQLRestriction} annotation specifies a * restriction on the table rows which are visible as entity class instances or * collection elements. *

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java index 9cc7d210c4..802e2862cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java @@ -16,7 +16,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.predicate.Predicate; /** - * Things that can have {@link org.hibernate.annotations.Where}, + * Things that can have {@link org.hibernate.annotations.SQLRestriction}, * and/or {@link org.hibernate.annotations.Filter} applied to them. * This is effectively {@linkplain EntityMappingType entities} and * {@linkplain PluralAttributeMapping plural attributes}. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java index 13e663c7b2..d4f0540d73 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/WhereRestrictable.java @@ -13,7 +13,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.predicate.Predicate; /** - * Things which can have {@link org.hibernate.annotations.Where} + * Things which can have {@link org.hibernate.annotations.SQLRestriction} * declarations - entities and collections * * @see FilterRestrictable @@ -26,7 +26,7 @@ public interface WhereRestrictable { boolean hasWhereRestrictions(); /** - * Apply the {@link org.hibernate.annotations.Where} restrictions + * Apply the {@link org.hibernate.annotations.SQLRestriction} restrictions */ void applyWhereRestrictions( Consumer predicateConsumer, diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java index 75896f644b..ef3677924f 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java @@ -1167,7 +1167,7 @@ public abstract class AbstractCollectionPersister } /** - * Applies all defined {@link org.hibernate.annotations.Where} + * Applies all defined {@link org.hibernate.annotations.SQLRestriction} */ private static void applyWhereFragments(Consumer predicateConsumer, String alias, String template) { if ( template == null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java b/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java index 73e1324bbb..4a60fd9822 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/CompleteRestriction.java @@ -9,7 +9,7 @@ package org.hibernate.sql; import org.hibernate.Internal; /** - * For a complete predicate. E.g. {@link org.hibernate.annotations.Where} + * For a complete predicate. E.g. {@link org.hibernate.annotations.SQLRestriction} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java index 17dba2b104..ab0cd40dc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java @@ -91,7 +91,7 @@ public class SimpleSelect implements RestrictionRenderingContext { } /** - * Appends a complete {@linkplain org.hibernate.annotations.Where where} condition. + * Appends a complete {@linkplain org.hibernate.annotations.SQLRestriction where} condition. * The {@code condition} is added as-is. */ public SimpleSelect addWhereToken(String condition) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java index e1964ffd7d..12005e7e78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Forest.java @@ -21,8 +21,8 @@ import org.hibernate.annotations.OptimisticLock; import org.hibernate.annotations.OptimisticLockType; import org.hibernate.annotations.OptimisticLocking; import org.hibernate.annotations.ParamDef; +import org.hibernate.annotations.SQLRestriction; import org.hibernate.annotations.SelectBeforeUpdate; -import org.hibernate.annotations.Where; import jakarta.persistence.Convert; import jakarta.persistence.ElementCollection; @@ -43,7 +43,7 @@ import jakarta.persistence.Table; @SelectBeforeUpdate @DynamicInsert @DynamicUpdate @OptimisticLocking(type = OptimisticLockType.ALL) -@Where(clause = "1=1") +@SQLRestriction("1=1") @FilterDef(name = "minLength", parameters = {@ParamDef(name = "minLength", type = Integer.class)}) @Filter(name = "betweenLength") @Filter(name = "minLength", condition = ":minLength <= length") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java index 2331b7a87a..bc36fef2b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/Championship.java @@ -2,16 +2,17 @@ package org.hibernate.orm.test.extralazy; import java.util.ArrayList; import java.util.List; + +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; +import org.hibernate.annotations.SQLRestriction; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; -import org.hibernate.annotations.Where; - @Entity @Table(name = "championship") public class Championship { @@ -21,7 +22,7 @@ public class Championship { @OneToMany(cascade = CascadeType.ALL) @LazyCollection(LazyCollectionOption.EXTRA) - @Where(clause = " gpa >= 4 ") + @SQLRestriction(" gpa >= 4 ") private List students = new ArrayList<>(); public Championship() {} diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java index 503cb1d11c..f66bd1c741 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/School.java @@ -4,16 +4,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; +import org.hibernate.annotations.SQLRestriction; + import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.MapKey; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.annotations.LazyCollection; -import org.hibernate.annotations.LazyCollectionOption; -import org.hibernate.annotations.Where; - @Entity @Table(name = "school") public class School { @@ -27,12 +28,12 @@ public class School { @OneToMany(mappedBy = "school") @LazyCollection(LazyCollectionOption.EXTRA) - @Where(clause = " gpa >= 4 ") + @SQLRestriction(" gpa >= 4 ") private Set topStudents = new HashSet(); @OneToMany(mappedBy = "school") @LazyCollection(LazyCollectionOption.EXTRA) - @Where(clause = " gpa >= 4 ") + @SQLRestriction(" gpa >= 4 ") @MapKey private Map studentsMap = new HashMap<>(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java index 1d8ae2fcc5..543af736c2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/size/WhereClauseOrderBySizeTest.java @@ -7,12 +7,21 @@ package org.hibernate.orm.test.hql.size; -import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import org.hibernate.annotations.SQLDelete; +import org.hibernate.annotations.SQLRestriction; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.jdbc.Expectation; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; + +import org.hibernate.testing.RequiresDialect; +import org.hibernate.testing.TestForIssue; +import org.junit.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -22,18 +31,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.TypedQuery; -import org.hibernate.annotations.ResultCheckStyle; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.SQLRestriction; -import org.hibernate.annotations.Where; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jdbc.Expectation; -import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; - -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; -import org.junit.Test; +import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; +import static org.junit.Assert.assertEquals; @TestForIssue(jiraKey = "HHH-14585") @RequiresDialect(value = PostgreSQLDialect.class, comment = "Other databases may not support boolean data types") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java index 20342ed9f0..d4fd899ace 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java @@ -2,6 +2,19 @@ package org.hibernate.orm.test.insertordering; import java.util.ArrayList; import java.util.List; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.SQLRestriction; +import org.hibernate.annotations.SortNatural; +import org.hibernate.community.dialect.AltibaseDialect; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.SkipForDialect; +import org.junit.jupiter.api.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorValue; @@ -15,19 +28,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.OneToMany; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.SQLRestriction; -import org.hibernate.annotations.SortNatural; -import org.hibernate.annotations.Where; -import org.hibernate.community.dialect.AltibaseDialect; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.SkipForDialect; -import org.junit.jupiter.api.Test; - /** * @author Normunds Gavars * @author Nathan Xu diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java index f643afeeee..d5fdaf015b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereAnnotationAndJoinedInheritanceTest.java @@ -3,7 +3,7 @@ package org.hibernate.orm.test.mapping.where; import java.util.ArrayList; import java.util.List; -import org.hibernate.annotations.Where; +import org.hibernate.annotations.SQLRestriction; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jira; @@ -139,7 +139,7 @@ public class WhereAnnotationAndJoinedInheritanceTest { @Entity(name = "Parent") @Inheritance(strategy = InheritanceType.JOINED) - @Where(clause = "deleted_column is null") + @SQLRestriction("deleted_column is null") public static abstract class Parent { @Id diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java index 0802aa0364..2c64338ef8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/WhereFragmentTests.java @@ -9,7 +9,6 @@ package org.hibernate.orm.test.mapping.where; import java.util.Map; import org.hibernate.Hibernate; -import org.hibernate.annotations.Where; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.graph.spi.RootGraphImplementor; @@ -34,8 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; /** - * Tests for {@link Where} handling. - * * @implNote Requires H2 simply because we need hard-coded schema export. The schema is simple and would * probably work on a larger number of databases; but there should really be nothing database specific in * these tests. diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/package-info.java deleted file mode 100644 index d7782e86a3..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/where/package-info.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html - */ - -/** - * Tests for {@link org.hibernate.annotations.Where} - */ -package org.hibernate.orm.test.mapping.where; - diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java index 999a8d220c..d834950c19 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/manytomany/sametable/Child1Entity.java @@ -8,6 +8,10 @@ package org.hibernate.orm.test.envers.entities.manytomany.sametable; import java.util.ArrayList; import java.util.List; + +import org.hibernate.annotations.SQLJoinTableRestriction; +import org.hibernate.envers.Audited; + import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; @@ -16,10 +20,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; -import org.hibernate.annotations.SQLJoinTableRestriction; -import org.hibernate.annotations.WhereJoinTable; -import org.hibernate.envers.Audited; - /** * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java index 9818bfe0c9..8b089f1f3f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytomany/BasicWhereTest.java @@ -8,6 +8,19 @@ package org.hibernate.orm.test.envers.integration.manytomany; import java.util.Set; +import org.hibernate.annotations.SQLRestriction; +import org.hibernate.community.dialect.AltibaseDialect; +import org.hibernate.envers.AuditJoinTable; +import org.hibernate.envers.Audited; +import org.hibernate.envers.RelationTargetAuditMode; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; + +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.SkipForDialect; +import org.hibernate.testing.transaction.TransactionUtil; +import org.junit.Test; + import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; import jakarta.persistence.DiscriminatorValue; @@ -19,32 +32,14 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; import jakarta.persistence.Table; -import org.hibernate.annotations.SQLRestriction; -import org.hibernate.annotations.Where; -import org.hibernate.community.dialect.AltibaseDialect; -import org.hibernate.envers.AuditJoinTable; -import org.hibernate.envers.Audited; -import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; -import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.SkipForDialect; -import org.hibernate.testing.transaction.TransactionUtil; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** - * Provides test cases for the following {@link ManyToMany} mapping: - * - *

    - *
  • An {@link AuditJoinTable} with a {@link Where} clause.
    • - *
  • A non join-table mapping with a {@link Where} clause.
    • - *
+ * Provides test cases for the following {@link ManyToMany} mapping with {@linkplain SQLRestriction} * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9432") +@JiraKey("HHH-9432") @SkipForDialect( dialectClass = AltibaseDialect.class, reason = "'TYPE' is not escaped even though autoQuoteKeywords is enabled") public class BasicWhereTest extends BaseEnversJPAFunctionalTestCase { private Integer aId; diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java index 76b051eaad..db8afb8683 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/BasicWhereTest.java @@ -8,6 +8,19 @@ package org.hibernate.orm.test.envers.integration.onetomany; import java.util.Set; +import org.hibernate.annotations.SQLRestriction; +import org.hibernate.community.dialect.AltibaseDialect; +import org.hibernate.envers.AuditJoinTable; +import org.hibernate.envers.Audited; +import org.hibernate.envers.RelationTargetAuditMode; +import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; +import org.hibernate.orm.test.envers.Priority; + +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.SkipForDialect; +import org.hibernate.testing.transaction.TransactionUtil; +import org.junit.Test; + import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; import jakarta.persistence.DiscriminatorValue; @@ -19,34 +32,15 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.annotations.SQLRestriction; -import org.hibernate.annotations.Where; -import org.hibernate.community.dialect.AltibaseDialect; -import org.hibernate.envers.AuditJoinTable; -import org.hibernate.envers.Audited; -import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase; -import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.orm.junit.SkipForDialect; -import org.hibernate.testing.transaction.TransactionUtil; - -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** - * Provides test cases for the following {@link OneToMany} mapping: - * - *
    - *
  • An {@link AuditJoinTable} with a {@link Where} clause.
    • - *
  • A non join-table mapping with a {@link Where} clause.
    • - *
+ * Provides test cases for the following {@link OneToMany} mapping with {@linkplain SQLRestriction} * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9432") +@JiraKey("HHH-9432") @SkipForDialect( dialectClass = AltibaseDialect.class, reason = "'TYPE' is not escaped even though autoQuoteKeywords is enabled") public class BasicWhereTest extends BaseEnversJPAFunctionalTestCase { private Integer aId;