very minor code cleanups around ActionQueue

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java

@@ -149,23 +149,19 @@ protected final void evict() throws CacheException {
 
 	@Override
 	public String toString() {
-		return unqualify( getClass().getName() ) + infoString( collectionRole, key );
+		return unqualify( getClass().getName() )
+				+ infoString( collectionRole, key );
 	}
 
 	@Override
-	public int compareTo(ComparableExecutable o) {
+	public int compareTo(ComparableExecutable executable) {
 		// sort first by role name
-		final int roleComparison = collectionRole.compareTo( o.getPrimarySortClassifier() );
-		if ( roleComparison != 0 ) {
-			return roleComparison;
-		}
-		else {
-			//then by fk
-			return persister.getAttributeMapping().getKeyDescriptor().compare( key, o.getSecondarySortIndex() );
-//			//noinspection unchecked
-//			final JavaType<Object> javaType = (JavaType<Object>) persister.getAttributeMapping().getKeyDescriptor().getJavaType();
-//			return javaType.getComparator().compare( key, action.key );
-		}
+		final int roleComparison = collectionRole.compareTo( executable.getPrimarySortClassifier() );
+		return roleComparison != 0
+				? roleComparison
+				//then by fk
+				: persister.getAttributeMapping().getKeyDescriptor()
+						.compare( key, executable.getSecondarySortIndex() );
 	}
 
 	private static class CacheCleanupProcess implements AfterTransactionCompletionProcess {

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java

@@ -109,9 +109,9 @@ else if ( collection.needsRecreate( persister ) ) {
 	}
 
 	@Override
-	public int compareTo(ComparableExecutable o) {
-		if ( o instanceof CollectionUpdateAction that
-				&& getPrimarySortClassifier().equals( o.getPrimarySortClassifier() ) ) {
+	public int compareTo(ComparableExecutable executable) {
+		if ( executable instanceof CollectionUpdateAction that
+				&& getPrimarySortClassifier().equals( executable.getPrimarySortClassifier() ) ) {
 			final CollectionPersister persister = getPersister();
 			boolean hasDeletes = this.getCollection().getDeletes( persister, false ).hasNext();
 			boolean otherHasDeletes = that.getCollection().getDeletes( persister, false ).hasNext();
@@ -122,7 +122,7 @@ && getPrimarySortClassifier().equals( o.getPrimarySortClassifier() ) ) {
 				return 1;
 			}
 		}
-		return super.compareTo( o );
+		return super.compareTo( executable );
 	}
 
 	private void preUpdate() {

hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java

@@ -148,13 +148,14 @@ public String toString() {
 	}
 
 	@Override
-	public int compareTo(ComparableExecutable o) {
+	public int compareTo(ComparableExecutable executable) {
 		//sort first by entity name
-		final int roleComparison = entityName.compareTo( o.getPrimarySortClassifier() );
+		final int roleComparison = entityName.compareTo( executable.getPrimarySortClassifier() );
 		return roleComparison != 0
 				? roleComparison
 				//then by id
-				: persister.getIdentifierType().compare( id, o.getSecondarySortIndex(), session.getSessionFactory() );
+				: persister.getIdentifierType()
+						.compare( id, executable.getSecondarySortIndex(), session.getFactory() );
 	}
 
 	@Override
@@ -181,8 +182,12 @@ public void afterDeserialize(EventSource session) {
 		// guard against NullPointerException
 		if ( session != null ) {
 			this.session = session;
-			this.persister = session.getFactory().getMappingMetamodel().getEntityDescriptor( entityName );
-			this.instance = session.getPersistenceContext().getEntity( session.generateEntityKey( id, persister ) );
+			this.persister =
+					session.getFactory().getMappingMetamodel()
+							.getEntityDescriptor( entityName );
+			this.instance =
+					session.getPersistenceContext()
+							.getEntity( session.generateEntityKey( id, persister ) );
 		}
 	}