HHH-7304 Minor cleanup

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

@@ -195,12 +195,12 @@ public abstract class AbstractEntityInsertAction extends EntityAction {
 	/**
 	 * Handle sending notifications needed for natural-id after saving
 	 */
-	public void handleNaturalIdPostSaveNotifications(Serializable id) {
+	public void handleNaturalIdPostSaveNotifications(Serializable generatedId) {
 		if (isEarlyInsert()) {
 			// with early insert, we still need to add a local (transactional) natural id cross-reference
 			getSession().getPersistenceContext().getNaturalIdHelper().manageLocalNaturalIdCrossReference(
 					getPersister(),
-					id,
+					generatedId,
 					state,
 					null,
 					CachedNaturalIdValueSource.INSERT

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

@@ -26,8 +26,6 @@ package org.hibernate.event.internal;
 import java.io.Serializable;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.LockMode;
 import org.hibernate.NonUniqueObjectException;
 import org.hibernate.action.internal.AbstractEntityInsertAction;
@@ -51,6 +49,7 @@ import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeHelper;
+import org.jboss.logging.Logger;
 
 /**
  * A convenience bas class for listeners responding to save events.

hibernate-core/src/test/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java

@@ -23,14 +23,13 @@
  */
 package org.hibernate.test.jpa.naturalid;
 
-import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.hibernate.Session;
 import org.hibernate.test.jpa.AbstractJPATest;
 import org.hibernate.testing.TestForIssue;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
 /**
  * @author Steve Ebersole