more consistent format for logging in boot.model package

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java

@@ -2804,7 +2804,7 @@ private void setLocalGenerators(Map<String, IdentifierGeneratorDefinition> local
 
 	private void logOneToManySecondPass() {
 		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Binding @OneToMany through foreign key: " + safeCollectionRole() );
+			LOG.trace( "Binding one-to-many association through foreign key: " + safeCollectionRole() );
 		}
 	}
 
@@ -2814,16 +2814,16 @@ private void logManyToManySecondPass(
 			boolean isManyToAny) {
 		if ( LOG.isTraceEnabled() ) {
 			if ( isCollectionOfEntities && isOneToMany ) {
-				LOG.trace( "Binding @OneToMany through association table: " + safeCollectionRole() );
+				LOG.trace( "Binding one-to-many association through association table: " + safeCollectionRole() );
 			}
 			else if ( isCollectionOfEntities ) {
-				LOG.trace( "Binding @ManyToMany through association table: " + safeCollectionRole() );
+				LOG.trace( "Binding many-to-many association through association table: " + safeCollectionRole() );
 			}
 			else if ( isManyToAny ) {
-				LOG.trace( "Binding @ManyToAny: " + safeCollectionRole() );
+				LOG.trace( "Binding many-to-any: " + safeCollectionRole() );
 			}
 			else {
-				LOG.trace( "Binding @ElementCollection to collection table: " + safeCollectionRole() );
+				LOG.trace( "Binding element collection to collection table: " + safeCollectionRole() );
 			}
 		}
 	}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java

@@ -453,7 +453,7 @@ static Component fillEmbeddable(
 
 		final String subpath = getPath( propertyHolder, inferredData );
 		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Binding component with path: " + subpath );
+			LOG.trace( "Binding embeddable with path: " + subpath );
 		}
 		final PropertyHolder subholder = buildPropertyHolder(
 				component,

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java

@@ -180,7 +180,7 @@ public static void bindEntityClass(
 			Map<ClassDetails, InheritanceState> inheritanceStates,
 			MetadataBuildingContext context) {
 		if ( LOG.isTraceEnabled() ) {
-			LOG.trace( "Binding entity from annotated class: " + clazzToProcess.getName() );
+			LOG.trace( "Binding entity with annotated class: " + clazzToProcess.getName() );
 		}
 
 		final InFlightMetadataCollector collector = context.getMetadataCollector();

hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java

@@ -81,7 +81,8 @@ public static void bindQuery(
 			}
 
 			if ( LOG.isTraceEnabled() ) {
-				LOG.tracef( "Binding named query: %s => %s", queryName, queryString );
+				LOG.tracef( "Binding named query '%s' to [%s]", queryName,
+						queryString.replace( '\n', ' ' ) );
 			}
 
 			final QueryHintDefinition hints = new QueryHintDefinition( queryName, namedQuery.hints() );
@@ -141,9 +142,9 @@ public static void bindNativeQuery(
 				createNamedQueryDefinition( registrationName, queryString, resultClass, resultSetMappingName, hints, location );
 
 		if ( LOG.isTraceEnabled() ) {
-			LOG.tracef( "Binding named native query: %s => %s",
+			LOG.tracef( "Binding named native query '%s' to [%s]",
 					queryDefinition.getRegistrationName(),
-					queryDefinition.getSqlQueryString() );
+					queryDefinition.getSqlQueryString().replace( '\n', ' ' ) );
 		}
 
 		if ( isDefault ) {
@@ -234,9 +235,9 @@ public static void bindNativeQuery(
 		final NamedNativeQueryDefinition<?> queryDefinition = builder.build();
 		if ( LOG.isTraceEnabled() ) {
 			LOG.tracef(
-					"Binding named native query: %s => %s",
+					"Binding named native query '%' to [%s]",
 					queryDefinition.getRegistrationName(),
-					queryDefinition.getSqlQueryString()
+					queryDefinition.getSqlQueryString().replace( '\n', ' ' )
 			);
 		}
 		context.getMetadataCollector().addNamedNativeQuery( queryDefinition );
@@ -390,9 +391,9 @@ public static void bindQuery(
 		final NamedHqlQueryDefinitionImpl<?> hqlQueryDefinition = builder.build();
 
 		if ( LOG.isTraceEnabled() ) {
-			LOG.tracef( "Binding named query: %s => %s",
+			LOG.tracef( "Binding named query '%s' to [%s]",
 					hqlQueryDefinition.getRegistrationName(),
-					hqlQueryDefinition.getHqlString() );
+					hqlQueryDefinition.getHqlString().replace( '\n', ' ' ) );
 		}
 
 		context.getMetadataCollector().addNamedQuery( hqlQueryDefinition );

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java

@@ -2454,7 +2454,7 @@ private void bindComponent(
 		// todo : better define the conditions in this if/else
 		if ( isDynamic ) {
 			// dynamic is represented as a Map
-			log.tracef( "Binding dynamic-component [%s]", role );
+			log.tracef( "Binding dynamic component [%s]", role );
 			componentBinding.setDynamic( true );
 		}
 		else if ( isVirtual ) {
@@ -2983,7 +2983,7 @@ public void doSecondPass(Map<String, PersistentClass> persistentClasses) throws
 			collectionBinding.createAllKeys();
 
 			if ( log.isTraceEnabled() ) {
-				log.tracef( "Mapped collection : %s", getPluralAttributeSource().getAttributeRole().getFullPath() );
+				log.tracef( "Mapped collection: %s", getPluralAttributeSource().getAttributeRole().getFullPath() );
 				log.tracef( "   + table -> %s", getCollectionBinding().getTable().getName() );
 				log.tracef( "   + key -> %s", columns( getCollectionBinding().getKey() ) );
 				if ( getCollectionBinding().isIndexed() ) {