HHH-17377 - Migrate to JPA 3.2

https://hibernate.atlassian.net/browse/HHH-17377

XJB changes (JAXB "binding model")

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

@@ -67,4 +67,14 @@ public interface JaxbPluralAttribute extends JaxbPersistentAttribute, JaxbLockab
 	void setMapKeyForeignKey(JaxbForeignKeyImpl value);
 
 	List<JaxbHbmFilterImpl> getFilters();
+
+	@Override
+	default Boolean isOptional() {
+		return null;
+	}
+
+	@Override
+	default void setOptional(Boolean optional) {
+
+	}
 }

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

@@ -17,4 +17,7 @@
 public interface JaxbStandardAttribute extends JaxbPersistentAttribute {
 	FetchType getFetch();
 	void setFetch(FetchType value);
+
+	Boolean isOptional();
+	void setOptional(Boolean optional);
 }

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCheckConstraint.java → hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java

@@ -2,9 +2,9 @@
  * Hibernate, Relational Persistence for Idiomatic Java
  *
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
- * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
  */
-package org.hibernate.boot.jaxb.mapping.spi;
+package org.hibernate.boot.jaxb.mapping.spi.db;
 
 /**
  * @author Steve Ebersole

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

@@ -0,0 +1,19 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+import java.util.List;
+
+import org.hibernate.boot.jaxb.mapping.spi.JaxbCheckConstraintImpl;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbCheckable {
+
+	List<JaxbCheckConstraintImpl> getCheckConstraints();
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * Base definition for XSD column mappings
+ *
+ * @author Steve Ebersole
+ */
+public interface JaxbColumn extends JaxbDatabaseObject {
+	String getName();
+
+	default String getTable() {
+		return null;
+	}
+}

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

@@ -0,0 +1,55 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.hibernate.boot.jaxb.mapping.spi.JaxbCheckConstraintImpl;
+
+/**
+ * Composition of the aspects of column definition most commonly exposed in XSD "column types"
+ *
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnCommon
+		extends JaxbColumn, JaxbColumnMutable, JaxbCheckable, JaxbColumnNullable, JaxbColumnUniqueable, JaxbColumnDefinable, JaxbCommentable {
+	@Override
+	default String getTable() {
+		return null;
+	}
+
+	@Override
+	default Boolean isNullable() {
+		return null;
+	}
+
+	@Override
+	default Boolean isInsertable() {
+		return null;
+	}
+
+	@Override
+	default Boolean isUpdatable() {
+		return null;
+	}
+
+	@Override
+	default String getComment() {
+		return null;
+	}
+
+	@Override
+	default Boolean isUnique() {
+		return null;
+	}
+
+	@Override
+	default List<JaxbCheckConstraintImpl> getCheckConstraints() {
+		return Collections.emptyList();
+	}
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnDefaultable extends JaxbColumn {
+	String getDefault();
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnDefinable extends JaxbColumn {
+	String getColumnDefinition();
+	String getOptions();
+}

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

@@ -0,0 +1,19 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+import org.hibernate.boot.jaxb.mapping.spi.JaxbForeignKeyImpl;
+
+/**
+ * Composition of the aspects of column definition for join "column types" exposed in XSD
+ *
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnJoined extends JaxbColumnCommon {
+	String getReferencedColumnName();
+	JaxbForeignKeyImpl getForeignKey();
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnMutable extends JaxbColumn {
+	Boolean isInsertable();
+	Boolean isUpdatable();
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnNullable extends JaxbColumn {
+
+	Boolean isNullable();
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnSizable extends JaxbColumn {
+	Integer getLength();
+
+	default Integer getPrecision() {
+		return null;
+	}
+
+	default Integer getScale() {
+		return null;
+	}
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * Composition of the aspects of column definition for standard "column types" exposed in XSD
+ *
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnStandard
+		extends JaxbColumn, JaxbColumnMutable, JaxbCheckable, JaxbColumnNullable, JaxbColumnUniqueable,
+		JaxbColumnDefinable, JaxbColumnSizable, JaxbColumnDefaultable, JaxbCommentable {
+
+	String getRead();
+	String getWrite();
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbColumnUniqueable extends JaxbColumn {
+	Boolean isUnique();
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbCommentable {
+	String getComment();
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+/**
+ * Marker interface for database objects
+ *
+ * @author Steve Ebersole
+ */
+public interface JaxbDatabaseObject {
+}

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

@@ -0,0 +1,19 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.boot.jaxb.mapping.spi.db;
+
+import org.hibernate.boot.jaxb.mapping.spi.JaxbSchemaAware;
+import org.hibernate.boot.jaxb.mapping.spi.db.JaxbCheckable;
+import org.hibernate.boot.jaxb.mapping.spi.db.JaxbDatabaseObject;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface JaxbTableMapping extends JaxbSchemaAware, JaxbCheckable, JaxbDatabaseObject {
+	String getComment();
+	String getOptions();
+}

hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-3.2.0.xsd

@@ -3086,6 +3086,7 @@
         <xsd:attribute name="attribute-accessor" type="xsd:string" />
         <xsd:attribute name="fetch" type="orm:fetch-type"/>
         <xsd:attribute name="fetch-mode" type="orm:singular-fetch-mode"/>
+        <xsd:attribute name="optional" type="xsd:boolean"/>
         <xsd:attribute name="optimistic-lock" type="xsd:boolean" default="true" />
     </xsd:complexType>
 
@@ -3097,7 +3098,7 @@
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="type" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="type" type="orm:discriminator-type" minOccurs="0"/>
             <xsd:element name="column" type="orm:column" minOccurs="0"/>
             <xsd:element name="mapping" type="orm:any-discriminator-value-mapping" maxOccurs="unbounded" />
         </xsd:sequence>