fix infoString()

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/spi/EntityKey.java

@@ -11,11 +11,12 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static org.hibernate.pretty.MessageHelper.infoString;
+
 /**
  * Uniquely identifies of an entity instance in a particular Session by identifier.
  * Note that it's only safe to be used within the scope of a Session: it doesn't consider for example the tenantId
@@ -117,7 +118,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return "EntityKey" + MessageHelper.infoString( this.persister, identifier, persister.getFactory() );
+		return "EntityKey" + infoString( this.persister, identifier, persister.getFactory() );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/pretty/MessageHelper.java

@@ -87,17 +87,15 @@ public static String infoString(
 			info.append( " with null id" );
 		}
 		else {
-			info.append( " with id '" ).append( id ).append( "'" );
+			info.append( " with id '" );
 			if ( idType == null ) {
 				info.append( id );
 			}
+			else if ( factory != null ) {
+				info.append( idType.toLoggableString( id, factory ) );
+			}
 			else {
-				if ( factory != null ) {
-					info.append( idType.toLoggableString( id, factory ) );
-				}
-				else {
-					info.append( "<not loggable>" );
-				}
+				info.append( "<not loggable>" );
 			}
 			info.append( "'" );
 		}