fix up

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceEnabledTest.java

@@ -6,11 +6,9 @@
 
 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.OneToOne;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.Jpa;
@@ -25,107 +23,63 @@
 		annotatedClasses = {
 				JpaProxyComplianceEnabledTest.Provider.class,
 				JpaProxyComplianceEnabledTest.TelephoneNumber.class,
-				JpaProxyComplianceEnabledTest.VoiceGroup.class,
 		},
 		proxyComplianceEnabled = true
 )
-@JiraKey( "HHH-19476" )
+@JiraKey("HHH-19476")
 public class JpaProxyComplianceEnabledTest {
 
-	private static final Integer VOICE_GROUP_ID = 1;
+	private static final Integer PROVIDER_ID = 1;
+	private static final Integer TELEPHONE_NUMBER_ID = 2;
 
 	@BeforeAll
 	public static void init(EntityManagerFactoryScope scope) {
-		scope.inTransaction(
-				entityManager -> {
-					VoiceGroup voiceGroup = new VoiceGroup(VOICE_GROUP_ID);
-					entityManager.persist( voiceGroup );
-
-					Provider provider = new Provider("A Provider");
-					entityManager.persist( provider );
-
-					TelephoneNumber telephoneNumber1 = new TelephoneNumber("123-456-7890",voiceGroup,provider);
-					entityManager.persist( telephoneNumber1 );
-				}
-		);
+		scope.inTransaction( entityManager -> {
+			Provider provider = new Provider( PROVIDER_ID, "A Provider" );
+			entityManager.persist( provider );
+
+			TelephoneNumber telephoneNumber1 = new TelephoneNumber(
+					TELEPHONE_NUMBER_ID,
+					"123-456-7890",
+					provider
+			);
+			entityManager.persist( telephoneNumber1 );
+		} );
 	}
 
 	@Test
 	public void testJoinFetchAfterFind(EntityManagerFactoryScope scope) {
-		scope.inTransaction(
-				entityManager -> {
-					VoiceGroup voiceGroup = entityManager.find(VoiceGroup.class, VOICE_GROUP_ID);
-					List<TelephoneNumber> telephoneNumbers = entityManager.createQuery(
-									"from TelephoneNumber t join fetch t.provider where t.voiceGroup = :voiceGroup",
-									TelephoneNumber.class
-							)
-							.setParameter( "voiceGroup", voiceGroup )
-							.getResultList();
-					assertThat(telephoneNumbers.size()).isEqualTo(1);
-				}
-
-		);
-		scope.inTransaction(
-				entityManager -> {
-					VoiceGroup voiceGroup = entityManager.find( VoiceGroup.class, VOICE_GROUP_ID);
-					voiceGroup.getPrimaryNumber().getNumber();
+		scope.inTransaction( entityManager -> {
+					TelephoneNumber telephoneNumber = entityManager.find( TelephoneNumber.class, TELEPHONE_NUMBER_ID );
 					List<TelephoneNumber> telephoneNumbers = entityManager.createQuery(
-									"from TelephoneNumber t join fetch t.provider where t.voiceGroup = :voiceGroup",
-									TelephoneNumber.class
-							)
-							.setParameter( "voiceGroup", voiceGroup )
+									"from TelephoneNumber t join fetch t.provider",
+									TelephoneNumber.class )
 							.getResultList();
-					assertThat(telephoneNumbers.size()).isEqualTo(1);
+					assertThat( telephoneNumbers.size() ).isEqualTo( 1 );
 				}
 		);
 	}
 
-	@Entity(name = "VoiceGroup")
-	public static class VoiceGroup {
-		@Id
-		private Integer id;
-		@OneToOne
-		@JoinColumn(name = "primaryNumber")
-		private TelephoneNumber primaryNumber;
-
-		public VoiceGroup() {
-		}
-
-		public VoiceGroup(Integer id) {
-			this.id = id;
-		}
-
-		public Integer getId() {
-			return id;
-		}
-
-		public TelephoneNumber getPrimaryNumber() {
-			return primaryNumber;
-		}
-	}
-
 	@Entity(name = "TelephoneNumber")
 	public static class TelephoneNumber {
 		@Id
-		@GeneratedValue
 		private Integer id;
+
 		private String number;
-		@ManyToOne(fetch = FetchType.LAZY)
-		@JoinColumn(name = "voiceGroup", nullable = false)
-		private VoiceGroup voiceGroup;
+
 		@ManyToOne(fetch = FetchType.LAZY)
 		@JoinColumn(name = "provider", nullable = false)
 		private Provider provider;
 
 		public TelephoneNumber() {
 		}
 
-		public TelephoneNumber(String number, VoiceGroup voiceGroup, Provider provider) {
+		public TelephoneNumber(Integer id, String number, Provider provider) {
+			this.id = id;
 			this.number = number;
-			this.voiceGroup = voiceGroup;
-			voiceGroup.primaryNumber = this;
 			this.provider = provider;
 		}
+
 		public Integer getId() {
 			return id;
 		}
@@ -134,10 +88,6 @@ public String getNumber() {
 			return number;
 		}
 
-		public VoiceGroup getVoiceGroup() {
-			return voiceGroup;
-		}
-
 		public Provider getProvider() {
 			return provider;
 		}
@@ -147,14 +97,15 @@ public Provider getProvider() {
 	public static class Provider {
 
 		@Id
-		@GeneratedValue
 		private Integer id;
+
 		private String name;
 
 		public Provider() {
 		}
 
-		public Provider(String name) {
+		public Provider(Integer id, String name) {
+			this.id = id;
 			this.name = name;
 		}