some very tiny cleanups

Author: gavinking

hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java

@@ -68,6 +68,7 @@ public String getPropertyName() {
 	@Override
 	public String getMessage() {
 		return super.getMessage() + " for entity "
-				+ qualify( propertyOwnerEntityName, propertyName ) + " -> " + transientEntityName;
+				+ qualify( propertyOwnerEntityName, propertyName )
+				+ " -> " + transientEntityName;
 	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java

@@ -71,28 +71,30 @@ default String getPartName() {
 	/**
 	 * Extract the identifier from an instance of the entity
 	 *
-	 * It's supposed to be use during the merging process
+	 * @apiNote Intended for use during the merging process
 	 */
 	default Object getIdentifier(Object entity, MergeContext mergeContext){
 		return getIdentifier( entity );
 	}
 
 	/**
-	 * Return the identifier of the persistent or transient object, or throw
-	 * an exception if the instance is "unsaved"
-	 * <p>
-	 * Used by OneToOneType and ManyToOneType to determine what id value should
-	 * be used for an object that may or may not be associated with the session.
-	 * This does a "best guess" using any/all info available to use (not just the
-	 * EntityEntry).
+	 * Return the identifier of the persistent or transient object, or throw an
+	 * exception if the instance is "unsaved"
+	 *
+	 * @apiNote This method is called by {@link org.hibernate.type.OneToOneType}
+	 * and {@link org.hibernate.type.ManyToOneType} to determine the id value
+	 * which should be used for an object that may or may not be associated with
+	 * the session. This does a "best guess" using any/all info available to use
+	 * (not just the {@link org.hibernate.engine.spi.EntityEntry}).
 	 *
 	 * @param entity The entity instance
 	 * @param session The session
 	 *
 	 * @return The identifier
 	 *
-	 * @throws TransientObjectException if the entity is transient (does not yet have an identifier)
-	 * @see org.hibernate.engine.internal.ForeignKeys#getEntityIdentifierIfNotUnsaved(String, Object, SharedSessionContractImplementor)
+	 * @throws TransientObjectException if the entity is transient
+	 *                                  (does not yet have an identifier)
+	 * @see org.hibernate.engine.internal.ForeignKeys#getEntityIdentifierIfNotUnsaved
 	 * @since 6.1.1
 	 */
 	default Object getIdentifierIfNotUnsaved(Object entity, SharedSessionContractImplementor session) {
@@ -103,20 +105,23 @@ else if ( session == null ) {
 			// If we have no session available, just return the identifier
 			return getIdentifier( entity );
 		}
-		Object id = session.getContextEntityIdentifier( entity );
+		final Object id = session.getContextEntityIdentifier( entity );
 		if ( id == null ) {
-			// context-entity-identifier returns null explicitly if the entity
-			// is not associated with the persistence context; so make some
-			// deeper checks...
+			// getContextEntityIdentifier() returned null, indicating that
+			// the entity is not associated with the persistence context,
+			// so look deeper for its id
 			final String entityName = findContainingEntityMapping().getEntityName();
 			if ( ForeignKeys.isTransient( entityName, entity, Boolean.FALSE, session ) ) {
+				// TODO should be a TransientPropertyValueException
 				throw new TransientObjectException( "object references an unsaved transient instance of '"
 						+ (entityName == null ? session.guessEntityName( entity ) : entityName)
 						+ "' save the transient instance before flushing" );
 			}
-			id = getIdentifier( entity );
+			return getIdentifier( entity );
+		}
+		else {
+			return id;
 		}
-		return id;
 	}
 
 	/**