HHH-19387 - Reformat and reword test entities

Author: mira-silhavy

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java

@@ -1634,8 +1634,8 @@ public void resolveState(EntityInitializerData data) {
 						castNonNull( discriminatorAssembler ),
 						entityDescriptor
 				);
-				if (data.concreteDescriptor == null) {
-					// Return because the value is null
+				if ( data.concreteDescriptor == null ) {
+					// this should imply the entity is missing
 					return;
 				}
 			}

hibernate-core/src/test/java/org/hibernate/orm/test/querycache/EntityWithCollectionReloadCacheInheritanceTest.java

@@ -4,22 +4,6 @@
  */
 package org.hibernate.orm.test.querycache;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
-
-import org.hibernate.testing.orm.junit.DomainModel;
-import org.hibernate.testing.orm.junit.Jira;
-import org.hibernate.testing.orm.junit.SessionFactory;
-import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import jakarta.persistence.Access;
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.DiscriminatorValue;
@@ -28,20 +12,34 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.type.SqlTypes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 
-import static jakarta.persistence.AccessType.FIELD;
 import static jakarta.persistence.EnumType.STRING;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * @author miroslav silhavy
+ * @author Miroslav Silhavy
  */
 @DomainModel(annotatedClasses = {
 		EntityWithCollectionReloadCacheInheritanceTest.HighSchoolStudent.class,
-		EntityWithCollectionReloadCacheInheritanceTest.DefaultSubject.class,
+		EntityWithCollectionReloadCacheInheritanceTest.Subject.class,
 		EntityWithCollectionReloadCacheInheritanceTest.EnglishSubject.class
 })
 @SessionFactory
@@ -51,7 +49,7 @@ public class EntityWithCollectionReloadCacheInheritanceTest {
 	@Test
 	public void test(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
-			List<HighSchoolStudent> list = session.createQuery(
+			List<HighSchoolStudent> highSchoolStudents = session.createQuery(
 							"select s" +
 									" from HighSchoolStudent s left join fetch s.subjects m" +
 									" where s.name in :names", HighSchoolStudent.class
@@ -60,9 +58,9 @@ public void test(SessionFactoryScope scope) {
 					.setCacheable( true )
 					.list();
 
-			assertThat( list ).hasSize( 1 );
+			assertThat( highSchoolStudents ).hasSize( 1 );
 
-			list = session.createQuery(
+			highSchoolStudents = session.createQuery(
 							"select s" +
 									" from HighSchoolStudent s left join fetch s.subjects m" +
 									" where s.name in :names", HighSchoolStudent.class
@@ -71,7 +69,7 @@ public void test(SessionFactoryScope scope) {
 					.setCacheable( true )
 					.list();
 
-			assertThat( list ).hasSize( 2 );
+			assertThat( highSchoolStudents ).hasSize( 2 );
 		} );
 	}
 
@@ -94,7 +92,6 @@ public void tearDown(SessionFactoryScope scope) {
 	}
 
 	@Entity(name = "HighSchoolStudent")
-	@Access(FIELD)
 	static class HighSchoolStudent {
 
 		@Id
@@ -105,12 +102,12 @@ static class HighSchoolStudent {
 		@Column(name = "name")
 		private String name;
 
-		@ManyToMany(targetEntity = DefaultSubject.class, fetch = FetchType.LAZY)
+		@ManyToMany(targetEntity = Subject.class, fetch = FetchType.LAZY)
 		@JoinTable(name = "STUDENT_SUBJECT",
 				joinColumns = { @JoinColumn(name = "student_id") },
 				inverseJoinColumns = { @JoinColumn(name = "subject_id") }
 		)
-		private Set<DefaultSubject> subjects;
+		private Set<Subject> subjects;
 
 		public Long getId() {
 			return id;
@@ -128,37 +125,32 @@ public void setName(String name) {
 			this.name = name;
 		}
 
-		public Set<DefaultSubject> getSubjects() {
+		public Set<Subject> getSubjects() {
 			return subjects;
 		}
 
-		public void setMajors(Set<DefaultSubject> subjects) {
+		public void setSubjects(Set<Subject> subjects) {
 			this.subjects = subjects;
 		}
 
 	}
 
-	@Entity(name = "DefaultSubject")
+	@Entity(name = "Subject")
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 	@DiscriminatorValue("DEFAULT")
 	@DiscriminatorColumn(name = "TYPE", length = 20)
-	@Access(FIELD)
-	static class DefaultSubject {
+	static class Subject {
 
-		enum SubjectType {
-			DEFAULT,
-			ENGLISH
-		}
+		@Id
+		@GeneratedValue
+		@Column(name = "id")
+		private Long id;
 
 		@Column(name = "TYPE", nullable = false, length = 20, insertable = false, updatable = false)
 		@Enumerated(STRING)
 		@JdbcTypeCode(SqlTypes.VARCHAR)
 		private SubjectType type;
 
-		@Id
-		@GeneratedValue
-		@Column(name = "id")
-		private Long id;
-
 		public Long getId() {
 			return id;
 		}
@@ -171,8 +163,12 @@ public void setId(Long id) {
 
 	@Entity(name = "EnglishSubject")
 	@DiscriminatorValue("ENGLISH")
-	@Access(FIELD)
-	static class EnglishSubject extends DefaultSubject {
+	static class EnglishSubject extends Subject {
+	}
+
+	enum SubjectType {
+		DEFAULT,
+		ENGLISH
 	}
 
 }