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

HHH-19310 - Simplified declaration of type for basic mappings in XML
HHH-19422 - Introduce @CollectionIdJavaClass

Author: sebersole

documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc

@@ -1,12 +1,11 @@
 [[collections]]
 === Collections
-:majorMinorVersion: 6.2
 :root-project-dir: ../../../../../../..
 :core-project-dir: {root-project-dir}/hibernate-core
 :core-test-base: {core-project-dir}/src/test/java
 :example-dir-collection: {core-test-base}/org/hibernate/orm/test/mapping/collections
 :docs-base: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}
-:javadoc-base: {docs-base}/javadoc
+:javadoc-base: {docs-base}/javadocs
 :java-javadoc-base: https://docs.oracle.com/en/java/javase/11/docs/api/java.base
 :extrasdir: extras/collections
 
@@ -285,7 +284,16 @@ is available to have Hibernate interpret a `List` with no `@OrderColumn` and no
 
 
 An ID_BAG is similar to a BAG, except that it maps a generated, per-row identifier into the collection
-table.  `@CollectionId` is the annotation to configure this identifier
+table.  `@CollectionId` is the annotation to configure this identifier.
+
+For details about defining an id-bad identifier, see the Javadocs for:
+
+* link:{javadoc-base}/org/hibernate/annotations/CollectionId.html[@CollectionId]
+* link:{javadoc-base}/org/hibernate/annotations/CollectionIdJavaClass.html[@CollectionIdJavaClass]
+* link:{javadoc-base}/org/hibernate/annotations/CollectionIdJavaType.html[@CollectionIdJavaType]
+* link:{javadoc-base}/org/hibernate/annotations/CollectionIdJdbcType.html[@CollectionIdJdbcType]
+* link:{javadoc-base}/org/hibernate/annotations/CollectionIdJdbcTypeCode.html[@CollectionIdJdbcTypeCode]
+* link:{javadoc-base}/org/hibernate/annotations/CollectionIdType.html[@CollectionIdType]
 
 
 // todo (6.0) - finish

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java

@@ -23,10 +23,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@DomainModel(
-		annotatedClasses = { Person.class },
-		xmlMappings = "org/hibernate/community/dialect/Person.hbm.xml"
-)
+@DomainModel(annotatedClasses = Person.class)
 @RequiresDialect(AltibaseDialect.class)
 @SessionFactory
 public class AltibaseFunctionsTest {

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/Person.java

@@ -4,9 +4,20 @@
  */
 package org.hibernate.community.dialect;
 
-import java.sql.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
 
+import java.sql.Date;
+import java.sql.Blob;
+import java.sql.Clob;
+
+@Entity
 public class Person {
+	@Id
+	@GeneratedValue
+	@SequenceGenerator(sequenceName = "PERSON_SEQ")
 	private int id;
 	private String name;
 	private Date birthDate;

hibernate-community-dialects/src/test/resources/org/hibernate/community/dialect/Person.hbm.xml

@@ -16,7 +16,14 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * Describe an identifier column for a bag.
+ * Describe the identifier for an id-bag.
+ *
+ * @see CollectionIdJavaClass
+ * @see CollectionIdJavaType
+ * @see CollectionIdJdbcType
+ * @see CollectionIdJdbcTypeCode
+ * @see CollectionIdMutability
+ * @see CollectionIdType
  *
  * @author Emmanuel Bernard
  */

hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java

@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.annotations;
+
+import org.hibernate.Incubating;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Specifies the Java class to use for the {@linkplain CollectionId id} of an id-bag mapping.
+ * An alternative to {@linkplain CollectionIdJavaType}.  E.g.
+ *
+ * <pre>
+ * &#64;Bag
+ * &#64;CollectionId(generator="increment")
+ * &#64;CollectionIdJavaClass(Integer.class)
+ * Collection&lt;Person&gt; authors;
+ * </pre>
+ *
+ * @since 7.1
+ *
+ * @author Steve Ebersole
+ */
+@Incubating
+@Target({METHOD, FIELD, ANNOTATION_TYPE})
+@Retention(RUNTIME)
+public @interface CollectionIdJavaClass {
+	/**
+	 * The Java class to use as the collection-id.
+	 */
+	Class<?> idType();
+}

hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaClass.java

@@ -18,6 +18,8 @@
 /**
  * Form of {@link JavaType} for describing the id of an id-bag mapping.
  *
+ * @see CollectionIdJavaClass
+ *
  * @since 6.0
  */
 @Inherited

hibernate-core/src/main/java/org/hibernate/annotations/CollectionIdJavaType.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
+import jakarta.persistence.DiscriminatorType;
+
 import java.util.List;
 
 /**
@@ -29,6 +31,8 @@ public interface JaxbAnyMapping extends JaxbPersistentAttribute {
 	 */
 	interface Key {
 		List<JaxbColumnImpl> getColumns();
+		String getType();
+		String getJavaClass();
 	}
 
 	/**
@@ -42,6 +46,11 @@ interface Discriminator {
 		 */
 		JaxbColumnImpl getColumn();
 
+		/**
+		 * The type of discriminator
+		 */
+		DiscriminatorType getType();
+
 		/**
 		 * Mapping of discriminator-values to the corresponding entity names
 		 */

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java

@@ -11,6 +11,12 @@
  * @author Steve Ebersole
  */
 public interface JaxbBasicMapping {
+	/**
+	 * The attribute's name
+	 */
+	String getName();
+	void setName(String name);
+
 	JaxbUserTypeImpl getType();
 
 	void setType(JaxbUserTypeImpl value);

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java

@@ -4,8 +4,13 @@
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * @author Steve Ebersole
  */
 public interface JaxbEmbeddable extends JaxbManagedType {
+	@Nullable
+	String getName();
+	void setName(@Nullable String name);
 }