Constraints should be consistently created with a Table

(cherry picked from commit 7c6b7c6)

Author: gavinking

hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java

@@ -24,6 +24,12 @@ public abstract class Constraint implements Exportable, Serializable {
 	private Table table;
 	private String options = "";
 
+	Constraint() {}
+
+	Constraint(Table table) {
+		this.table = table;
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -76,6 +82,7 @@ public Table getTable() {
 		return table;
 	}
 
+	@Deprecated(since = "7")
 	public void setTable(Table table) {
 		this.table = table;
 	}

hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java

@@ -29,10 +29,11 @@ public class ForeignKey extends Constraint {
 	private final List<Column> referencedColumns = new ArrayList<>();
 	private boolean creationEnabled = true;
 
-	public ForeignKey(Table table){
-		setTable( table );
+	public ForeignKey(Table table) {
+		super( table );
 	}
 
+	@Deprecated(since = "7")
 	public ForeignKey() {
 	}
 

hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java

@@ -22,10 +22,11 @@ public class PrimaryKey extends Constraint {
 	private UniqueKey orderingUniqueKey = null;
 	private int[] originalOrder;
 
-	public PrimaryKey(Table table){
-		setTable( table );
+	public PrimaryKey(Table table) {
+		super( table );
 	}
 
+	@Deprecated(since = "7")
 	public PrimaryKey() {
 	}
 

hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java

@@ -22,10 +22,11 @@ public class UniqueKey extends Constraint {
 	private boolean nameExplicit; // true when the constraint name was explicitly specified by @UniqueConstraint annotation
 	private boolean explicit; // true when the constraint was explicitly specified by @UniqueConstraint annotation
 
-	public UniqueKey(Table table){
-		setTable( table );
+	public UniqueKey(Table table) {
+		super( table );
 	}
 
+	@Deprecated(since = "7")
 	public UniqueKey() {
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java

@@ -143,9 +143,8 @@ public void testAlterTableDropConstraintString() {
 		PostgreSQLDialect dialect = new PostgreSQLDialect();
 		AlterTableUniqueDelegate alterTable = new AlterTableUniqueDelegate( dialect );
 		final Table table = new Table( "orm", "table_name" );
-		final UniqueKey uniqueKey = new UniqueKey();
+		final UniqueKey uniqueKey = new UniqueKey( table );
 		uniqueKey.setName( "unique_something" );
-		uniqueKey.setTable( table );
 		final String sql = alterTable.getAlterTableToDropUniqueKeyCommand(
 				uniqueKey,
 				null,

hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ExportIdentifierTest.java

@@ -88,9 +88,8 @@ private void addTables(
 			final Table table = new Table( "orm", namespace, Identifier.toIdentifier( name ), false );
 			addExportIdentifier( table, exportIdentifierList, exportIdentifierSet );
 
-			final ForeignKey foreignKey = new ForeignKey();
+			final ForeignKey foreignKey = new ForeignKey( table );
 			foreignKey.setName( name );
-			foreignKey.setTable( table );
 			addExportIdentifier( foreignKey, exportIdentifierList, exportIdentifierSet );
 
 			final Index index = new Index();
@@ -102,9 +101,8 @@ private void addTables(
 			primaryKey.setName( name );
 			addExportIdentifier( primaryKey, exportIdentifierList, exportIdentifierSet );
 
-			final UniqueKey uniqueKey = new UniqueKey();
+			final UniqueKey uniqueKey = new UniqueKey( table );
 			uniqueKey.setName( name );
-			uniqueKey.setTable( table );
 			addExportIdentifier( uniqueKey, exportIdentifierList, exportIdentifierSet );
 		}
 	}