HHH-18693 Changed Hibernate Core tests to make metamodel classes generation possible

cigaly · cigaly · commit 965c5f0cb3f1 · 2024-10-16T13:24:32.000+02:00
- static inner class MUST NOT be private
          - changed full upper case property names
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java
@@ -38,7 +38,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	}
 
 	@Entity(name = "Event")
-	private static class Event {
+	static class Event {
 
 		@Id
 		@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java
@@ -38,7 +38,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	}
 
 	@Entity(name = "Event")
-	private static class Event {
+	static class Event {
 
 		@Id
 		@GeneratedValue
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateCallbacksTestAction.java
@@ -34,7 +34,7 @@ protected List<String> getManagedClassNames() {
 	}
 
 	@Entity(name = "booking")
-	private static class Booking {
+	static class Booking {
 		@Id Long id;
 		@Transient String legacyIdentifier;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/InheritedAttributeAssociationTest.java
@@ -44,7 +44,7 @@ public void test() {
 	// --- //
 
 	@Entity
-	private static class Author {
+	static class Author {
 
 		@Id
 		@GeneratedValue
@@ -60,7 +60,7 @@ private static class Author {
 	@MappedSuperclass
 	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 	@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING)
-	private static abstract class Item {
+	static abstract class Item {
 
 		@Id
 		@GeneratedValue
@@ -72,6 +72,6 @@ private static abstract class Item {
 
 	@Entity
 	@DiscriminatorValue("child")
-	private static class ChildItem extends Item {
+	static class ChildItem extends Item {
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationListTest.java
@@ -41,7 +41,7 @@ public void testBidirectionalExisting() {
 	// -- //
 
 	@Entity
-	private static class Group {
+	static class Group {
 
 		@Id
 		Long id;
@@ -63,7 +63,7 @@ void resetUsers() {
 	}
 
 	@Entity
-	private static class User {
+	static class User {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/ManyToManyAssociationTest.java
@@ -68,7 +68,7 @@ public void test() {
 	// -- //
 
 	@Entity
-	private static class Group {
+	static class Group {
 
 		@Id
 		Long id;
@@ -90,7 +90,7 @@ void resetUsers() {
 	}
 
 	@Entity
-	private static class User {
+	static class User {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToManyAssociationTest.java
@@ -67,7 +67,7 @@ public void test() {
 	// --- //
 
 	@Entity
-	private static class Customer {
+	static class Customer {
 
 		@Id
 		Long id;
@@ -97,7 +97,7 @@ void removeInventory(CustomerInventory inventory) {
 	}
 
 	@Entity
-	private static class CustomerInventory {
+	static class CustomerInventory {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java
@@ -71,7 +71,7 @@ public void testSetNull() {
 	// --- //
 
 	@Entity
-	private static class Customer {
+	static class Customer {
 
 		@Id
 		Long id;
@@ -89,7 +89,7 @@ void setUser(User newUser) {
 	}
 
 	@Entity
-	private static class User {
+	static class User {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicEnhancementTest.java
@@ -124,7 +124,7 @@ public void basicExtendedEnhancementTest() {
 	// --- //
 
 	@Entity
-	private static class SimpleEntity {
+	static class SimpleEntity {
 
 		Object anUnspecifiedObject;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java
@@ -53,7 +53,7 @@ public void test() {
 	// --- //
 
 	@Entity
-	private static class Customer {
+	static class Customer {
 
 		@Id
 		Long id;
@@ -67,7 +67,7 @@ private static class Customer {
 	}
 
 	@Entity
-	private static class User {
+	static class User {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/InheritedTest.java
@@ -92,7 +92,7 @@ public void extendedEnhancementTest() {
 	// --- //
 
 	@Entity
-	private static abstract class Person {
+	static abstract class Person {
 
 		Object anUnspecifiedObject;
 
@@ -116,7 +116,7 @@ void setOca(long l) {
 	}
 
 	@Entity
-	private static class Employee extends Person {
+	static class Employee extends Person {
 
 		String title;
 
@@ -134,7 +134,7 @@ void setTitle(String title) {
 	}
 
 	@Entity
-	private static class Contractor extends Person {
+	static class Contractor extends Person {
 
 		Integer rate;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/MappedSuperclassTest.java
@@ -79,7 +79,7 @@ public void extendedEnhancementTest() {
 	// --- //
 
 	@MappedSuperclass
-	private static class Person {
+	static class Person {
 
 		Object anUnspecifiedObject;
 
@@ -102,7 +102,7 @@ void setOca(long l) {
 	}
 
 	@Entity
-	private static class Employee extends Person {
+	static class Employee extends Person {
 
 		String title;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingEmbeddableTest.java
@@ -38,7 +38,7 @@ public void test() {
 	// --- //
 
 	@Embeddable
-	private static class Address1 {
+	static class Address1 {
 		String street1;
 		String street2;
 		String city;
@@ -47,7 +47,7 @@ private static class Address1 {
 		String phone;
 	}
 
-	private static class Address2 {
+	static class Address2 {
 		String street1;
 		String street2;
 		String city;
@@ -57,7 +57,7 @@ private static class Address2 {
 	}
 
 	@Entity
-	private static class SimpleEntity {
+	static class SimpleEntity {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingTest.java
@@ -100,7 +100,7 @@ public void test() {
 	// --- //
 
 	@Embeddable
-	private static class Address {
+	static class Address {
 		@Embedded
 		Country country;
 		String street1;
@@ -112,12 +112,12 @@ private static class Address {
 	}
 
 	@Embeddable
-	private static class Country {
+	static class Country {
 		String name;
 	}
 
 	@Entity
-	private static class SimpleEntity {
+	static class SimpleEntity {
 
 		@Id
 		Long id;
@@ -149,7 +149,7 @@ public void setSomeNumber(Long someNumber) {
 	}
 
 	@Entity
-	private static class OtherEntity {
+	static class OtherEntity {
 		@Id
 		Long id;
 		String name;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java
@@ -131,7 +131,7 @@ public void cleanup() {
 	@Table( name = "PERSON" )
 	@DynamicUpdate
 	@DynamicInsert
-	private static class Person {
+	static class Person {
 
 		@Id
 		Long id;
@@ -155,7 +155,7 @@ private static class Person {
 	@Table( name = "PERSON_ADDRESS" )
 	@DynamicUpdate
 	@DynamicInsert
-	private static class PersonAddress {
+	static class PersonAddress {
 
 		@Id
 		Long id;
@@ -168,7 +168,7 @@ private static class PersonAddress {
 	@Table(name = "NULLABLE_PERSON")
 	@DynamicUpdate
 	@DynamicInsert
-	private static class NullablePerson {
+	static class NullablePerson {
 
 		@Id
 		Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java
@@ -266,7 +266,7 @@ private void loadBook(long bookId, Session session) {
 	@Entity(name = "Book")
 	@Cacheable
 	@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-	private static final class Book {
+	static final class Book {
 
 		@Id
 		private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/HANACalcViewTest.java
@@ -165,7 +165,7 @@ public void testCalcViewDTO() throws Exception {
 
 	@Entity(name = "CVEntity")
 	@Table(name = CALC_VIEW_NAME)
-	private static class CVEntity {
+	static class CVEntity {
 
 		private String dummydummy;
 		private double dummydouble;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/MergeContextTest.java
@@ -425,7 +425,7 @@ private void checkCacheConsistency(MergeContext cache, int expectedSize) {
 	}
 
 	@Entity
-	private static class Simple {
+	static class Simple {
 		@Id
 		private int value;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java
@@ -67,7 +67,7 @@ public void testAllPropertiesCopied() {
 	}
 
 	@Entity(name = "`Order`")
-	private static class Order {
+	static class Order {
 		@Id
 		public Long id;
 
@@ -99,7 +99,7 @@ public int hashCode() {
 	}
 
 	@Entity(name = "Item")
-	private static class Item {
+	static class Item {
 		@Id
 		public Long id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java
@@ -74,7 +74,7 @@ public void testAllPropertiesCopied() {
 	}
 
 	@Entity
-	private static class Order {
+	static class Order {
 		@Id
 		public Long id;
 
@@ -106,7 +106,7 @@ public int hashCode() {
 	}
 
 	@Entity
-	private static class Item {
+	static class Item {
 		@Id
 		@GeneratedValue(strategy = GenerationType.IDENTITY)
 		public Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java
@@ -661,7 +661,7 @@ protected Class[] getAnnotatedClasses() {
 	}
 
 	@Entity(name = "AnEntity")
-	private static class AnEntity {
+	static class AnEntity {
 		@Id
 		private long id;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateCustomEntityDirtinessStrategyTest.java
@@ -122,7 +122,7 @@ public boolean isPersonLastUpdatedAtChanged() {
 
 	@Entity(name = "Person")
 	@DynamicUpdate
-	private static class Person {
+	static class Person {
 		@Id
 		@GeneratedValue
 		private int id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateDirtyCheckingInterceptorTest.java
@@ -96,7 +96,7 @@ private SessionBuilder sessionWithInterceptor() {
 
 	@Entity(name = "Person")
 	@DynamicUpdate
-	private static class Person {
+	static class Person {
 		@Id
 		@GeneratedValue
 		private int id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/QuoteTest.java
@@ -134,7 +134,7 @@ protected Class[] getAnnotatedClasses() {
 
 	@Entity( name = "Item" )
 	@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-	private static abstract class Item {
+	static abstract class Item {
 
 		@Id @GeneratedValue
 		@Column(name = "`ID`")
@@ -150,14 +150,14 @@ private static abstract class Item {
 
 	@Entity
 	@Table(name = "`CoNTaiNeR`")
-	private static class Container extends Item {
+	static class Container extends Item {
 
 		@OneToMany(mappedBy = "parent", targetEntity = Item.class)
 		private Set<Item> items = new HashSet<Item>( 0 );
 	}
 
 	@Entity
 	@Table(name = "`SimpleItem`")
-	private static class SimpleItem extends Item {
+	static class SimpleItem extends Item {
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/quote/TableGeneratorQuotingTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schematools/PrimaryKeyColumnOrderTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/IdentityGenerationValidationTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/SynonymValidationTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/ViewValidationTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortComparatorTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/map/SortNaturalTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortComparatorTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sorted/set/SortNaturalTest.java

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected Class<?>[] getAnnotatedClasses() {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Entity(name = "Event")`
`41`		`- private static class Event {`
	`41`	`+ static class Event {`
`42`	`42`
`43`	`43`	`@Id`
`44`	`44`	`@GeneratedValue`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected List<String> getManagedClassNames() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Entity(name = "booking")`
`37`		`- private static class Booking {`
	`37`	`+ static class Booking {`
`38`	`38`	`@Id Long id;`
`39`	`39`	`@Transient String legacyIdentifier;`
`40`	`40`