HHH-13658 : Remove @LazyToOne(NO_PROXY) from classes used with byteco…

…de-proxies enabled. FetchGraphTest#testRandomAccess failed so it was marked @FailureExpected. (cherry picked from commit 602926b)
hibernate · Jan 14, 2021 · 15e59b3 · 15e59b3
1 parent ee1b4ab
commit 15e59b3
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 46 deletions.
diff --git a/...te-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java b/...te-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/AbstractKey.java
@@ -40,29 +40,24 @@ public abstract class AbstractKey extends ModelEntity
 	String name;
 
 	@OneToMany(targetEntity = RoleEntity.class, mappedBy = "key", fetch = FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("R")
 	protected Set<RoleEntity> roles = new LinkedHashSet<>();
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("PR")
 	@JoinColumn
 	protected AbstractKey register;
 
 	@OneToMany(targetEntity = AbstractKey.class, mappedBy = "register", fetch = FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("RK")
 	protected Set<AbstractKey> keys = new LinkedHashSet();
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("PP")
 	@JoinColumn
 	protected AbstractKey parent;
 
 	@OneToMany(targetEntity = AbstractKey.class, mappedBy = "parent", fetch = FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("PK")
 	protected Set<AbstractKey> otherKeys = new LinkedHashSet();
 

diff --git a/...rnate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java b/...rnate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/Activity.java
@@ -52,7 +52,6 @@ public void setDescription(String description) {
 	}
 
 	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("Instruction")
 	@JoinColumn(name = "Instruction_Id")
 	public Instruction getInstruction() {
@@ -66,7 +65,6 @@ public void setInstruction(Instruction instruction) {
 
 	@SuppressWarnings("unused")
 	@ManyToOne(fetch=FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("webApplication")
 	@JoinColumn(name="web_app_oid")
 	public WebApplication getWebApplication() {

diff --git a/...src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java b/...src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java
@@ -246,7 +246,6 @@ public static class Employee {
 		private String name;
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Employer employer;
 	}
 

diff --git a/.../test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java b/.../test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BidirectionalProxyTest.java
@@ -211,7 +211,6 @@ public AEntity getA() {
 		}
 
 		@ManyToOne(fetch= FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@LazyGroup("aEntity")
 		@JoinColumn(name="aEntity")
 		protected AEntity aChildEntity = null;
@@ -249,7 +248,6 @@ public AChildEntity getA() {
 		}
 
 		@ManyToOne(fetch= FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@LazyGroup("aEntity")
 		@JoinColumn(name="aEntity")
 		protected AChildEntity aChildEntity = null;

diff --git a/.../hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java b/.../hibernate/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java
@@ -212,7 +212,6 @@ public static class CodeTableItem extends BaseEntity {
 		private CodeTable codeTable;
 
 		@OneToOne( mappedBy = "defaultItem", fetch=FetchType.LAZY )
-		@LazyToOne( LazyToOneOption.NO_PROXY )
 		@LazyGroup( "defaultItemInverse" )
 		protected CodeTable defaultItemInverse;
 

diff --git a/...core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/...core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java
@@ -38,6 +38,7 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.stat.spi.StatisticsImplementor;
 
+import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
 import org.hibernate.testing.bytecode.enhancement.EnhancementOptions;
@@ -199,6 +200,7 @@ assert sessionFactory().getMetamodel()
 	}
 
 	@Test
+	@FailureExpected( jiraKey = "HHH-13658")
 	public void testRandomAccess() {
 		final StatisticsImplementor stats = sessionFactory().getStatistics();
 		stats.clear();
@@ -787,22 +789,17 @@ public static class DEntity extends BaseEntity {
 
 		// ****** Relations *****************
 		@OneToOne(fetch = FetchType.LAZY)
-//		@LazyToOne(LazyToOneOption.PROXY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@LazyGroup("a")
 		public AEntity a;
 
 		@OneToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
-//		@LazyToOne(LazyToOneOption.PROXY)
 		@LazyGroup("c")
 		public CEntity c;
 
 		@OneToMany(targetEntity = BEntity.class)
 		public Set<BEntity> bs;
 
 		@OneToOne(mappedBy = "d", fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@LazyGroup("e")
 		private EEntity e;
 

diff --git a/...t/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java b/...t/bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatefulTest.java
@@ -264,19 +264,15 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Animal animal = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Primate primate = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human human = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human otherHuman = null;
 
 		protected OtherEntity() {

diff --git a/.../bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java b/.../bytecode/enhancement/lazy/proxy/LazyToOnesNoProxyFactoryWithSubclassesStatelessTest.java
@@ -264,19 +264,15 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Animal animal = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Primate primate = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human human = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human otherHuman = null;
 
 		protected OtherEntity() {

diff --git a/...ibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java b/...ibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyMergeWithSubclassesTest.java
@@ -831,15 +831,12 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Animal animal = null;
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Primate primate = null;
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human human = null;
 
 		protected OtherEntity() {

diff --git a/...nate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java b/...nate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesStatelessTest.java
@@ -298,15 +298,12 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Animal animal = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Primate primate = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human human = null;
 
 		protected OtherEntity() {

diff --git a/...org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java b/...org/hibernate/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java
@@ -366,15 +366,12 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Animal animal = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Primate primate = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Human human = null;
 
 		protected OtherEntity() {

diff --git a/...t/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java b/...t/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java
@@ -180,7 +180,6 @@ public static class Employee {
 		private String name;
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Employer employer;
 	}
 

diff --git a/...bernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java b/...bernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java
@@ -203,7 +203,6 @@ public static class Employee {
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 		@JoinColumn(foreignKey = @ForeignKey(value= ConstraintMode.NO_CONSTRAINT))
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@NotFound(action=NotFoundAction.IGNORE)
 		private Employer employer;
 	}

diff --git a/...rg/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java b/...rg/hibernate/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java
@@ -183,7 +183,6 @@ public static class Employee {
 
 		@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 		@JoinColumn(foreignKey = @ForeignKey(value= ConstraintMode.NO_CONSTRAINT))
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@NotFound(action=NotFoundAction.IGNORE)
 		private Employer employer;
 	}

diff --git a/...java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java b/...java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyBidirectionalTest.java
@@ -153,7 +153,6 @@ public static class EmployerInfo {
 
 		@MapsId
 		@OneToOne(optional = false, fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Employer employer;
 
 		private String info;
@@ -165,7 +164,6 @@ public static class Employer {
 		private int id;
 
 		@OneToOne(optional = false, fetch = FetchType.LAZY, mappedBy = "employer", cascade = CascadeType.ALL)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private EmployerInfo employerInfo;
 
 		private String name;

diff --git a/...ava/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java b/...ava/org/hibernate/test/bytecode/enhancement/lazy/proxy/MapsIdProxyUnidirectionalTest.java
@@ -122,7 +122,6 @@ public static class EmployerInfo {
 
 		@MapsId
 		@OneToOne(optional = false, fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private Employer employer;
 
 	}

diff --git a/...est/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java b/...est/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/MergeDetachedToProxyTest.java
@@ -177,7 +177,6 @@ public static class AEntity {
 		private int id;
 
 		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		private BEntity bEntity;
 	}
 

diff --git a/...bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java b/...bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyEagerManyToOneTest.java
@@ -302,7 +302,6 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@JoinColumn(name = "Employee_Id")
 		protected Employee employee = null;
 

diff --git a/...ibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java b/...ibernate/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
@@ -302,12 +302,10 @@ public static class OtherEntity {
 		private String id;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@JoinColumn(name = "Employee_Id")
 		protected Employee employee = null;
 
 		@ManyToOne(fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		@JoinColumn(name = "EmployeeParent_Id")
 		protected EmployeeParent employeeParent = null;
 

diff --git a/...a/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java b/...a/org/hibernate/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java
@@ -283,7 +283,6 @@ private static class Child {
 		Long id;
 
 		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		Parent parent;
 
 		@OneToMany

diff --git a/...ytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java b/...ytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java
@@ -235,7 +235,6 @@ private static class Child {
 		Long id;
 
 		@ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-		@LazyToOne(LazyToOneOption.NO_PROXY)
 		Parent parent;
 
 		@OneToMany

diff --git a/...core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java b/...core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/WebApplication.java
@@ -59,7 +59,6 @@ public void setSiteUrl(String siteUrl) {
 	}
 
 	@OneToMany(mappedBy="webApplication", fetch= FetchType.LAZY)
-	@LazyToOne(LazyToOneOption.NO_PROXY)
 	@LazyGroup("app_activity_group")
 //	@CollectionType(type="baseutil.technology.hibernate.IskvLinkedSetCollectionType")
 	public Set<Activity> getActivities() {