very minor code improvements in ForeignKeys + NonNullableTransientDependencies

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java

@@ -89,7 +89,7 @@ public void nullifyTransientReferences(final Object[] values) {
 		 * @return {@code null} if the argument is an unsaved entity; otherwise return the argument.
 		 */
 		private Object nullifyTransientReferences(final Object value, final String propertyName, final Type type) {
-			final Object returnedValue = nullifyTransient(value, propertyName, type);
+			final Object returnedValue = nullifyTransient( value, propertyName, type );
 			// value != returnedValue if either:
 			// 1) returnedValue was nullified (set to null);
 			// or 2) returnedValue was initialized, but not nullified.
@@ -149,15 +149,15 @@ private Object nullifyEntityType(Object value, String propertyName, EntityType e
 			else {
 				// If value is lazy, it may need to be initialized to
 				// determine if the value is nullifiable.
-				final Object possiblyInitializedValue = initializeIfNecessary(value, propertyName, entityType );
+				final Object possiblyInitializedValue = initializeIfNecessary( value, propertyName, entityType );
 				if ( possiblyInitializedValue == null ) {
 					// The uninitialized value was initialized to null
 					return null;
 				}
 				else {
 					// If the value is not nullifiable, make sure that the
 					// possibly initialized value is returned.
-					return isNullifiable(entityType.getAssociatedEntityName(), possiblyInitializedValue)
+					return isNullifiable( entityType.getAssociatedEntityName(), possiblyInitializedValue )
 							? null
 							: possiblyInitializedValue;
 				}
@@ -199,15 +199,15 @@ private boolean initializationIsNecessary(Object value, Type type) {
 
 		/**
 		 * Determine if the object already exists in the database,
-		 * using a "best guess"
+		 * using heuristics.
 		 *
 		 * @param entityName The name of the entity
 		 * @param object The entity instance
 		 */
 		private boolean isNullifiable(final String entityName, Object object)
 				throws HibernateException {
 			if ( object == UNFETCHED_PROPERTY ) {
-				// this is the best we can do...
+				// this is the best we can do
 				return false;
 			}
 
@@ -244,10 +244,10 @@ private boolean isNullifiable(final String entityName, Object object)
 					|| isDelete && hasSelfReferentialForeignKeyBug();
 			}
 
-			// See if the entity is already bound to this session, if not look at the
-			// entity identifier and assume that the entity is persistent if the
-			// id is not "unsaved" (that is, we rely on foreign keys to keep
-			// database integrity)
+			// See if the entity is already bound to this session;
+			// if it's not, look at the entity identifier and assume
+			// that the entity is persistent if the id is not "unsaved"
+			// (that is, we rely on foreign keys to keep database integrity)
 
 			final EntityEntry entityEntry = persistenceContext.getEntry( object );
 			return entityEntry == null
@@ -416,11 +416,11 @@ public static NonNullableTransientDependencies findNonNullableTransientEntities(
 			boolean isEarlyInsert,
 			SharedSessionContractImplementor session) {
 		final EntityPersister persister = session.getEntityPersister( entityName, entity );
-		final Nullifier nullifier = new Nullifier( entity, false, isEarlyInsert, session, persister );
+		final var nullifier = new Nullifier( entity, false, isEarlyInsert, session, persister );
 		final String[] propertyNames = persister.getPropertyNames();
 		final Type[] types = persister.getPropertyTypes();
 		final boolean[] nullability = persister.getPropertyNullability();
-		final NonNullableTransientDependencies nonNullableTransientEntities = new NonNullableTransientDependencies();
+		final var nonNullableTransientEntities = new NonNullableTransientDependencies();
 		for ( int i = 0; i < types.length; i++ ) {
 			collectNonNullableTransientEntities(
 					nullifier,

hibernate-core/src/main/java/org/hibernate/engine/internal/NonNullableTransientDependencies.java

@@ -4,14 +4,15 @@
  */
 package org.hibernate.engine.internal;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
+import static java.util.Collections.emptyList;
+
 /**
  * Tracks non-nullable transient entities that would cause a particular entity insert to fail.
  *
@@ -23,6 +24,10 @@ public final class NonNullableTransientDependencies {
 	private Map<Object,Set<String>> propertyPathsByTransientEntity; // lazily initialized
 
 	public void add(String propertyName, Object transientEntity) {
+		getPropertyPaths( transientEntity ).add( propertyName );
+	}
+
+	private Set<String> getPropertyPaths(Object transientEntity) {
 		if ( propertyPathsByTransientEntity == null ) {
 			propertyPathsByTransientEntity = new IdentityHashMap<>();
 		}
@@ -31,16 +36,13 @@ public void add(String propertyName, Object transientEntity) {
 			propertyPaths = new HashSet<>();
 			propertyPathsByTransientEntity.put( transientEntity, propertyPaths );
 		}
-		propertyPaths.add( propertyName );
+		return propertyPaths;
 	}
 
 	public Iterable<Object> getNonNullableTransientEntities() {
-		if ( propertyPathsByTransientEntity == null ) {
-			return Collections.emptyList();
-		}
-		else {
-			return propertyPathsByTransientEntity.keySet();
-		}
+		return propertyPathsByTransientEntity == null
+				? emptyList()
+				: propertyPathsByTransientEntity.keySet();
 	}
 
 	/**
@@ -51,12 +53,9 @@ public Iterable<Object> getNonNullableTransientEntities() {
 	 * @return The property paths
 	 */
 	public Iterable<String> getNonNullableTransientPropertyPaths(final Object entity) {
-		if ( propertyPathsByTransientEntity == null ) {
-			return Collections.emptyList();
-		}
-		else {
-			return propertyPathsByTransientEntity.get( entity );
-		}
+		return propertyPathsByTransientEntity == null
+				? emptyList()
+				: propertyPathsByTransientEntity.get( entity );
 	}
 
 	/**
@@ -77,8 +76,9 @@ public boolean isEmpty() {
 	 * @throws IllegalStateException If the entity had tracked paths
 	 */
 	public void resolveNonNullableTransientEntity(Object entity) {
-		if ( propertyPathsByTransientEntity != null && propertyPathsByTransientEntity.remove( entity ) == null ) {
-			throw new IllegalStateException( "Attempt to resolve a non-nullable, transient entity that is not a dependency." );
+		if ( propertyPathsByTransientEntity != null
+				&& propertyPathsByTransientEntity.remove( entity ) == null ) {
+			throw new IllegalStateException( "Attempt to resolve a non-nullable, transient entity that is not a dependency" );
 		}
 	}
 
@@ -90,14 +90,17 @@ public void resolveNonNullableTransientEntity(Object entity) {
 	 * @return The loggable representation
 	 */
 	public String toLoggableString(SharedSessionContractImplementor session) {
-		final StringBuilder sb = new StringBuilder( getClass().getSimpleName() ).append( '[' );
+		final StringBuilder result =
+				new StringBuilder( getClass().getSimpleName() ).append( '[' );
 		if ( propertyPathsByTransientEntity != null ) {
-			for ( Map.Entry<Object,Set<String>> entry : propertyPathsByTransientEntity.entrySet() ) {
-				sb.append( "transientEntityName=" ).append( session.bestGuessEntityName( entry.getKey() ) );
-				sb.append( " requiredBy=" ).append( entry.getValue() );
+			for ( var entry : propertyPathsByTransientEntity.entrySet() ) {
+				result.append( "transientEntityName=" )
+						.append( session.bestGuessEntityName( entry.getKey() ) );
+				result.append( " requiredBy=" )
+						.append( entry.getValue() );
 			}
 		}
-		sb.append( ']' );
-		return sb.toString();
+		result.append( ']' );
+		return result.toString();
 	}
 }