HV-481 Migrate to JBoss logging

hibernate · Mar 2, 2012 · 0451243 · 0451243
1 parent 071f985
commit 0451243
Show file tree

Hide file tree

Showing 17 changed files with 195 additions and 137 deletions.
diff --git a/hibernate-validator/pom.xml b/hibernate-validator/pom.xml
@@ -47,10 +47,6 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -114,6 +110,11 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>

diff --git a/...te-validator/src/main/java/org/hibernate/validator/internal/engine/ConfigurationImpl.java b/...te-validator/src/main/java/org/hibernate/validator/internal/engine/ConfigurationImpl.java
@@ -31,19 +31,18 @@
 import javax.validation.spi.ConfigurationState;
 import javax.validation.spi.ValidationProvider;
 
-import org.slf4j.Logger;
-
 import org.hibernate.validator.HibernateValidatorConfiguration;
 import org.hibernate.validator.cfg.ConstraintMapping;
 import org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver;
-import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
-import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator;
-import org.hibernate.validator.resourceloading.ResourceBundleLocator;
 import org.hibernate.validator.internal.util.CollectionHelper;
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.Version;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.xml.ValidationBootstrapParameters;
 import org.hibernate.validator.internal.xml.ValidationXmlParser;
+import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
+import org.hibernate.validator.resourceloading.PlatformResourceBundleLocator;
+import org.hibernate.validator.resourceloading.ResourceBundleLocator;
 
 /**
  * Hibernate specific {@code Configuration} implementation.
@@ -59,7 +58,7 @@ public class ConfigurationImpl implements HibernateValidatorConfiguration, Confi
 		Version.touch();
 	}
 
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 
 	private final ResourceBundleLocator defaultResourceBundleLocator = new PlatformResourceBundleLocator(
 			ResourceBundleMessageInterpolator.USER_VALIDATION_MESSAGES
@@ -196,7 +195,7 @@ public final ValidatorFactory buildValidatorFactory() {
 					in.close();
 				}
 				catch ( IOException io ) {
-					log.warn( "Unable to close input stream." );
+					log.unableToCloseInputStream();
 				}
 			}
 		}
@@ -263,7 +262,8 @@ private boolean isSpecificProvider() {
 	 */
 	private void parseValidationXml() {
 		if ( ignoreXmlConfiguration ) {
-			log.info( "Ignoring XML configuration." );
+			log.ignoringXmlConfiguration();
+
 			// make sure we use the defaults in case they haven't been provided yet
 			if ( validationBootstrapParameters.getMessageInterpolator() == null ) {
 				validationBootstrapParameters.setMessageInterpolator( defaultMessageInterpolator );

diff --git a/...rnate-validator/src/main/java/org/hibernate/validator/internal/engine/ConstraintTree.java b/...rnate-validator/src/main/java/org/hibernate/validator/internal/engine/ConstraintTree.java
@@ -32,13 +32,12 @@
 import javax.validation.ValidationException;
 import javax.validation.metadata.ConstraintDescriptor;
 
-import org.slf4j.Logger;
-
 import org.hibernate.validator.constraints.CompositionType;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl;
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.LRUMap;
 import org.hibernate.validator.internal.util.TypeHelper;
+import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 import static org.hibernate.validator.constraints.CompositionType.ALL_FALSE;
@@ -52,10 +51,11 @@
  * @author Hardy Ferentschik
  * @author Federico Mancini
  * @author Dag Hovland
+ * @author Kevin Pollet <kevin.pollet@serli.com> (C) 2012 SERLI
  */
 public class ConstraintTree<A extends Annotation> {
 
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 	private static final int MAX_TYPE_CACHE_SIZE = 20;
 
 	private final ConstraintTree<?> parent;
@@ -138,8 +138,8 @@ private <T, U, V, E extends ConstraintViolation<T>> void validateConstraints(Val
 				&& ( !executionContext.isFailFastModeEnabled() || constraintViolations.isEmpty() ) ) {
 
 			if ( log.isTraceEnabled() ) {
-				log.trace(
-						"Validating value {} against constraint defined by {}",
+				log.tracef(
+						"Validating value %s against constraint defined by %s.",
 						valueContext.getCurrentValidatedValue(),
 						descriptor
 				);
@@ -330,10 +330,8 @@ private <V> ConstraintValidator<A, V> getInitializedValidator(Type validatedValu
 			constraintValidatorCache.put( key, constraintValidator );
 		}
 		else {
-			if ( log.isTraceEnabled() ) {
-				log.trace( "Constraint validator {} found in cache" );
-			}
 			constraintValidator = (ConstraintValidator<A, V>) constraintValidatorCache.get( key );
+			log.tracef( "Constraint validator %s found in cache.", constraintValidator );
 		}
 		return constraintValidator;
 	}

diff --git a/...ain/java/org/hibernate/validator/internal/engine/resolver/DefaultTraversableResolver.java b/...ain/java/org/hibernate/validator/internal/engine/resolver/DefaultTraversableResolver.java
@@ -22,10 +22,9 @@
 import javax.validation.TraversableResolver;
 import javax.validation.ValidationException;
 
-import org.slf4j.Logger;
-
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.ReflectionHelper;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 /**
  * A JPA 2 aware {@code TraversableResolver}.
@@ -35,7 +34,7 @@
  */
 public class DefaultTraversableResolver implements TraversableResolver {
 
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 
 	/**
 	 * Class to load to check whether JPA is on the classpath.
@@ -72,8 +71,8 @@ private void detectJPA() {
 			persistenceClass = ReflectionHelper.loadClass( PERSISTENCE_CLASS_NAME, this.getClass() );
 		}
 		catch ( ValidationException e ) {
-			log.debug(
-					"Cannot find {} on classpath. Assuming non JPA 2 environment. All properties will per default be traversable.",
+			log.debugf(
+					"Cannot find %s on classpath. Assuming non JPA 2 environment. All properties will per default be traversable.",
 					PERSISTENCE_CLASS_NAME
 			);
 			return;
@@ -82,8 +81,8 @@ private void detectJPA() {
 		// check whether Persistence contains getPersistenceUtil
 		Method persistenceUtilGetter = ReflectionHelper.getMethod( persistenceClass, PERSISTENCE_UTIL_METHOD );
 		if ( persistenceUtilGetter == null ) {
-			log.debug(
-					"Found {} on classpath, but no method '{}'. Assuming JPA 1 environment. All properties will per default be traversable.",
+			log.debugf(
+					"Found %s on classpath, but no method '%s'. Assuming JPA 1 environment. All properties will per default be traversable.",
 					PERSISTENCE_CLASS_NAME,
 					PERSISTENCE_UTIL_METHOD
 			);
@@ -97,15 +96,15 @@ private void detectJPA() {
 			ReflectionHelper.getValue(persistenceUtilGetter, persistence );
 		}
 		catch ( Exception e ) {
-			log.debug(
-					"Unable to invoke {}.{}. Inconsistent JPA environment. All properties will per default be traversable.",
+			log.debugf(
+					"Unable to invoke %s.%s. Inconsistent JPA environment. All properties will per default be traversable.",
 					PERSISTENCE_CLASS_NAME,
 					PERSISTENCE_UTIL_METHOD
 			);
 		}
 
-		log.debug(
-				"Found {} on classpath containing '{}'. Assuming JPA 2 environment. Trying to instantiate JPA aware TraversableResolver",
+		log.debugf(
+				"Found %s on classpath containing '%s'. Assuming JPA 2 environment. Trying to instantiate JPA aware TraversableResolver",
 				PERSISTENCE_CLASS_NAME,
 				PERSISTENCE_UTIL_METHOD
 		);
@@ -115,13 +114,13 @@ private void detectJPA() {
 			Class<? extends TraversableResolver> jpaAwareResolverClass = (Class<? extends TraversableResolver>)
 					ReflectionHelper.loadClass( JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME, this.getClass() );
 			jpaTraversableResolver = ReflectionHelper.newInstance( jpaAwareResolverClass, "" );
-			log.debug(
-					"Instantiated JPA aware TraversableResolver of type {}.", JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME
+			log.debugf(
+					"Instantiated JPA aware TraversableResolver of type %s.", JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME
 			);
 		}
 		catch ( ValidationException e ) {
-			log.debug(
-					"Unable to load or instantiate JPA aware resolver {}. All properties will per default be traversable.",
+			log.debugf(
+					"Unable to load or instantiate JPA aware resolver %s. All properties will per default be traversable.",
 					JPA_AWARE_TRAVERSABLE_RESOLVER_CLASS_NAME
 			);
 		}

diff --git a/...rc/main/java/org/hibernate/validator/internal/engine/resolver/JPATraversableResolver.java b/...rc/main/java/org/hibernate/validator/internal/engine/resolver/JPATraversableResolver.java
@@ -21,8 +21,7 @@
 import javax.validation.Path;
 import javax.validation.TraversableResolver;
 
-import org.slf4j.Logger;
-
+import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 /**
@@ -35,16 +34,16 @@
  * @author Emmanuel Bernard
  */
 public class JPATraversableResolver implements TraversableResolver {
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 
 	public final boolean isReachable(Object traversableObject,
 									 Path.Node traversableProperty,
 									 Class<?> rootBeanType,
 									 Path pathToTraversableObject,
 									 ElementType elementType) {
 		if ( log.isTraceEnabled() ) {
-			log.trace(
-					"Calling isReachable on object {} with node name {}",
+			log.tracef(
+					"Calling isReachable on object %s with node name %s.",
 					traversableObject,
 					traversableProperty.getName()
 			);

diff --git a/.../src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java b/.../src/main/java/org/hibernate/validator/internal/metadata/aggregated/BeanMetaDataImpl.java
@@ -32,8 +32,6 @@
 import javax.validation.metadata.BeanDescriptor;
 import javax.validation.metadata.PropertyDescriptor;
 
-import org.slf4j.Logger;
-
 import org.hibernate.validator.group.DefaultGroupSequenceProvider;
 import org.hibernate.validator.internal.metadata.aggregated.ConstraintMetaData.ConstraintMetaDataKind;
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
@@ -47,11 +45,12 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedField;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedMethod;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedType;
-import org.hibernate.validator.method.metadata.MethodDescriptor;
-import org.hibernate.validator.method.metadata.TypeDescriptor;
 import org.hibernate.validator.internal.util.CollectionHelper.Partitioner;
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.ReflectionHelper;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
+import org.hibernate.validator.method.metadata.MethodDescriptor;
+import org.hibernate.validator.method.metadata.TypeDescriptor;
 
 import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
 import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
@@ -71,7 +70,7 @@
  */
 public final class BeanMetaDataImpl<T> implements BeanMetaData<T> {
 
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 
 	/**
 	 * The root bean class for this meta data.
@@ -390,8 +389,8 @@ else if ( group.getName().equals( Default.class.getName() ) ) {
 			throw new GroupDefinitionException( beanClass.getName() + " must be part of the redefined default group sequence." );
 		}
 		if ( log.isTraceEnabled() ) {
-			log.trace(
-					"Members of the default group sequence for bean {} are: {}",
+			log.tracef(
+					"Members of the default group sequence for bean %s are: %s.",
 					beanClass.getName(),
 					validDefaultGroupSequence
 			);

diff --git a/...dator/src/main/java/org/hibernate/validator/internal/metadata/core/AnnotationIgnores.java b/...dator/src/main/java/org/hibernate/validator/internal/metadata/core/AnnotationIgnores.java
@@ -23,8 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-
+import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 /**
@@ -36,7 +35,7 @@
  */
 public class AnnotationIgnores {
 
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 
 	/**
 	 * Keeps track whether the 'ignore-annotations' flag is set on bean level in the xml configuration. If 'ignore-annotations'
@@ -102,7 +101,10 @@ private void logMessage(Member member, Class<?> clazz) {
 		else {
 			type = "Property";
 		}
-		log.debug( type + " level annotations are getting ignored for " + clazz.getName() + "." + member.getName() );
+
+		if ( log.isDebugEnabled() ) {
+			log.debugf( "%s level annotations are getting ignored for %s.%s.", type, clazz.getName(), member.getName() );
+		}
 	}
 
 	public void setIgnoreAnnotationsOnClass(Class<?> clazz, boolean b) {
@@ -118,7 +120,7 @@ public boolean isIgnoreAnnotations(Class<?> clazz) {
 			ignoreAnnotation = getDefaultIgnoreAnnotation( clazz );
 		}
 		if ( log.isDebugEnabled() && ignoreAnnotation ) {
-			log.debug( "Class level annotation are getting ignored for " + clazz.getName() );
+			log.debugf( "Class level annotation are getting ignored for %s.", clazz.getName() );
 		}
 		return ignoreAnnotation;
 	}

diff --git a/...n/java/org/hibernate/validator/internal/metadata/descriptor/ConstraintDescriptorImpl.java b/...n/java/org/hibernate/validator/internal/metadata/descriptor/ConstraintDescriptorImpl.java
@@ -42,16 +42,15 @@
 import javax.validation.groups.Default;
 import javax.validation.metadata.ConstraintDescriptor;
 
-import org.slf4j.Logger;
-
 import org.hibernate.validator.constraints.CompositionType;
 import org.hibernate.validator.constraints.ConstraintComposition;
 import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
 import org.hibernate.validator.internal.metadata.core.ConstraintOrigin;
-import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.ReflectionHelper;
 import org.hibernate.validator.internal.util.annotationfactory.AnnotationDescriptor;
 import org.hibernate.validator.internal.util.annotationfactory.AnnotationFactory;
+import org.hibernate.validator.internal.util.logging.Log;
+import org.hibernate.validator.internal.util.logging.LoggerFactory;
 
 import static org.hibernate.validator.constraints.CompositionType.AND;
 
@@ -66,7 +65,7 @@
 public class ConstraintDescriptorImpl<T extends Annotation> implements ConstraintDescriptor<T>, Serializable {
 
 	private static final long serialVersionUID = -2563102960314069246L;
-	private static final Logger log = LoggerFactory.make();
+	private static final Log log = LoggerFactory.make();
 	private static final int OVERRIDES_PARAMETER_DEFAULT_INDEX = -1;
 	private static final String GROUPS = "groups";
 	private static final String PAYLOAD = "payload";
@@ -416,7 +415,7 @@ private Set<ConstraintDescriptor<?>> parseComposingConstraints() {
 			if ( constraintHelper.isConstraintComposition( declaredAnnotationType ) ) {
 				this.setCompositionType( ( (ConstraintComposition) declaredAnnotation ).value() );
 				if ( log.isDebugEnabled() ) {
-					log.debug( "Adding Bool" + declaredAnnotationType.getName() );
+					log.debugf( "Adding Bool %s.", declaredAnnotationType.getName() );
 				}
 				continue;
 			}
@@ -427,9 +426,7 @@ private Set<ConstraintDescriptor<?>> parseComposingConstraints() {
 						declaredAnnotation, overrideParameters, OVERRIDES_PARAMETER_DEFAULT_INDEX
 				);
 				composingConstraintsSet.add( descriptor );
-				if ( log.isDebugEnabled() ) {
-					log.debug( "Adding composing constraint: " + descriptor );
-				}
+				log.debugf( "Adding composing constraint: %s.", descriptor );
 			}
 			else if ( constraintHelper.isMultiValueConstraint( declaredAnnotationType ) ) {
 				List<Annotation> multiValueConstraints = constraintHelper.getMultiValueConstraints( declaredAnnotation );
@@ -439,9 +436,7 @@ else if ( constraintHelper.isMultiValueConstraint( declaredAnnotationType ) ) {
 							constraintAnnotation, overrideParameters, index
 					);
 					composingConstraintsSet.add( descriptor );
-					if ( log.isDebugEnabled() ) {
-						log.debug( "Adding composing constraint: " + descriptor );
-					}
+					log.debugf( "Adding composing constraint: %s.", descriptor );
 					index++;
 				}
 			}