diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java index 7bfb8c8bba..f5a0a00a51 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java @@ -41,8 +41,8 @@ import org.hibernate.dialect.Dialect; import org.hibernate.hql.internal.classic.ParserHelper; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.FilterImpl; +import org.hibernate.internal.util.EntityPrinter; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.pretty.Printer; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; @@ -277,7 +277,7 @@ public final class QueryParameters { } public void traceParameters(SessionFactoryImplementor factory) throws HibernateException { - Printer print = new Printer( factory ); + EntityPrinter print = new EntityPrinter( factory ); if (positionalParameterValues.length != 0) LOG.trace("Parameters: " + print.toString(positionalParameterTypes, positionalParameterValues)); if (namedParameters != null) LOG.trace("Named parameters: " + print.toString(namedParameters)); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java index c162fffced..591e4108cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java @@ -51,10 +51,10 @@ import org.hibernate.engine.spi.ActionQueue; import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.FlushEntityEventListener; import org.hibernate.event.spi.FlushEvent; +import org.hibernate.internal.util.EntityPrinter; import org.hibernate.internal.util.collections.IdentityMap; import org.hibernate.internal.util.collections.LazyIterator; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.pretty.Printer; import org.hibernate.event.service.spi.EventListenerGroup; import org.hibernate.event.service.spi.EventListenerRegistry; @@ -125,7 +125,7 @@ public abstract class AbstractFlushingEventListener implements Serializable { session.getActionQueue().numberOfCollectionRemovals(), persistenceContext.getCollectionEntries().size() ); - new Printer( session.getFactory() ).toString( + new EntityPrinter( session.getFactory() ).toString( persistenceContext.getEntitiesByKey().values().iterator() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/Printer.java b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/pretty/Printer.java rename to hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java index 3d11b2c1c7..acebd64e1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/pretty/Printer.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.pretty; +package org.hibernate.internal.util; import java.util.HashMap; import java.util.Iterator; @@ -42,9 +42,9 @@ import org.hibernate.type.Type; * Renders entities to a nicely readable string. * @author Gavin King */ -public final class Printer { +public final class EntityPrinter { - private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, Printer.class.getName()); + private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, EntityPrinter.class.getName()); private SessionFactoryImplementor factory; @@ -119,7 +119,7 @@ public final class Printer { } } - public Printer(SessionFactoryImplementor factory) { + public EntityPrinter(SessionFactoryImplementor factory) { this.factory = factory; } }