HHH-7797 minor refactoring

hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java

@@ -42,19 +42,22 @@ public class DefaultUniqueDelegate implements UniqueDelegate {
 	}
 
 	@Override
-	public String applyUniqueToColumn( org.hibernate.mapping.Table table,
+	public void generateUniqueKey( org.hibernate.mapping.Table table,
 			org.hibernate.mapping.Column column ) {
 		org.hibernate.mapping.UniqueKey uk = table.getOrCreateUniqueKey(
 				column.getQuotedName( dialect ) + '_' );
 		uk.addColumn( column );
-		return "";
 	}
 
 	@Override
-	public String applyUniqueToColumn( Table table, Column column ) {
+	public void generateUniqueKey( Table table, Column column ) {
 		UniqueKey uk = table.getOrCreateUniqueKey( column.getColumnName()
 				.encloseInQuotesIfQuoted( dialect ) + '_' );
 		uk.addColumn( column );
+	}
+	
+	@Override
+	public String applyUniqueToColumn() {
 		return "";
 	}
 
@@ -85,8 +88,8 @@ public class DefaultUniqueDelegate implements UniqueDelegate {
 	@Override
 	public String applyUniquesOnAlter( UniqueKey uniqueKey  ) {
 		// Do this here, rather than allowing UniqueKey/Constraint to do it.
-				// We need full, simplified control over whether or not it happens.
+		// We need full, simplified control over whether or not it happens.
-				return new StringBuilder( "alter table " )
+		return new StringBuilder( "alter table " )
 				.append( uniqueKey.getTable().getQualifiedName( dialect ) )
 				.append( " add constraint " )
 				.append( uniqueKey.getName() )

hibernate-core/src/main/java/org/hibernate/dialect/unique/UniqueDelegate.java

@@ -45,29 +45,32 @@ import org.hibernate.metamodel.relational.UniqueKey;
 public interface UniqueDelegate {
 	
 	/**
-	 * If the delegate supports unique constraints, this method should simply
+	 * If the dialect supports unique constraints, create and add a UniqueKey
-	 * create the UniqueKey on the Table.  Otherwise, the constraint isn't
+	 * to the Table.
-	 * supported and "unique" should be returned in order to add it
-	 * to the column definition.
 	 * 
 	 * @param table
 	 * @param column
-	 * @return String
 	 */
-	public String applyUniqueToColumn( org.hibernate.mapping.Table table,
+	public void generateUniqueKey( org.hibernate.mapping.Table table,
 			org.hibernate.mapping.Column column );
 	
 	/**
-	 * If the delegate supports unique constraints, this method should simply
+	 * If the dialect supports unique constraints, create and add a UniqueKey
-	 * create the UniqueKey on the Table.  Otherwise, the constraint isn't
+	 * to the Table.
-	 * supported and "unique" should be returned in order to add it
-	 * to the column definition.
 	 * 
 	 * @param table
 	 * @param column
+	 */
+	public void generateUniqueKey( Table table, Column column );
+	
+	/**
+	 * If the dialect does not supports unique constraints, this method should
+	 * return the syntax necessary to mutate the column definition
+	 * (usually "unique").
+	 * 
 	 * @return String
 	 */
-	public String applyUniqueToColumn( Table table, Column column );
+	public String applyUniqueToColumn();
 	
 	/**
 	 * If constraints are supported, but not in seperate alter statements,

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

@@ -422,7 +422,10 @@ public class Table implements RelationalModel, Serializable {
 				}
 
 				if ( column.isUnique() ) {
-					alter.append( dialect.getUniqueDelegate().applyUniqueToColumn( this, column ) );
+					dialect.getUniqueDelegate().generateUniqueKey(
+							this, column );
+					alter.append(
+							dialect.getUniqueDelegate().applyUniqueToColumn() );
 				}
 
 				if ( column.hasCheckConstraint() && dialect.supportsColumnCheck() ) {
@@ -521,8 +524,8 @@ public class Table implements RelationalModel, Serializable {
 			}
 			
 			if ( col.isUnique() ) {
-				buf.append( dialect.getUniqueDelegate().applyUniqueToColumn( this, col ) );
+				dialect.getUniqueDelegate().generateUniqueKey( this, col );
-			}
+				buf.append( dialect.getUniqueDelegate().applyUniqueToColumn() );			}
 				
 			if ( col.hasCheckConstraint() && dialect.supportsColumnCheck() ) {
 				buf.append( " check (" )

hibernate-core/src/main/java/org/hibernate/metamodel/relational/Table.java

@@ -200,7 +200,8 @@ public class Table extends AbstractTableSpecification implements Exportable {
 			}
 
 			if ( col.isUnique() ) {
-				buf.append( dialect.getUniqueDelegate().applyUniqueToColumn( this, col ) );
+				dialect.getUniqueDelegate().generateUniqueKey( this, col );
+				buf.append( dialect.getUniqueDelegate().applyUniqueToColumn() );
 			}
 
 			if ( col.getCheckCondition() != null && dialect.supportsColumnCheck() ) {