HHH-7709 - change org.hibernate.type.ForeignKeyDirection to enum

Author: stliu

hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java

@@ -1695,8 +1695,9 @@ public static void bindOneToOne(Element node, OneToOne oneToOne, String path, bo
 		oneToOne.setConstrained( constrained );
 
 		oneToOne.setForeignKeyType( constrained ?
-				ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT :
-				ForeignKeyDirection.FOREIGN_KEY_TO_PARENT );
+				ForeignKeyDirection.FROM_PARENT :
+				ForeignKeyDirection.TO_PARENT
+		);
 
 		initOuterJoinFetchSetting( node, oneToOne );
 		initLaziness( node, oneToOne, mappings, true );

hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java

@@ -104,8 +104,8 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
 		if ( !optional ) value.setConstrained( true );
 		value.setForeignKeyType(
 				value.isConstrained() ?
-						ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT :
-						ForeignKeyDirection.FOREIGN_KEY_TO_PARENT
+						ForeignKeyDirection.FROM_PARENT :
+						ForeignKeyDirection.TO_PARENT
 		);
 		PropertyBinder binder = new PropertyBinder();
 		binder.setName( propertyName );

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java

@@ -212,14 +212,14 @@ protected void entityIsTransient(MergeEvent event, Map copyCache) {
 		// copy created before we actually copy
 		//cascadeOnMerge(event, persister, entity, copyCache, Cascades.CASCADE_BEFORE_MERGE);
 		super.cascadeBeforeSave(source, persister, entity, copyCache);
-		copyValues(persister, entity, copy, source, copyCache, ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT);
+		copyValues(persister, entity, copy, source, copyCache, ForeignKeyDirection.FROM_PARENT );
 
 		saveTransientEntity( copy, entityName, event.getRequestedId(), source, copyCache );
 
 		// cascade first, so that all unsaved objects get their
 		// copy created before we actually copy
 		super.cascadeAfterSave(source, persister, entity, copyCache);
-		copyValues(persister, entity, copy, source, copyCache, ForeignKeyDirection.FOREIGN_KEY_TO_PARENT);
+		copyValues(persister, entity, copy, source, copyCache, ForeignKeyDirection.TO_PARENT );
 
 		event.setResult( copy );
 	}
@@ -392,7 +392,7 @@ protected void copyValues(
 
 		final Object[] copiedValues;
 
-		if ( foreignKeyDirection == ForeignKeyDirection.FOREIGN_KEY_TO_PARENT ) {
+		if ( foreignKeyDirection == ForeignKeyDirection.TO_PARENT ) {
 			// this is the second pass through on a merge op, so here we limit the
 			// replacement to associations types (value types were already replaced
 			// during the first pass)

hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java

@@ -760,7 +760,7 @@ protected boolean isDuplicateAssociation(final String foreignKeyTable, final Str
 	protected boolean isDuplicateAssociation(final String lhsTable, final String[] lhsColumnNames, final AssociationType type) {
 		final String foreignKeyTable;
 		final String[] foreignKeyColumns;
-		if ( type.getForeignKeyDirection()==ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT ) {
+		if ( type.getForeignKeyDirection()==ForeignKeyDirection.FROM_PARENT ) {
 			foreignKeyTable = lhsTable;
 			foreignKeyColumns = lhsColumnNames;
 		}

hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java

@@ -383,7 +383,7 @@ public Object replace(
 			Object owner,
 			Map copyCache,
 			ForeignKeyDirection foreignKeyDirection) {
-		return ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT == foreignKeyDirection
+		return ForeignKeyDirection.FROM_PARENT == foreignKeyDirection
 				? getReplacement( (T) original, (T) target, session )
 				: target;
 	}

hibernate-core/src/main/java/org/hibernate/type/AbstractType.java

@@ -173,7 +173,7 @@ public Object replace(
 			include = atype.getForeignKeyDirection()==foreignKeyDirection;
 		}
 		else {
-			include = ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT==foreignKeyDirection;
+			include = ForeignKeyDirection.FROM_PARENT ==foreignKeyDirection;
 		}
 		return include ? replace(original, target, session, owner, copyCache) : target;
 	}

hibernate-core/src/main/java/org/hibernate/type/AnyType.java

@@ -327,8 +327,8 @@ public boolean isComponentType() {
 	}
 
 	public ForeignKeyDirection getForeignKeyDirection() {
-		//return AssociationType.FOREIGN_KEY_TO_PARENT; //this is better but causes a transient object exception...
-		return ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT;
+		//return AssociationType.TO_PARENT; //this is better but causes a transient object exception...
+		return ForeignKeyDirection.FROM_PARENT;
 	}
 
 	public boolean isAssociationType() {

hibernate-core/src/main/java/org/hibernate/type/CollectionType.java

@@ -321,7 +321,7 @@ public boolean isAssociationType() {
 	}
 
 	public ForeignKeyDirection getForeignKeyDirection() {
-		return ForeignKeyDirection.FOREIGN_KEY_TO_PARENT;
+		return ForeignKeyDirection.TO_PARENT;
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/type/ForeignKeyDirection.java

@@ -23,52 +23,39 @@
  */
 package org.hibernate.type;
 
-import java.io.Serializable;
-
 import org.hibernate.engine.internal.Cascade;
 
 /**
  * Represents directionality of the foreign key constraint
+ *
  * @author Gavin King
  */
-public abstract class ForeignKeyDirection implements Serializable {
-	protected ForeignKeyDirection() {}
-	/**
-	 * Should we cascade at this cascade point?
-	 * @see org.hibernate.engine.internal.Cascade
-	 */
-	public abstract boolean cascadeNow(int cascadePoint);
-
+public enum ForeignKeyDirection {
 	/**
 	 * A foreign key from child to parent
 	 */
-	public static final ForeignKeyDirection FOREIGN_KEY_TO_PARENT = new ForeignKeyDirection() {
+	TO_PARENT {
+		@Override
 		public boolean cascadeNow(int cascadePoint) {
-			return cascadePoint!=Cascade.BEFORE_INSERT_AFTER_DELETE;
+			return cascadePoint != Cascade.BEFORE_INSERT_AFTER_DELETE;
 		}
 
-		public String toString() {
-			return "toParent";
-		}
-		
-		Object readResolve() {
-			return FOREIGN_KEY_TO_PARENT;
-		}
-	};
+	},
 	/**
 	 * A foreign key from parent to child
 	 */
-	public static final ForeignKeyDirection FOREIGN_KEY_FROM_PARENT = new ForeignKeyDirection() {
+	FROM_PARENT {
+		@Override
 		public boolean cascadeNow(int cascadePoint) {
-			return cascadePoint!= Cascade.AFTER_INSERT_BEFORE_DELETE;
-		}
-
-		public String toString() {
-			return "fromParent";
-		}
-		
-		Object readResolve() {
-			return FOREIGN_KEY_FROM_PARENT;
+			return cascadePoint != Cascade.AFTER_INSERT_BEFORE_DELETE;
 		}
 	};
+
+	/**
+	 * Should we cascade at this cascade point?
+	 *
+	 * @see org.hibernate.engine.internal.Cascade
+	 */
+	public abstract boolean cascadeNow(int cascadePoint);
+
 }

hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java

@@ -143,7 +143,7 @@ public void nullSafeSet(
 	}
 
 	public ForeignKeyDirection getForeignKeyDirection() {
-		return ForeignKeyDirection.FOREIGN_KEY_FROM_PARENT;
+		return ForeignKeyDirection.FROM_PARENT;
 	}
 
 	public Object hydrate(

hibernate-core/src/main/java/org/hibernate/type/OneToOneType.java

@@ -142,7 +142,7 @@ public Object hydrate(
 	}
 
 	protected boolean isNullable() {
-		return foreignKeyType==ForeignKeyDirection.FOREIGN_KEY_TO_PARENT;
+		return foreignKeyType==ForeignKeyDirection.TO_PARENT;
 	}
 
 	public boolean useLHSPrimaryKey() {