HHH-18191 - Remove @LazyToOne
This commit is contained in:
Steve Ebersole
parent
9e6d2e006d
commit
ea1f74407d
|
|
@ -1,35 +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.annotations;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* Specifies the machinery used to handle lazy fetching of
|
||||
* the annotated {@link jakarta.persistence.OneToOne} or
|
||||
* {@link jakarta.persistence.ManyToOne} association.
|
||||
* This is an alternative to specifying only the JPA
|
||||
* {@link jakarta.persistence.FetchType}.
|
||||
*
|
||||
* @author Emmanuel Bernard
|
||||
*
|
||||
* @deprecated use JPA annotations to specify the
|
||||
* {@link jakarta.persistence.FetchType}
|
||||
*/
|
||||
@Deprecated(since="6.2")
|
||||
@Target({ElementType.METHOD, ElementType.FIELD})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface LazyToOne {
|
||||
/**
|
||||
* A {@link LazyToOneOption} which determines how lazy
|
||||
* fetching should be handled.
|
||||
*/
|
||||
LazyToOneOption value() default LazyToOneOption.PROXY;
|
||||
}
|
||||
|
|
@ -1,87 +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.annotations;
|
||||
|
||||
/**
|
||||
* Enumerates the options for lazy loading of a
|
||||
* {@linkplain jakarta.persistence.ManyToOne many to one}
|
||||
* or {@linkplain jakarta.persistence.OneToOne one to one}
|
||||
* association.
|
||||
*
|
||||
* @author Emmanuel Bernard
|
||||
*
|
||||
* @see LazyToOne
|
||||
*
|
||||
* @deprecated since {@link LazyToOne} is deprecated, use
|
||||
* {@link jakarta.persistence.FetchType} instead
|
||||
*/
|
||||
@Deprecated(since="6.2")
|
||||
public enum LazyToOneOption {
|
||||
/**
|
||||
* The association is always loaded eagerly. The identifier
|
||||
* and concrete type of the associated entity instance,
|
||||
* along with all the rest of its non-lazy fields, are always
|
||||
* available immediately.
|
||||
*
|
||||
* @deprecated use {@link jakarta.persistence.FetchType#EAGER}
|
||||
*/
|
||||
@Deprecated
|
||||
FALSE,
|
||||
/**
|
||||
* The association is proxied and a delegate entity instance
|
||||
* is lazily fetched when any method of the proxy other than
|
||||
* the getter method for the identifier property is first
|
||||
* called.
|
||||
* <ul>
|
||||
* <li>The identifier property of the proxy object is set
|
||||
* when the proxy is instantiated.
|
||||
* The program may obtain the entity identifier value
|
||||
* of an unfetched proxy, without triggering lazy
|
||||
* fetching, by calling the corresponding getter method.
|
||||
* <li>The proxy does not have the same concrete type as the
|
||||
* proxied delegate, and so
|
||||
* {@link org.hibernate.Hibernate#getClass(Object)}
|
||||
* must be used in place of {@link Object#getClass()},
|
||||
* and this method fetches the entity by side-effect.
|
||||
* <li>For a polymorphic association, the concrete type of
|
||||
* the proxied entity instance is not known until the
|
||||
* delegate is fetched from the database, and so
|
||||
* {@link org.hibernate.Hibernate#unproxy(Object, Class)}}
|
||||
* must be used to perform typecasts, and
|
||||
* {@link org.hibernate.Hibernate#getClass(Object)}
|
||||
* must be used instead of the Java {@code instanceof}
|
||||
* operator.
|
||||
* </ul>
|
||||
*
|
||||
* @deprecated use {@link jakarta.persistence.FetchType#LAZY}
|
||||
*/
|
||||
@Deprecated
|
||||
PROXY,
|
||||
/**
|
||||
* The associated entity instance is initially in an unloaded
|
||||
* state, and is loaded lazily when any field other than the
|
||||
* field containing the identifier is first accessed.
|
||||
* <ul>
|
||||
* <li>The identifier field of an unloaded entity instance is
|
||||
* set when the unloaded instance is instantiated.
|
||||
* The program may obtain the identifier of an unloaded
|
||||
* entity, without triggering lazy fetching, by accessing
|
||||
* the field containing the identifier.
|
||||
* <li>Typecasts, the Java {@code instanceof} operator, and
|
||||
* {@link Object#getClass()} may be used as normal.
|
||||
* <li>Bytecode enhancement is required. If the class is not
|
||||
* enhanced, this option is equivalent to {@link #PROXY}.
|
||||
* </ul>
|
||||
* <p>
|
||||
* Hibernate does not support this setting for polymorphic
|
||||
* associations, and instead falls back to {@link #PROXY}.
|
||||
*
|
||||
* @deprecated this setting no longer has any useful effect
|
||||
*/
|
||||
@Deprecated
|
||||
NO_PROXY
|
||||
}
|
||||
|
|
@ -16,8 +16,6 @@ import org.hibernate.annotations.Cascade;
|
|||
import org.hibernate.annotations.Columns;
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchProfileOverride;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
import org.hibernate.annotations.OnDelete;
|
||||
|
|
@ -58,7 +56,6 @@ import static org.hibernate.boot.model.internal.BinderHelper.isDefault;
|
|||
import static org.hibernate.boot.model.internal.BinderHelper.noConstraint;
|
||||
import static org.hibernate.internal.CoreLogging.messageLogger;
|
||||
import static org.hibernate.internal.util.StringHelper.isEmpty;
|
||||
import static org.hibernate.internal.util.StringHelper.isNotEmpty;
|
||||
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
|
||||
import static org.hibernate.internal.util.StringHelper.qualify;
|
||||
|
||||
|
|
@ -415,21 +412,7 @@ public class ToOneBinder {
|
|||
|
||||
private static boolean isEager(MemberDetails property, PropertyData inferredData, PropertyHolder propertyHolder) {
|
||||
final FetchType fetchType = getJpaFetchType( property );
|
||||
|
||||
final LazyToOne lazyToOneAnnotationUsage = property.getDirectAnnotationUsage( LazyToOne.class );
|
||||
if ( lazyToOneAnnotationUsage != null ) {
|
||||
final LazyToOneOption option = lazyToOneAnnotationUsage.value();
|
||||
boolean eager = option == LazyToOneOption.FALSE;
|
||||
if ( eager && fetchType == LAZY ) {
|
||||
// conflicts with non-default setting
|
||||
throw new AnnotationException("Association '" + getPath(propertyHolder, inferredData)
|
||||
+ "' is marked 'fetch=LAZY' and '@LazyToOne(FALSE)'");
|
||||
}
|
||||
return eager;
|
||||
}
|
||||
else {
|
||||
return fetchType == EAGER;
|
||||
}
|
||||
return fetchType == EAGER;
|
||||
}
|
||||
|
||||
private static FetchType getJpaFetchType(MemberDetails property) {
|
||||
|
|
|
|||
|
|
@ -374,10 +374,6 @@ public interface HibernateAnnotations {
|
|||
LazyGroup.class,
|
||||
LazyGroupAnnotation.class
|
||||
);
|
||||
OrmAnnotationDescriptor<LazyToOne, LazyToOneAnnotation> LAZY_TO_ONE = new OrmAnnotationDescriptor<>(
|
||||
LazyToOne.class,
|
||||
LazyToOneAnnotation.class
|
||||
);
|
||||
OrmAnnotationDescriptor<ListIndexBase, ListIndexBaseAnnotation> LIST_INDEX_BASE = new OrmAnnotationDescriptor<>(
|
||||
ListIndexBase.class,
|
||||
ListIndexBaseAnnotation.class
|
||||
|
|
|
|||
|
|
@ -1,60 +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.LazyToOne;
|
||||
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 LazyToOneAnnotation implements LazyToOne {
|
||||
private org.hibernate.annotations.LazyToOneOption value;
|
||||
|
||||
/**
|
||||
* Used in creating dynamic annotation instances (e.g. from XML)
|
||||
*/
|
||||
public LazyToOneAnnotation(SourceModelBuildingContext modelContext) {
|
||||
this.value = org.hibernate.annotations.LazyToOneOption.PROXY;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used in creating annotation instances from JDK variant
|
||||
*/
|
||||
public LazyToOneAnnotation(LazyToOne annotation, SourceModelBuildingContext modelContext) {
|
||||
this.value = annotation.value();
|
||||
}
|
||||
|
||||
/**
|
||||
* Used in creating annotation instances from Jandex variant
|
||||
*/
|
||||
public LazyToOneAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
|
||||
this.value = extractJandexValue( annotation, HibernateAnnotations.LAZY_TO_ONE, "value", modelContext );
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends Annotation> annotationType() {
|
||||
return LazyToOne.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public org.hibernate.annotations.LazyToOneOption value() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public void value(org.hibernate.annotations.LazyToOneOption value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -7,8 +7,13 @@
|
|||
|
||||
//$Id$
|
||||
package org.hibernate.orm.test.annotations.fetch;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchMode;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
|
|
@ -18,11 +23,6 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchMode;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
/**
|
||||
* @author Emmanuel Bernard
|
||||
*/
|
||||
|
|
@ -105,8 +105,7 @@ public class Stay implements Serializable {
|
|||
this.person = person;
|
||||
}
|
||||
|
||||
@ManyToOne(cascade = CascadeType.ALL)
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@Fetch(FetchMode.SELECT)
|
||||
@JoinColumn(name = "oldperson")
|
||||
public Person getOldPerson() {
|
||||
|
|
@ -118,7 +117,6 @@ public class Stay implements Serializable {
|
|||
}
|
||||
|
||||
@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
@Fetch(FetchMode.JOIN)
|
||||
@JoinColumn(name = "veryoldperson")
|
||||
public Person getVeryOldPerson() {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import org.hibernate.annotations.DynamicInsert;
|
|||
import org.hibernate.annotations.DynamicUpdate;
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
|
|
@ -25,7 +24,6 @@ import jakarta.persistence.Version;
|
|||
import static jakarta.persistence.CascadeType.ALL;
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hibernate.annotations.FetchMode.SELECT;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
|
||||
@DomainModel(
|
||||
|
|
@ -83,7 +81,6 @@ public class BidirectionalOneToOneWithNonAggregateIdTest {
|
|||
protected int lockVersion;
|
||||
|
||||
@OneToOne(fetch = LAZY, cascade = ALL, orphanRemoval = true, mappedBy = "parent")
|
||||
@LazyToOne(NO_PROXY)
|
||||
@LazyGroup("group2")
|
||||
@Fetch(SELECT)
|
||||
protected Entity2 child;
|
||||
|
|
@ -111,7 +108,6 @@ public class BidirectionalOneToOneWithNonAggregateIdTest {
|
|||
public static class Entity2 {
|
||||
@Id
|
||||
@OneToOne(fetch = LAZY, optional = false)
|
||||
@LazyToOne(NO_PROXY)
|
||||
@LazyGroup("owner")
|
||||
@JoinColumn(name = "parentid", nullable = false, updatable = false, columnDefinition = "smallint")
|
||||
@Fetch(SELECT)
|
||||
|
|
|
|||
|
|
@ -6,20 +6,7 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.cascade;
|
||||
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
|
|
@ -32,6 +19,17 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hibernate.testing.jdbc.SQLStatementInspector.extractFromSession;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
|
|
@ -42,6 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
/**
|
||||
* @author Luis Barreiro
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-10252")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -208,7 +207,6 @@ public class CascadeDeleteManyToOneTest {
|
|||
CascadeType.REMOVE
|
||||
}, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "parent_id")
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
Parent parent;
|
||||
|
||||
@Basic(fetch = FetchType.LAZY)
|
||||
|
|
|
|||
|
|
@ -2,20 +2,8 @@ package org.hibernate.orm.test.bytecode.enhancement.cascade;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
|
|
@ -29,6 +17,17 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
|||
import org.hibernate.testing.orm.junit.Setting;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hibernate.testing.jdbc.SQLStatementInspector.extractFromSession;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
|
@ -40,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
* @author Bolek Ziobrowski
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13129")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -232,7 +232,6 @@ public class CascadeOnUninitializedTest {
|
|||
|
||||
@ManyToOne(cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "primary_address_id")
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
private Address primaryAddress;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
|
|
|
|||
|
|
@ -1,18 +1,9 @@
|
|||
package org.hibernate.orm.test.bytecode.enhancement.cascade;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hibernate.testing.jdbc.SQLStatementInspector.extractFromSession;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
|
|
@ -24,7 +15,6 @@ import org.hibernate.testing.orm.junit.ServiceRegistry;
|
|||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.hibernate.testing.orm.junit.Setting;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
|
|
@ -38,6 +28,13 @@ import jakarta.persistence.ManyToOne;
|
|||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.hibernate.testing.jdbc.SQLStatementInspector.extractFromSession;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* Same as {@link CascadeDeleteCollectionTest},
|
||||
* but with {@code collectionInDefaultFetchGroup} set to {@code false} explicitly.
|
||||
|
|
@ -47,6 +44,7 @@ import jakarta.persistence.Table;
|
|||
* @author Bolek Ziobrowski
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13129")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -247,7 +245,6 @@ public class CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest {
|
|||
|
||||
@ManyToOne(cascade = { CascadeType.ALL }, fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "primary_address_id")
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
private Address primaryAddress;
|
||||
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ package org.hibernate.orm.test.bytecode.enhancement.join;
|
|||
import java.util.List;
|
||||
|
||||
import org.hibernate.Session;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
|
|
@ -20,6 +18,8 @@ import org.hibernate.testing.orm.junit.ServiceRegistry;
|
|||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.hibernate.testing.orm.junit.Setting;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
|
|
@ -36,9 +36,7 @@ import static org.hibernate.Hibernate.isPropertyInitialized;
|
|||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey( "HHH-3949" )
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -201,7 +199,6 @@ public class HHH3949Test {
|
|||
String name;
|
||||
|
||||
@OneToOne( optional = true, mappedBy = "driver", fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
Vehicle vehicle;
|
||||
|
||||
Person() {
|
||||
|
|
|
|||
|
|
@ -8,17 +8,9 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.Session;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
|
||||
import org.hibernate.bytecode.enhance.spi.UnloadedClass;
|
||||
import org.hibernate.bytecode.enhance.spi.UnloadedField;
|
||||
|
|
@ -38,6 +30,13 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
|||
import org.hibernate.testing.orm.junit.Setting;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
|
|
@ -51,6 +50,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
*
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13241")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -357,7 +357,6 @@ public class BidirectionalLazyTest {
|
|||
}
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@JoinColumn(name = "employer_name")
|
||||
public Employer getEmployer() {
|
||||
return employer;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
|
|
@ -29,8 +31,6 @@ import jakarta.persistence.Id;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.equalTo;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
|
|
@ -53,6 +53,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
*
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey( "HHH-10055" )
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -186,7 +187,6 @@ public class LazyCollectionLoadingTest {
|
|||
Long id;
|
||||
|
||||
@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
Parent parent;
|
||||
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
|
|
@ -28,8 +29,6 @@ import jakarta.persistence.Id;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.checkDirtyTracking;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
|
@ -120,7 +119,6 @@ public class LazyLoadingIntegrationTest {
|
|||
Long id;
|
||||
|
||||
@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
Parent parent;
|
||||
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -9,19 +9,8 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.engine.spi.PersistentAttributeInterceptable;
|
||||
|
|
@ -37,6 +26,16 @@ import org.hibernate.testing.orm.junit.Setting;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
|
|
@ -47,6 +46,7 @@ import static org.junit.Assert.assertThat;
|
|||
/**
|
||||
* @author Luis Barreiro
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
LazyLoadingTest.Parent.class, LazyLoadingTest.Child.class
|
||||
|
|
@ -149,7 +149,6 @@ public class LazyLoadingTest {
|
|||
Long id;
|
||||
|
||||
@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
Parent parent;
|
||||
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -6,14 +6,15 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -26,11 +27,8 @@ import jakarta.persistence.Id;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13380")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -100,7 +98,6 @@ public class LazyOneToManyWithEqualsImplementationTest {
|
|||
public String getTitle() { return title; }
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
private Person person;
|
||||
public Person getPerson() { return person; }
|
||||
|
||||
|
|
|
|||
|
|
@ -6,15 +6,7 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.annotations.NaturalId;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
|
||||
|
|
@ -30,6 +22,12 @@ import org.junit.jupiter.api.AfterEach;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
|
@ -37,6 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
/**
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey( "HHH-13607" )
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -133,11 +132,9 @@ public class NaturalIdInUninitializedAssociationTest {
|
|||
private int id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY )
|
||||
private EntityMutableNaturalId entityMutableNaturalId;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY )
|
||||
private EntityImmutableNaturalId entityImmutableNaturalId;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,10 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.cache;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.Cacheable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.Cache;
|
||||
import org.hibernate.annotations.CacheConcurrencyStrategy;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
import org.hibernate.stat.CacheRegionStatistics;
|
||||
|
|
@ -28,6 +17,18 @@ import org.hibernate.testing.orm.junit.ServiceRegistry;
|
|||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.hibernate.testing.orm.junit.Setting;
|
||||
import org.junit.Assert;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.Cacheable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
|
|
@ -35,9 +36,7 @@ import static org.junit.Assert.assertEquals;
|
|||
import static org.junit.Assert.assertThat;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
UninitializedAssociationsInCacheTest.Employee.class
|
||||
|
|
@ -157,7 +156,6 @@ public class UninitializedAssociationsInCacheTest {
|
|||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "SUPERIOR")
|
||||
@LazyToOne( value = LazyToOneOption.NO_PROXY )
|
||||
Employee superior;
|
||||
|
||||
@OneToMany(mappedBy = "superior")
|
||||
|
|
|
|||
|
|
@ -6,24 +6,10 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
|
||||
|
||||
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
|
||||
import org.hibernate.bytecode.enhance.spi.UnloadedClass;
|
||||
|
||||
|
|
@ -37,6 +23,16 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
|||
import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
/**
|
||||
* Tests removing non-owning side of the bidirectional association,
|
||||
* where owning side is in an embeddable.
|
||||
|
|
@ -45,6 +41,7 @@ import org.junit.jupiter.api.Test;
|
|||
*
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13241")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -206,7 +203,6 @@ public class BidirectionalLazyGroupsInEmbeddableTest {
|
|||
private Employer employer;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@LazyGroup("EmployerForEmployee")
|
||||
@JoinColumn(name = "employer_name")
|
||||
public Employer getEmployer() {
|
||||
|
|
|
|||
|
|
@ -8,18 +8,9 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
|
||||
import org.hibernate.bytecode.enhance.spi.UnloadedClass;
|
||||
|
||||
|
|
@ -30,19 +21,27 @@ import org.hibernate.testing.orm.junit.DomainModel;
|
|||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* Tests removing non-owning side of the bidirectional association,
|
||||
* with and without dirty-checking using enhancement.
|
||||
*
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-13241")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -158,7 +157,6 @@ public class BidirectionalLazyGroupsTest {
|
|||
}
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@LazyGroup("EmployerForEmployee")
|
||||
@JoinColumn(name = "employer_name")
|
||||
public Employer getEmployer() {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
|
||||
import jakarta.persistence.Access;
|
||||
import jakarta.persistence.AccessType;
|
||||
import jakarta.persistence.Basic;
|
||||
|
|
@ -14,10 +16,6 @@ import jakarta.persistence.Lob;
|
|||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
/**
|
||||
* Source of a LazyToOne - relationship with FK on the other side
|
||||
*
|
||||
|
|
@ -39,7 +37,6 @@ public class LGMB_From {
|
|||
|
||||
// Lazy-Association with mappdedBy in own LazyGroup
|
||||
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "fromRelation", optional = true)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@LazyGroup(value = "toRelationLazyGroup")
|
||||
private LGMB_To toRelation;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,12 +17,9 @@ import org.junit.jupiter.api.Test;
|
|||
*
|
||||
* @author Jan-Oliver Lustig, Sebastian Viefhaus
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-11986")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
LGMB_From.class, LGMB_To.class
|
||||
}
|
||||
)
|
||||
@DomainModel(annotatedClasses = {LGMB_From.class, LGMB_To.class})
|
||||
@SessionFactory
|
||||
@BytecodeEnhanced
|
||||
public class LazyGroupMappedByTest {
|
||||
|
|
|
|||
|
|
@ -8,21 +8,9 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.group;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
|
|
@ -34,18 +22,29 @@ import org.hibernate.testing.orm.junit.ServiceRegistry;
|
|||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.hibernate.testing.orm.junit.Setting;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey( "HHH-11155" )
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -257,11 +256,9 @@ public class LazyGroupTest {
|
|||
String nickName;
|
||||
|
||||
@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
Parent parent;
|
||||
|
||||
@ManyToOne( cascade = CascadeType.ALL, fetch = FetchType.LAZY )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
@LazyGroup( "SECONDARY" )
|
||||
Parent alternateParent;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,17 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.ConstraintMode;
|
||||
import jakarta.persistence.Entity;
|
||||
|
|
@ -16,26 +27,13 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-12226")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -81,7 +79,6 @@ public class LazyNotFoundManyToOneNonUpdatableNonInsertableTest {
|
|||
private Integer id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, optional = true)
|
||||
@LazyToOne(value = LazyToOneOption.NO_PROXY)
|
||||
@NotFound(action = NotFoundAction.IGNORE)
|
||||
@JoinColumn(
|
||||
foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT),
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
|
||||
|
||||
/**
|
||||
* @author Gail Badner
|
||||
*/
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
|
|
@ -18,22 +25,9 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-12226")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -80,7 +74,6 @@ public class LazyNotFoundOneToOneNonUpdatableNonInsertableTest {
|
|||
private Integer id;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, optional = true)
|
||||
@LazyToOne(value = LazyToOneOption.NO_PROXY)
|
||||
@NotFound(action = NotFoundAction.IGNORE)
|
||||
@JoinColumn(
|
||||
name = "id",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,18 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.bytecode.enhancement.lazy.notfound;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.jdbc.SQLStatementInspector;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.ConstraintMode;
|
||||
import jakarta.persistence.Entity;
|
||||
|
|
@ -16,27 +28,13 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.annotations.NotFound;
|
||||
import org.hibernate.annotations.NotFoundAction;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.jdbc.SQLStatementInspector;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* @author Gail Badner
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-12226")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -93,7 +91,6 @@ public class LazyNotFoundOneToOneTest {
|
|||
private Integer id;
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
@LazyToOne(value = LazyToOneOption.NO_PROXY)
|
||||
@NotFound(action = NotFoundAction.IGNORE)
|
||||
@JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
|
||||
private Lazy lazy;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
|
|
@ -18,9 +19,6 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
/**
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
|
|
@ -75,7 +73,6 @@ public abstract class Customer {
|
|||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
public Address getAddress() {
|
||||
return address;
|
||||
}
|
||||
|
|
@ -86,7 +83,6 @@ public abstract class Customer {
|
|||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
public Customer getParentCustomer() {
|
||||
return parentCustomer;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
|
|
@ -20,9 +21,6 @@ import jakarta.persistence.OneToMany;
|
|||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
/**
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
|
|
@ -98,7 +96,6 @@ public class Order {
|
|||
}
|
||||
|
||||
@OneToOne(fetch = FetchType.LAZY, mappedBy = "order")
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
public OrderSupplemental2 getSupplemental2() {
|
||||
return supplemental2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
|
|||
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
|
||||
import jakarta.persistence.Basic;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
|
|
@ -25,10 +28,6 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
@Entity(name = "RoleEntity")
|
||||
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
|
||||
@Table(name = "PP_DCRolleKey")
|
||||
|
|
@ -39,13 +38,11 @@ public class RoleEntity extends ModelEntity implements Serializable {
|
|||
Short value;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
@LazyGroup("Key")
|
||||
@JoinColumn
|
||||
protected AbstractKey key = null;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
@LazyGroup("Key")
|
||||
@JoinColumn
|
||||
protected SpecializedKey specializedKey = null;
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
|
|
@ -24,10 +27,6 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
|
||||
@Entity(name="SpecializedEntity")
|
||||
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
|
||||
|
|
@ -49,7 +48,6 @@ public class SpecializedEntity implements Serializable {
|
|||
String value;
|
||||
|
||||
@ManyToOne(fetch=FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
@LazyGroup("SpecializedKey")
|
||||
@JoinColumn
|
||||
protected SpecializedKey specializedKey = null;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import org.hibernate.annotations.DynamicInsert;
|
|||
import org.hibernate.annotations.DynamicUpdate;
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
|
|
@ -25,9 +24,9 @@ import jakarta.persistence.Version;
|
|||
import static jakarta.persistence.CascadeType.ALL;
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hibernate.annotations.FetchMode.SELECT;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
OrphanRemovalTest.Entity1.class,
|
||||
|
|
@ -86,7 +85,6 @@ public class OrphanRemovalTest {
|
|||
protected int lockVersion;
|
||||
|
||||
@OneToOne(fetch = LAZY, cascade = ALL, orphanRemoval = true, mappedBy = "parent")
|
||||
@LazyToOne(NO_PROXY)
|
||||
@LazyGroup("group2")
|
||||
@Fetch(SELECT)
|
||||
protected Entity2 child;
|
||||
|
|
@ -114,7 +112,6 @@ public class OrphanRemovalTest {
|
|||
public static class Entity2 {
|
||||
@Id
|
||||
@OneToOne(fetch = LAZY, optional = false)
|
||||
@LazyToOne(NO_PROXY)
|
||||
@LazyGroup("owner")
|
||||
@JoinColumn(name = "parentid", nullable = false, updatable = false, columnDefinition = "smallint")
|
||||
@Fetch(SELECT)
|
||||
|
|
|
|||
|
|
@ -15,14 +15,12 @@ import org.hibernate.annotations.Fetch;
|
|||
import org.hibernate.annotations.FetchMode;
|
||||
import org.hibernate.annotations.LazyCollection;
|
||||
import org.hibernate.annotations.LazyCollectionOption;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.orm.test.util.connections.ConnectionCheckingConnectionProvider;
|
||||
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
|
||||
|
||||
import org.hibernate.testing.TestForIssue;
|
||||
import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -41,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
/**
|
||||
* @author Selaron
|
||||
*/
|
||||
@TestForIssue(jiraKey = "HHH-4808")
|
||||
@JiraKey("HHH-4808")
|
||||
public class LazyLoadingConnectionCloseTest extends EntityManagerFactoryBasedFunctionalTest {
|
||||
|
||||
private ConnectionCheckingConnectionProvider connectionProvider;
|
||||
|
|
@ -279,7 +277,6 @@ public class LazyLoadingConnectionCloseTest extends EntityManagerFactoryBasedFun
|
|||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
public SimpleEntity getParent() {
|
||||
return parent;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,21 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.joinfetch.enhanced;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Access;
|
||||
import jakarta.persistence.AccessType;
|
||||
import jakarta.persistence.Entity;
|
||||
|
|
@ -22,18 +30,10 @@ import jakarta.persistence.JoinColumn;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyGroup;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-12298")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
|
|
@ -90,7 +90,6 @@ public class JoinFetchWithEnhancementTest {
|
|||
}
|
||||
|
||||
@OneToMany(targetEntity=OtherEntity.class, mappedBy="employee", fetch=FetchType.LAZY)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@LazyGroup("pOtherEntites")
|
||||
@Access(AccessType.PROPERTY)
|
||||
public Set<OtherEntity> getOtherEntities() {
|
||||
|
|
@ -117,7 +116,6 @@ public class JoinFetchWithEnhancementTest {
|
|||
private String id;
|
||||
|
||||
@ManyToOne
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
@LazyGroup("Employee")
|
||||
@JoinColumn(name = "Employee_Id")
|
||||
private Employee employee = null;
|
||||
|
|
|
|||
|
|
@ -12,10 +12,7 @@ import jakarta.persistence.Id;
|
|||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
|
||||
/**
|
||||
* @author Steve Ebersole
|
||||
|
|
@ -33,7 +30,6 @@ public class Flight {
|
|||
private Airport origination;
|
||||
|
||||
@ManyToOne( fetch = LAZY )
|
||||
@LazyToOne( NO_PROXY )
|
||||
private Airport destination;
|
||||
|
||||
public Flight() {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import org.junit.jupiter.api.Test;
|
|||
* Same as {@link LazyToOneTest} except here we have bytecode-enhanced entities
|
||||
* via {@link BytecodeEnhanced}
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
Airport.class, Flight.class
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
|
|||
/**
|
||||
* Same as {@link InstrumentedLazyToOneTest} except here we enable bytecode-enhanced proxies
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
Airport.class, Flight.class
|
||||
|
|
|
|||
|
|
@ -7,13 +7,8 @@
|
|||
package org.hibernate.orm.test.mapping.lazytoone;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.BytecodeLazyAttributeInterceptor;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
|
||||
|
|
@ -27,6 +22,14 @@ import org.hibernate.testing.orm.junit.DomainModel;
|
|||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
|
|
@ -36,18 +39,14 @@ import static org.hamcrest.CoreMatchers.notNullValue;
|
|||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
import static org.hamcrest.CoreMatchers.sameInstance;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* Baseline test for uni-directional to-one, using an explicit @LazyToOne(NO_PROXY)
|
||||
*
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
ManyToOneExplicitOptionTests.Customer.class, ManyToOneExplicitOptionTests.Order.class
|
||||
|
|
@ -232,7 +231,6 @@ public class ManyToOneExplicitOptionTests {
|
|||
@Id
|
||||
private Integer id;
|
||||
@ManyToOne( fetch = LAZY )
|
||||
@LazyToOne( NO_PROXY )
|
||||
private Customer customer;
|
||||
private BigDecimal amount;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,7 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.mapping.lazytoone.mappedby;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
|
||||
import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata;
|
||||
|
|
@ -29,16 +23,21 @@ import org.junit.jupiter.api.AfterEach;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
* Baseline test for inverse (mappedBy) to-one, using an explicit @LazyToOne(NO_PROXY)
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
InverseToOneExplicitOptionTests.Customer.class, InverseToOneExplicitOptionTests.SupplementalInfo.class
|
||||
|
|
@ -217,7 +216,6 @@ public class InverseToOneExplicitOptionTests {
|
|||
private Integer id;
|
||||
|
||||
@OneToOne( fetch = LAZY, mappedBy = "supplementalInfo", optional = false )
|
||||
@LazyToOne( value = NO_PROXY )
|
||||
private Customer customer;
|
||||
|
||||
private String something;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,7 @@
|
|||
*/
|
||||
package org.hibernate.orm.test.mapping.lazytoone.onetoone;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.BytecodeLazyAttributeInterceptor;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor;
|
||||
import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
|
||||
|
|
@ -30,6 +24,11 @@ import org.junit.jupiter.api.AfterEach;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
|
|
@ -38,12 +37,12 @@ import static org.hamcrest.CoreMatchers.notNullValue;
|
|||
import static org.hamcrest.CoreMatchers.nullValue;
|
||||
import static org.hamcrest.CoreMatchers.sameInstance;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hibernate.annotations.LazyToOneOption.NO_PROXY;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* Baseline test for uni-directional one-to-one, using an explicit @LazyToOne(NO_PROXY) and allowing enhanced proxies
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
OneToOneExplicitOptionTests.Customer.class, OneToOneExplicitOptionTests.SupplementalInfo.class
|
||||
|
|
@ -229,7 +228,6 @@ public class OneToOneExplicitOptionTests {
|
|||
private Integer id;
|
||||
|
||||
@OneToOne( fetch = LAZY, optional = false )
|
||||
@LazyToOne( value = NO_PROXY )
|
||||
private Customer customer;
|
||||
|
||||
private String something;
|
||||
|
|
|
|||
|
|
@ -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 related to {@link org.hibernate.annotations.LazyToOne}, especially
|
||||
* regarding handling of {@link org.hibernate.annotations.LazyToOneOption#NO_PROXY}
|
||||
*/
|
||||
package org.hibernate.orm.test.mapping.lazytoone;
|
||||
|
|
@ -7,16 +7,8 @@
|
|||
package org.hibernate.orm.test.mapping.lazytoone.polymorphic;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Inheritance;
|
||||
import jakarta.persistence.InheritanceType;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
|
||||
|
|
@ -30,6 +22,13 @@ import org.junit.jupiter.api.AfterEach;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Inheritance;
|
||||
import jakarta.persistence.InheritanceType;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
import static jakarta.persistence.FetchType.LAZY;
|
||||
import static org.hamcrest.CoreMatchers.instanceOf;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
|
|
@ -39,6 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
/**
|
||||
* @author Steve Ebersole
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
PolymorphicToOneExplicitOptionTests.Order.class,
|
||||
|
|
@ -153,7 +153,6 @@ public class PolymorphicToOneExplicitOptionTests {
|
|||
private Integer id;
|
||||
private BigDecimal amount;
|
||||
@ManyToOne( fetch = LAZY, optional = false )
|
||||
@LazyToOne( LazyToOneOption.NO_PROXY )
|
||||
private Customer customer;
|
||||
|
||||
public Order() {
|
||||
|
|
|
|||
|
|
@ -7,29 +7,29 @@
|
|||
package org.hibernate.orm.test.proxy;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.hibernate.testing.TestForIssue;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.JiraKey;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.CascadeType;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
|
||||
import org.hibernate.testing.TestForIssue;
|
||||
import org.hibernate.testing.orm.junit.DomainModel;
|
||||
import org.hibernate.testing.orm.junit.SessionFactory;
|
||||
import org.hibernate.testing.orm.junit.SessionFactoryScope;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* @author Christian Beikov
|
||||
*/
|
||||
@TestForIssue(jiraKey = "HHH-9638")
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@JiraKey("HHH-9638")
|
||||
@DomainModel(
|
||||
annotatedClasses = {
|
||||
ProxyReferenceEqualityTest.A.class,
|
||||
|
|
@ -38,8 +38,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
)
|
||||
@SessionFactory
|
||||
public class ProxyReferenceEqualityTest {
|
||||
|
||||
|
||||
@AfterEach
|
||||
public void tearDown(SessionFactoryScope scope){
|
||||
scope.inTransaction(
|
||||
|
|
@ -74,7 +72,6 @@ public class ProxyReferenceEqualityTest {
|
|||
Long id;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
|
||||
@LazyToOne(LazyToOneOption.NO_PROXY)
|
||||
B b;
|
||||
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -9,20 +9,12 @@ package org.hibernate.orm.test.serialization;
|
|||
import java.io.Serializable;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import org.hibernate.Hibernate;
|
||||
import org.hibernate.annotations.Fetch;
|
||||
import org.hibernate.annotations.FetchMode;
|
||||
import org.hibernate.annotations.LazyCollection;
|
||||
import org.hibernate.annotations.LazyCollectionOption;
|
||||
import org.hibernate.annotations.LazyToOne;
|
||||
import org.hibernate.annotations.LazyToOneOption;
|
||||
import org.hibernate.cfg.AvailableSettings;
|
||||
import org.hibernate.internal.util.SerializationHelper;
|
||||
import org.hibernate.proxy.AbstractLazyInitializer;
|
||||
|
|
@ -37,6 +29,13 @@ import org.hibernate.testing.orm.junit.Setting;
|
|||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.OneToMany;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
|
@ -44,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||
/**
|
||||
* @author Selaron
|
||||
*/
|
||||
@SuppressWarnings("JUnitMalformedDeclaration")
|
||||
@DomainModel(annotatedClasses = {
|
||||
EntityProxySerializationTest.SimpleEntity.class, EntityProxySerializationTest.ChildEntity.class
|
||||
})
|
||||
|
|
@ -245,7 +245,6 @@ public class EntityProxySerializationTest {
|
|||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn
|
||||
@LazyToOne(LazyToOneOption.PROXY)
|
||||
public SimpleEntity getParent() {
|
||||
return parent;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue