From 92d817bb27b136fbcaefdc81f18d7c4d253ff841 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Sat, 18 Nov 2023 08:06:54 -0600 Subject: [PATCH] HHH-17377 - Migrate to JPA 3.2 https://hibernate.atlassian.net/browse/HHH-17377 XJB changes (JAXB "binding model") --- .../jaxb/mapping/spi/JaxbPluralAttribute.java | 10 ++++ .../mapping/spi/JaxbStandardAttribute.java | 3 + .../jaxb/mapping/spi/JaxbTableMapping.java | 15 ----- .../spi/{ => db}/JaxbCheckConstraint.java | 4 +- .../jaxb/mapping/spi/db/JaxbCheckable.java | 19 +++++++ .../boot/jaxb/mapping/spi/db/JaxbColumn.java | 20 +++++++ .../jaxb/mapping/spi/db/JaxbColumnCommon.java | 55 +++++++++++++++++++ .../mapping/spi/db/JaxbColumnDefaultable.java | 14 +++++ .../mapping/spi/db/JaxbColumnDefinable.java | 15 +++++ .../jaxb/mapping/spi/db/JaxbColumnJoined.java | 19 +++++++ .../mapping/spi/db/JaxbColumnMutable.java | 15 +++++ .../mapping/spi/db/JaxbColumnNullable.java | 15 +++++ .../mapping/spi/db/JaxbColumnSizable.java | 22 ++++++++ .../mapping/spi/db/JaxbColumnStandard.java | 20 +++++++ .../mapping/spi/db/JaxbColumnUniqueable.java | 14 +++++ .../jaxb/mapping/spi/db/JaxbCommentable.java | 14 +++++ .../mapping/spi/db/JaxbDatabaseObject.java | 15 +++++ .../jaxb/mapping/spi/db/JaxbTableMapping.java | 19 +++++++ .../hibernate/xsd/mapping/mapping-3.2.0.xsd | 3 +- .../src/main/xjb/mapping-bindings.xjb | 50 ++++++++++++----- 20 files changed, 329 insertions(+), 32 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbTableMapping.java rename hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/{ => db}/JaxbCheckConstraint.java (66%) create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java create mode 100644 hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java 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 index 01b8e2b433..3d85c9ca6e 100644 --- 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 @@ -67,4 +67,14 @@ public interface JaxbPluralAttribute extends JaxbPersistentAttribute, JaxbLockab void setMapKeyForeignKey(JaxbForeignKeyImpl value); List getFilters(); + + @Override + default Boolean isOptional() { + return null; + } + + @Override + default void setOptional(Boolean optional) { + + } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java index a25b7035ad..2ca98d8f0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbStandardAttribute.java @@ -17,4 +17,7 @@ import jakarta.persistence.FetchType; public interface JaxbStandardAttribute extends JaxbPersistentAttribute { FetchType getFetch(); void setFetch(FetchType value); + + Boolean isOptional(); + void setOptional(Boolean optional); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbTableMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbTableMapping.java deleted file mode 100644 index e70f9d4732..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbTableMapping.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 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 . - */ -package org.hibernate.boot.jaxb.mapping.spi; - -/** - * @author Steve Ebersole - */ -public interface JaxbTableMapping extends JaxbSchemaAware { - String getComment(); - String getOptions(); -} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCheckConstraint.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java similarity index 66% rename from hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCheckConstraint.java rename to hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckConstraint.java index d261661f65..934cd4d269 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbCheckConstraint.java +++ b/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 . + * 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 diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCheckable.java new file mode 100644 index 0000000000..0efd46fb0a --- /dev/null +++ b/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 getCheckConstraints(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumn.java new file mode 100644 index 0000000000..7c0d5ac220 --- /dev/null +++ b/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; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnCommon.java new file mode 100644 index 0000000000..c771ecdc50 --- /dev/null +++ b/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 getCheckConstraints() { + return Collections.emptyList(); + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefaultable.java new file mode 100644 index 0000000000..e6b601d3dc --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnDefinable.java new file mode 100644 index 0000000000..bcfbc81361 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnJoined.java new file mode 100644 index 0000000000..6ff7f42450 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnMutable.java new file mode 100644 index 0000000000..eeebfe6848 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnNullable.java new file mode 100644 index 0000000000..6317931fef --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnSizable.java new file mode 100644 index 0000000000..1ea2af4b17 --- /dev/null +++ b/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; + } +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnStandard.java new file mode 100644 index 0000000000..87cd8c6920 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbColumnUniqueable.java new file mode 100644 index 0000000000..26358ee7a3 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbCommentable.java new file mode 100644 index 0000000000..0346f6f285 --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbDatabaseObject.java new file mode 100644 index 0000000000..d141ee429c --- /dev/null +++ b/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 { +} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/db/JaxbTableMapping.java new file mode 100644 index 0000000000..10d314c05a --- /dev/null +++ b/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(); +} diff --git a/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-3.2.0.xsd b/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-3.2.0.xsd index 98e893d48f..0c5c343681 100644 --- a/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-3.2.0.xsd +++ b/hibernate-core/src/main/resources/org/hibernate/xsd/mapping/mapping-3.2.0.xsd @@ -3086,6 +3086,7 @@ + @@ -3097,7 +3098,7 @@ - + diff --git a/hibernate-core/src/main/xjb/mapping-bindings.xjb b/hibernate-core/src/main/xjb/mapping-bindings.xjb index 480bacd72d..e26c682b76 100644 --- a/hibernate-core/src/main/xjb/mapping-bindings.xjb +++ b/hibernate-core/src/main/xjb/mapping-bindings.xjb @@ -318,15 +318,6 @@ - - - - - - - - - org.hibernate.boot.jaxb.mapping.spi.JaxbSingularAttribute org.hibernate.boot.jaxb.mapping.spi.JaxbStandardAttribute @@ -430,12 +421,13 @@ + - org.hibernate.boot.jaxb.mapping.spi.JaxbTableMapping + org.hibernate.boot.jaxb.mapping.spi.db.JaxbTableMapping - org.hibernate.boot.jaxb.mapping.spi.JaxbCheckConstraint + org.hibernate.boot.jaxb.mapping.spi.db.JaxbCheckConstraint @@ -500,11 +492,11 @@ - org.hibernate.boot.jaxb.mapping.spi.JaxbTableMapping + org.hibernate.boot.jaxb.mapping.spi.db.JaxbTableMapping - org.hibernate.boot.jaxb.mapping.spi.JaxbTableMapping + org.hibernate.boot.jaxb.mapping.spi.db.JaxbTableMapping @@ -519,7 +511,7 @@ - org.hibernate.boot.jaxb.mapping.spi.JaxbTableMapping + org.hibernate.boot.jaxb.mapping.spi.db.JaxbTableMapping org.hibernate.boot.jaxb.mapping.spi.JaxbSchemaAware @@ -536,11 +528,41 @@ + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnStandard + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnJoined + + + + + + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnJoined + + + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumn + + + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnCommon + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnSizable + + + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnCommon + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnSizable + + + + org.hibernate.boot.jaxb.mapping.spi.db.JaxbColumnJoined + + org.hibernate.boot.jaxb.mapping.spi.JaxbLifecycleCallbackContainer