From 7767dfbc06bf0c7db190e48c2af91a269923435e Mon Sep 17 00:00:00 2001 From: JPAV Date: Tue, 22 Mar 2011 14:11:59 -0500 Subject: [PATCH] HHH-5615 Replaced slf4j references with jboss-logging for a few classes that fell through the cracks --- .../java/org/hibernate/HibernateLogger.java | 4 ++++ .../internal/TransactionCoordinatorImpl.java | 17 ++++++------- .../metamodel/binding/EntityIdentifier.java | 9 +++---- .../relational/AbstractSimpleValue.java | 12 +++++----- .../metamodel/relational/ForeignKey.java | 24 ++++++------------- .../metamodel/source/ExtendsQueue.java | 10 ++++---- .../hibernate/metamodel/source/Metadata.java | 12 +++++----- .../metamodel/source/MetadataSourceQueue.java | 12 ++++++---- .../source/hbm/AbstractEntityBinder.java | 3 --- .../test/filter/DynamicFilterTest.java | 7 ++---- .../test/legacy/SQLFunctionsTest.java | 4 ---- .../testing/junit4/CustomRunner.java | 22 +++++++---------- 12 files changed, 60 insertions(+), 76 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateLogger.java b/hibernate-core/src/main/java/org/hibernate/HibernateLogger.java index c8e2b6934a..ca1720eb0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateLogger.java @@ -1854,4 +1854,8 @@ void deprecatedTransactionManagerStrategy( String name, @Message( value = "Encountered legacy TransactionManagerLookup specified; convert to newer %s contract specified via %s setting", id = 428 ) void legacyTransactionManagerStrategy( String name, String jtaPlatform ); + + @LogMessage( level = WARN ) + @Message( value = "Setting entity-identifier value binding where one already existed : %s.", id = 429 ) + void entityIdentifierValueBindingExists(String name); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java index 416181c08c..25c58c48af 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java @@ -24,6 +24,7 @@ package org.hibernate.engine.transaction.internal; import org.hibernate.ConnectionReleaseMode; +import org.hibernate.HibernateLogger; import org.hibernate.ResourceClosedException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl; @@ -42,8 +43,7 @@ import org.hibernate.engine.transaction.synchronization.spi.SynchronizationCallbackCoordinator; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.service.jta.platform.spi.JtaPlatform; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.logging.Logger; import java.io.IOException; import java.io.ObjectInputStream; @@ -60,7 +60,8 @@ * @author Steve Ebersole */ public class TransactionCoordinatorImpl implements TransactionCoordinator { - private static final Logger log = LoggerFactory.getLogger( TransactionCoordinatorImpl.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TransactionCoordinatorImpl.class.getName()); private final transient TransactionContext transactionContext; private final transient JdbcCoordinatorImpl jdbcCoordinator; @@ -125,7 +126,7 @@ public void reset() { } public void afterTransaction(TransactionImplementor hibernateTransaction, int status) { - log.trace( "after transaction completion" ); + LOG.trace( "after transaction completion" ); final boolean success = JtaStatusHelper.isCommitted( status ); @@ -221,19 +222,19 @@ private void attemptToRegisterJtaSync() { // Can we resister a synchronization if ( ! jtaPlatform.canRegisterSynchronization() ) { - log.trace( "registered JTA platform says we cannot currently resister synchronization; skipping" ); + LOG.trace( "registered JTA platform says we cannot currently resister synchronization; skipping" ); return; } // Should we resister a synchronization if ( ! transactionFactory().isJoinableJtaTransaction( this, currentHibernateTransaction ) ) { - log.trace( "TransactionFactory reported no JTA transaction to join; skipping Synchronization registration" ); + LOG.trace( "TransactionFactory reported no JTA transaction to join; skipping Synchronization registration" ); return; } jtaPlatform.registerSynchronization( new RegisteredSynchronization( getSynchronizationCallbackCoordinator() ) ); synchronizationRegistered = true; - log.debug( "successfully registered Synchronization" ); + LOG.debug( "successfully registered Synchronization" ); } @Override @@ -245,7 +246,7 @@ public SynchronizationCallbackCoordinator getSynchronizationCallbackCoordinator( } public void pulse() { - log.trace( "Starting transaction coordinator pulse" ); + LOG.trace( "Starting transaction coordinator pulse" ); if ( transactionFactory().compatibleWithJtaSynchronization() ) { // the configured transaction strategy says it supports callbacks via JTA synchronization, so attempt to // register JTA synchronization if possible diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityIdentifier.java b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityIdentifier.java index 230125435b..5af9b17264 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityIdentifier.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityIdentifier.java @@ -23,8 +23,8 @@ */ package org.hibernate.metamodel.binding; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * TODO : javadoc @@ -32,7 +32,8 @@ * @author Steve Ebersole */ public class EntityIdentifier { - private static final Logger log = LoggerFactory.getLogger( EntityIdentifier.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EntityIdentifier.class.getName()); private final EntityBinding entityBinding; private AttributeBinding attributeBinding; @@ -53,7 +54,7 @@ public AttributeBinding getValueBinding() { public void setValueBinding(AttributeBinding attributeBinding) { if ( this.attributeBinding != null ) { // todo : error? or just log? for now just log - log.warn( "setting entity-identifier value binding where one already existed : {}.", entityBinding.getEntity().getName() ); + LOG.entityIdentifierValueBindingExists( entityBinding.getEntity().getName() ); } this.attributeBinding = attributeBinding; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java index d2b461eb02..f5fa60207c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java @@ -23,10 +23,9 @@ */ package org.hibernate.metamodel.relational; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.hibernate.HibernateLogger; import org.hibernate.metamodel.ValidationException; +import org.jboss.logging.Logger; /** * Basic support for {@link SimpleValue} implementations. @@ -34,7 +33,8 @@ * @author Steve Ebersole */ public abstract class AbstractSimpleValue implements SimpleValue { - private static final Logger log = LoggerFactory.getLogger( AbstractSimpleValue.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AbstractSimpleValue.class.getName()); private final TableSpecification table; private final int position; @@ -61,9 +61,9 @@ public Datatype getDatatype() { @Override public void setDatatype(Datatype datatype) { - log.debug( "setting datatype for column {} : {}", toLoggableString(), datatype ); + LOG.debugf( "setting datatype for column %s : %s", toLoggableString(), datatype ); if ( this.datatype != null && ! this.datatype.equals( datatype ) ) { - log.debug( "overriding previous datatype : {}", this.datatype ); + LOG.debugf( "overriding previous datatype : %s", this.datatype ); } this.datatype = datatype; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/ForeignKey.java index 2328c94fe8..3a890707f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/ForeignKey.java @@ -26,8 +26,9 @@ import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; +import org.jboss.logging.Logger.Level; /** * Models the notion of a foreign key. @@ -39,7 +40,8 @@ * @author Steve Ebersole */ public class ForeignKey extends AbstractConstraint implements Constraint, Exportable { - private static final Logger log = LoggerFactory.getLogger( ForeignKey.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AbstractConstraint.class.getName()); private final TableSpecification targetTable; private List targetColumns; @@ -81,24 +83,12 @@ public void addColumn(Column column) { public void addColumnMapping(Column sourceColumn, Column targetColumn) { if ( targetColumn == null ) { if ( targetColumns != null ) { - if ( log.isWarnEnabled() ) { - log.warn( - "Attempt to map column [" + sourceColumn.toLoggableString() - + "] to no target column after explicit target column(s) named for FK [name=" - + getName() + "]" - ); - } + if (LOG.isEnabled(Level.WARN)) LOG.attemptToMapColumnToNoTargetColumn(sourceColumn.toLoggableString(), getName()); } } else { if ( targetColumns == null ) { - if ( !internalColumnAccess().isEmpty() ) { - log.warn( - "Value mapping mismatch as part of FK [table=" + getTable().toLoggableString() - + ", name=" + getName() + "] while adding source column [" - + sourceColumn.toLoggableString() + "]" - ); - } + if (!internalColumnAccess().isEmpty()) LOG.valueMappingMismatch(getTable().toLoggableString(), getName(), sourceColumn.toLoggableString()); targetColumns = new ArrayList(); } targetColumns.add( targetColumn ); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/ExtendsQueue.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/ExtendsQueue.java index 74fd2ae2d4..27596144ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/ExtendsQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/ExtendsQueue.java @@ -28,12 +28,11 @@ import java.util.Iterator; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.cfg.ExtendsQueueEntry; import org.hibernate.metamodel.source.hbm.HbmHelper; +import org.jboss.logging.Logger; /** * TODO : javadoc @@ -41,7 +40,8 @@ * @author Steve Ebersole */ public class ExtendsQueue implements Serializable { - private static final Logger log = LoggerFactory.getLogger( ExtendsQueue.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ExtendsQueue.class.getName()); private final Metadata metadata; private Set extendsQueue = new HashSet(); @@ -55,7 +55,7 @@ public void add(ExtendsQueueEntry extendsQueueEntry) { } public int processExtendsQueue() { - log.debug( "processing extends queue" ); + LOG.debug( "processing extends queue" ); int added = 0; ExtendsQueueEntry extendsQueueEntry = findPossibleExtends(); while ( extendsQueueEntry != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java index c5febeda82..102b717bf5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java @@ -29,10 +29,8 @@ import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.DuplicateMappingException; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.common.reflection.MetadataProvider; import org.hibernate.annotations.common.reflection.MetadataProviderInjector; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -46,6 +44,7 @@ import org.hibernate.metamodel.binding.PluralAttributeBinding; import org.hibernate.metamodel.relational.Database; import org.hibernate.metamodel.source.hbm.HibernateXmlBinder; +import org.jboss.logging.Logger; /** * TODO : javadoc @@ -53,7 +52,8 @@ * @author Steve Ebersole */ public class Metadata implements Serializable { - private static final Logger log = LoggerFactory.getLogger( Metadata.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Metadata.class.getName()); private final HibernateXmlBinder hibernateXmlBinder = new HibernateXmlBinder( this ); private final ExtendsQueue extendsQueue = new ExtendsQueue( this ); @@ -151,10 +151,10 @@ public void addImport(String importName, String entityName) { if ( imports == null ) { imports = new HashMap(); } - log.trace( "Import: " + importName + " -> " + entityName ); + LOG.tracef( "Import: %s -> %s", importName, entityName ); String old = imports.put( importName, entityName ); if ( old != null ) { - log.debug( "import name [{}] overrode previous [{}]", importName, old ); + LOG.debugf( "import name [%s] overrode previous [%s]", importName, old ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSourceQueue.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSourceQueue.java index 035ffe2c20..432cac3ac3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSourceQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSourceQueue.java @@ -39,15 +39,15 @@ import org.dom4j.Attribute; import org.dom4j.Document; import org.dom4j.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateLogger; import org.hibernate.InvalidMappingException; import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.cfg.MetadataSourceType; import org.hibernate.internal.util.collections.JoinedIterator; import org.hibernate.internal.util.xml.XmlDocument; +import org.jboss.logging.Logger; /** * TODO : javadoc @@ -55,7 +55,9 @@ * @author Steve Ebersole */ public class MetadataSourceQueue implements Serializable { - private static final Logger log = LoggerFactory.getLogger( MetadataSourceQueue.class ); + + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, MetadataSourceQueue.class.getName()); + private final Metadata metadata; private LinkedHashMap> hbmMetadataToEntityNamesMap @@ -174,7 +176,7 @@ else if ( MetadataSourceType.CLASS.equals( type ) ) { } private void processHbmXmlQueue() { - log.debug( "Processing hbm.xml files" ); + LOG.debug( "Processing hbm.xml files" ); for ( Map.Entry> entry : hbmMetadataToEntityNamesMap.entrySet() ) { // Unfortunately we have to create a Mappings instance for each iteration here processHbmXml( entry.getKey(), entry.getValue() ); @@ -204,7 +206,7 @@ public void processHbmXml(XmlDocument metadataXml, Set entityNames) { } private void processAnnotatedClassesQueue() { - log.debug( "Process annotated classes" ); + LOG.debug( "Process annotated classes" ); //bind classes in the correct order calculating some inheritance state List orderedClasses = orderAndFillHierarchy( annotatedClasses ); // Map inheritanceStatePerClass = AnnotationBinder.buildInheritanceStates( diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractEntityBinder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractEntityBinder.java index c3f1518ea7..227cfb1936 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractEntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractEntityBinder.java @@ -32,8 +32,6 @@ import org.dom4j.Attribute; import org.dom4j.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.hibernate.EntityMode; import org.hibernate.MappingException; @@ -71,7 +69,6 @@ * @author Steve Ebersole */ abstract class AbstractEntityBinder { - private static final Logger log = LoggerFactory.getLogger( AbstractEntityBinder.class ); protected final HibernateMappingBinder hibernateMappingBinder; protected final Map entityMetas; diff --git a/hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java index 66ea5cd3a5..190a215488 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.filter; + import static org.hibernate.testing.TestLogger.LOG; import java.util.ArrayList; import java.util.Calendar; @@ -31,9 +32,6 @@ import java.util.List; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.FetchMode; @@ -67,7 +65,6 @@ * @author Steve Ebersole */ public class DynamicFilterTest extends BaseCoreFunctionalTestCase { - private Logger log = LoggerFactory.getLogger( DynamicFilterTest.class ); @Override public String[] getMappings() { @@ -218,7 +215,7 @@ public void testHqlFilters() { session.close(); testData.release(); } - + @Test public void testFiltersWithCustomerReadAndWrite() { //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java index eb7d8c921d..cf52d15cce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java @@ -31,9 +31,6 @@ import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.Query; import org.hibernate.ScrollableResults; import org.hibernate.Session; @@ -62,7 +59,6 @@ @SuppressWarnings( {"UnnecessaryUnboxing", "UnnecessaryBoxing"}) public class SQLFunctionsTest extends LegacyTestCase { - private static final Logger log = LoggerFactory.getLogger(SQLFunctionsTest.class); @Override public String[] getMappings() { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java index 5e9363d41b..7f16dd3c39 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java @@ -23,29 +23,26 @@ */ package org.hibernate.testing.junit4; +import static org.hibernate.testing.TestLogger.LOG; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.StringHelper; - -import org.junit.Ignore; -import org.junit.runner.manipulation.NoTestsRemainException; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.Statement; - import org.hibernate.testing.DialectCheck; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.Skip; import org.hibernate.testing.SkipForDialect; +import org.junit.Ignore; +import org.junit.runner.manipulation.NoTestsRemainException; +import org.junit.runners.BlockJUnit4ClassRunner; +import org.junit.runners.model.FrameworkMethod; +import org.junit.runners.model.InitializationError; +import org.junit.runners.model.Statement; /** * The Hibernate-specific {@link org.junit.runner.Runner} implementation which layers {@link ExtendedFrameworkMethod} @@ -55,7 +52,6 @@ * @author Steve Ebersole */ public class CustomRunner extends BlockJUnit4ClassRunner { - private static final Logger log = LoggerFactory.getLogger( CustomRunner.class ); private TestClassMetadata testClassMetadata; @@ -144,7 +140,7 @@ protected List doComputation() { } testCount++; - log.trace( "adding test " + Helper.extractTestName( frameworkMethod ) + " [#" + testCount + "]" ); + LOG.trace( "adding test " + Helper.extractTestName( frameworkMethod ) + " [#" + testCount + "]" ); result.add( new ExtendedFrameworkMethod( frameworkMethod, virtualIgnore, failureExpected ) ); } return result;