HHH-19324 - Switch tests using hbm.xml to use mapping.xml

sebersole · sebersole · commit b0681b11a442 · 2025-05-06T16:50:28.000-05:00
HHH-19428 - Support @ListIndexBase in mapping.xml
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
@@ -38,6 +38,9 @@ public interface JaxbPluralAttribute extends JaxbPersistentAttribute, JaxbLockab
 	JaxbOrderColumnImpl getOrderColumn();
 	void setOrderColumn(JaxbOrderColumnImpl value);
 
+	Integer getListIndexBase();
+	void setListIndexBase(Integer value);
+
 	String getSort();
 	void setSort(String value);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/SimpleTypeInterpretation.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.internal.util.StringHelper;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
@@ -74,6 +75,7 @@ public enum SimpleTypeInterpretation {
 	JDBC_TIME( Time.class ),
 	CALENDAR( Calendar.class ),
 	TIME_ZONE( TimeZone.class ),
+	SERIALIZABLE( Serializable.class ),
 
 	PRIMITIVE_BOOLEAN( boolean.class, BOOLEAN ),
 	PRIMITIVE_BYTE( byte.class, BYTE ),
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java
@@ -13,6 +13,7 @@
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.models.annotations.internal.BatchSizeAnnotation;
 import org.hibernate.boot.models.annotations.internal.FetchAnnotation;
+import org.hibernate.boot.models.annotations.internal.ListIndexBaseAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyClassJpaAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyColumnJpaAnnotation;
 import org.hibernate.boot.models.annotations.internal.MapKeyEnumeratedJpaAnnotation;
@@ -28,8 +29,8 @@
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
-import org.hibernate.models.spi.MutableMemberDetails;
 import org.hibernate.models.spi.ModelsContext;
+import org.hibernate.models.spi.MutableMemberDetails;
 
 /**
  * @author Marco Belladelli
@@ -217,9 +218,19 @@ private static void applyOrderColumn(
 					xmlDocumentContext.getModelBuildingContext()
 			);
 
+
 			if ( jaxbOrderColumn != null ) {
 				orderColumnAnn.apply( jaxbOrderColumn, xmlDocumentContext );
 			}
 		}
+
+		final Integer listIndexBase = jaxbPluralAttribute.getListIndexBase();
+		if ( listIndexBase != null ) {
+			final ListIndexBaseAnnotation annUsage = (ListIndexBaseAnnotation) memberDetails.applyAnnotationUsage(
+					HibernateAnnotations.LIST_INDEX_BASE,
+					xmlDocumentContext.getModelBuildingContext()
+			);
+			annUsage.value( listIndexBase );
+		}
 	}
 }
diff --git a/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-7.0.xsd b/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-7.0.xsd
@@ -3288,6 +3288,8 @@
                     <xsd:complexType/>
                 </xsd:element>
             </xsd:choice>
+            <!-- @ListIndexBase -->
+            <xsd:element name="list-index-base" type="xsd:int" minOccurs="0"/>
             <xsd:choice>
                 <xsd:element name="map-key" type="orm:map-key" minOccurs="0"/>
                 <xsd:sequence>
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java
@@ -13,16 +13,20 @@
 import org.hibernate.collection.spi.PersistentList;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.mapping.List;
+import org.hibernate.mapping.PersistentClass;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.sql.ComparisonRestriction;
 import org.hibernate.sql.SimpleSelect;
 
+import org.hibernate.testing.orm.junit.DomainModelScope;
 import org.hibernate.testing.orm.junit.JiraKey;
 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.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -37,6 +41,17 @@
 @SessionFactory
 public class PersistentListTest {
 
+	@Test
+	void checkListIndexBase(DomainModelScope modelScope) {
+		final PersistentClass listOwnerBinding = modelScope.getEntityBinding( ListOwner.class );
+		final List childrenMapping = (List) listOwnerBinding.getProperty( "children" ).getValue();
+		assertThat( childrenMapping.getBaseIndex() ).isEqualTo( 1 );
+
+		final PersistentClass orderBinding = modelScope.getEntityBinding( Order.class );
+		final List lineItemsMapping = (List) orderBinding.getProperty( "lineItems" ).getValue();
+		assertThat( lineItemsMapping.getBaseIndex() ).isEqualTo( 1 );
+	}
+
 	@Test
 	@JiraKey(value = "HHH-5732")
 	public void testInverseListIndex(SessionFactoryScope scope) {
@@ -89,11 +104,11 @@ public void testInverseListIndex(SessionFactoryScope scope) {
 									valueMap.put( name, position );
 								}
 								assertEquals( 2, valueMap.size() );
-
-								// c1 should be list index 0
-								assertEquals( Integer.valueOf( 0 ), valueMap.get( "c1" ) );
-								// c2 should be list index 1
-								assertEquals( Integer.valueOf( 1 ), valueMap.get( "c2" ) );
+								// account for list-index-base = 1
+								// c1 should be list index 1 (0+1)
+								assertEquals( Integer.valueOf( 1 ), valueMap.get( "c1" ) );
+								// c2 should be list index 2 (1+1)_
+								assertEquals( Integer.valueOf( 2 ), valueMap.get( "c2" ) );
 							}
 					);
 					session2.remove( root );
@@ -151,9 +166,10 @@ public void testInverseListIndex2(SessionFactoryScope scope) {
 									valueMap.put( prodCode, indx );
 								}
 								assertEquals( 3, valueMap.size() );
-								assertEquals( Integer.valueOf( 0 ), valueMap.get( "abc" ) );
-								assertEquals( Integer.valueOf( 1 ), valueMap.get( "def" ) );
-								assertEquals( Integer.valueOf( 2 ), valueMap.get( "ghi" ) );
+								// account for list-index-base = 1
+								assertEquals( Integer.valueOf( 1 ), valueMap.get( "abc" ) );
+								assertEquals( Integer.valueOf( 2 ), valueMap.get( "def" ) );
+								assertEquals( Integer.valueOf( 3 ), valueMap.get( "ghi" ) );
 							}
 					);
 					session2.remove( order );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 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.criteria.CriteriaBuilder;
@@ -21,7 +22,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -31,14 +31,18 @@
 @SuppressWarnings("JUnitMalformedDeclaration")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsNoColumnInsert.class)
 @DomainModel(xmlMappings = {
-		"org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml",
+		"org/hibernate/orm/test/collection/original/UserPermissions.xml",
 		"org/hibernate/orm/test/collection/original/Zoo.xml",
 })
 @SessionFactory
 public class CollectionTest {
+	@AfterEach
+	void dropTestData(SessionFactoryScope factoryScope) {
+		factoryScope.dropData();
+	}
 
 	@Test
-	public void testExtraLazy(SessionFactoryScope scope) {
+	public void testLaziness(SessionFactoryScope scope) {
 		scope.inTransaction(
 				s -> {
 					User u = new User( "gavin" );
@@ -51,15 +55,13 @@ public void testExtraLazy(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				s -> {
-					User u = s.get( User.class, "gavin" );
+					User u = s.find( User.class, "gavin" );
 
 					assertFalse( Hibernate.isInitialized( u.getPermissions() ) );
 					assertEquals( 2, u.getPermissions().size() );
 					assertTrue( u.getPermissions().contains( new Permission( "obnoxiousness" ) ) );
 					assertFalse( u.getPermissions().contains( new Permission( "silliness" ) ) );
-					assertNotNull( u.getPermissions().get( 1 ) );
-					assertNull( u.getPermissions().get( 3 ) );
-					assertFalse( Hibernate.isInitialized( u.getPermissions() ) );
+					assertTrue( Hibernate.isInitialized( u.getPermissions() ) );
 
 					assertFalse( Hibernate.isInitialized( u.getSessionData() ) );
 					assertEquals( 1, u.getSessionData().size() );
@@ -69,15 +71,12 @@ public void testExtraLazy(SessionFactoryScope scope) {
 					assertFalse( u.getSessionData().containsValue( "bar" ) );
 					assertEquals( "foo value", u.getSessionData().get( "foo" ) );
 					assertNull( u.getSessionData().get( "bar" ) );
-					assertFalse( Hibernate.isInitialized( u.getSessionData() ) );
+					assertTrue( Hibernate.isInitialized( u.getSessionData() ) );
 
-					assertFalse( Hibernate.isInitialized( u.getSessionData() ) );
 					u.getSessionData().put( "bar", "bar value" );
 					u.getSessionAttributeNames().add( "bar" );
-					assertFalse( Hibernate.isInitialized( u.getSessionAttributeNames() ) );
+					assertTrue( Hibernate.isInitialized( u.getSessionAttributeNames() ) );
 					assertTrue( Hibernate.isInitialized( u.getSessionData() ) );
-
-					s.remove( u );
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.collection.original;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15,43 +16,54 @@
  */
 public class User {
 	private String userName;
-	private List permissions = new ArrayList();
-	private List emailAddresses = new ArrayList();
-	private Map sessionData = new HashMap();
-	private Set sessionAttributeNames = new HashSet();
+	private List<Permission> permissions = new ArrayList<>();
+	private List<Email> emailAddresses = new ArrayList<>();
+	private Map<String, Serializable> sessionData = new HashMap<>();
+	private Set<String> sessionAttributeNames = new HashSet<>();
 
 	User() {}
+
 	public User(String name) {
 		userName = name;
 	}
-	public List getPermissions() {
-		return permissions;
-	}
-	public void setPermissions(List permissions) {
-		this.permissions = permissions;
-	}
+
 	public String getUserName() {
 		return userName;
 	}
+
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
-	public List getEmailAddresses() {
+
+	public List<Permission> getPermissions() {
+		return permissions;
+	}
+
+	public void setPermissions(List<Permission> permissions) {
+		this.permissions = permissions;
+	}
+
+	public List<Email> getEmailAddresses() {
 		return emailAddresses;
 	}
-	public void setEmailAddresses(List emailAddresses) {
+
+	public void setEmailAddresses(List<Email> emailAddresses) {
 		this.emailAddresses = emailAddresses;
 	}
-	public Map getSessionData() {
+
+	public Map<String, Serializable> getSessionData() {
 		return sessionData;
 	}
-	public void setSessionData(Map sessionData) {
+
+	public void setSessionData(Map<String, Serializable> sessionData) {
 		this.sessionData = sessionData;
 	}
-	public Set getSessionAttributeNames() {
+
+	public Set<String> getSessionAttributeNames() {
 		return sessionAttributeNames;
 	}
-	public void setSessionAttributeNames(Set sessionAttributeNames) {
+
+	public void setSessionAttributeNames(Set<String> sessionAttributeNames) {
 		this.sessionAttributeNames = sessionAttributeNames;
 	}
 }
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/list/Mappings.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/list/Mappings.xml
@@ -16,6 +16,7 @@
             </many-to-one>
             <one-to-many name="children" mapped-by="parent" target-entity="ListOwner">
                 <order-column name="list_index"/>
+                <list-index-base>1</list-index-base>
                 <cascade>
                     <cascade-all/>
                 </cascade>
@@ -32,6 +33,7 @@
             <basic name="code"/>
             <one-to-many name="lineItems" mapped-by="order">
                 <order-column name="list_index"/>
+                <list-index-base>1</list-index-base>
                 <cascade>
                     <cascade-all/>
                 </cascade>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/original/UserPermissions.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/collection/original/UserPermissions.xml
