[hibernate-commits] Hibernate SVN: r17551 - in core/trunk/annotations/src: test/resources and 1 other directory.

Author: hardy.ferentschik Date: 2009-09-28 07:42:48 -0400 (Mon, 28 Sep 2009) New Revision: 17551 Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java core/trunk/annotations/src/test/resources/log4j.properties Log: HV-232 Added no-arg constructor to listener. Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java 2009-09-27 12:49:54 UTC (rev 17550) +++ core/trunk/annotations/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java 2009-09-28 11:42:48 UTC (rev 17551) @@ -1,17 +1,23 @@ package org.hibernate.cfg.beanvalidation; +import java.util.HashSet; import java.util.Properties; import java.util.Set; -import java.util.HashSet; import java.util.concurrent.ConcurrentHashMap; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.TraversableResolver; +import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.hibernate.EntityMode; +import org.hibernate.cfg.Configuration; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.event.Initializable; import org.hibernate.event.PreDeleteEvent; import org.hibernate.event.PreDeleteEventListener; import org.hibernate.event.PreInsertEvent; @@ -21,76 +27,121 @@ import org.hibernate.persister.entity.EntityPersister; /** + * Event listener used to enable Bean Validation for insert/update/delete events. + * * @author Emmanuel Bernard + * @author Hardy Ferentschik */ //FIXME review exception model public class BeanValidationEventListener implements - PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener { + PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, Initializable { - + private static final Logger log = LoggerFactory.getLogger( BeanValidationEventListener.class ); private ValidatorFactory factory; private ConcurrentHashMap<EntityPersister, Set<String>> associationsPerEntityPersister = new ConcurrentHashMap<EntityPersister, Set<String>>(); private GroupsPerOperation groupsPerOperation; + boolean initialized; + /** + * No-arg constructor used when listener is configured via configuration file + */ + public BeanValidationEventListener() { + } + /** + * Constructor used in an environment where validator factory is injected (JPA2). + * + * @param factory The {@code ValidatorFactory} to use to create {@code Validator} instance(s) + * @param properties Configued properties + */ public BeanValidationEventListener(ValidatorFactory factory, Properties properties) { - this.factory = factory; - groupsPerOperation = new GroupsPerOperation(properties); + init( factory, properties ); } + public void initialize(Configuration cfg) { + if ( !initialized ) { + ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); + Properties props = cfg.getProperties(); + init( factory, props ); + } + } - public boolean onPreInsert(PreInsertEvent event) { - validate( event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), - event.getSession().getFactory(), GroupsPerOperation.Operation.INSERT ); + validate( + event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), + event.getSession().getFactory(), GroupsPerOperation.Operation.INSERT + ); return false; } public boolean onPreUpdate(PreUpdateEvent event) { - validate( event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), - event.getSession().getFactory(), GroupsPerOperation.Operation.UPDATE ); + validate( + event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), + event.getSession().getFactory(), GroupsPerOperation.Operation.UPDATE + ); return false; } public boolean onPreDelete(PreDeleteEvent event) { - validate( event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), - event.getSession().getFactory(), GroupsPerOperation.Operation.DELETE ); + validate( + event.getEntity(), event.getSession().getEntityMode(), event.getPersister(), + event.getSession().getFactory(), GroupsPerOperation.Operation.DELETE + ); return false; } + private void init(ValidatorFactory factory, Properties properties) { + this.factory = factory; + groupsPerOperation = new GroupsPerOperation( properties ); + initialized = true; + } + private <T> void validate(T object, EntityMode mode, EntityPersister persister, SessionFactoryImplementor sessionFactory, GroupsPerOperation.Operation operation) { - if ( object == null || mode != EntityMode.POJO ) return; - TraversableResolver tr = new HibernateTraversableResolver( persister, associationsPerEntityPersister, sessionFactory ); + if ( object == null || mode != EntityMode.POJO ) { + return; + } + TraversableResolver tr = new HibernateTraversableResolver( + persister, associationsPerEntityPersister, sessionFactory + ); Validator validator = factory.usingContext() - .traversableResolver( tr ) - .getValidator(); + .traversableResolver( tr ) + .getValidator(); final Class<?>[] groups = groupsPerOperation.get( operation ); if ( groups.length > 0 ) { final Set<ConstraintViolation<T>> constraintViolations = validator.validate( object, groups ); - if (constraintViolations.size() > 0 ) { + if ( constraintViolations.size() > 0 ) { Set<ConstraintViolation<?>> propagatedViolations = new HashSet<ConstraintViolation<?>>( constraintViolations.size() ); - for ( ConstraintViolation<?> violation : constraintViolations) { - propagatedViolations.add(violation); + Set<String> classNames = new HashSet<String>(); + for ( ConstraintViolation<?> violation : constraintViolations ) { + if ( log.isTraceEnabled() ) { + log.trace( violation.toString() ); + } + propagatedViolations.add( violation ); + classNames.add( violation.getLeafBean().getClass().getName() ); } + StringBuilder builder = new StringBuilder(); + builder.append( "validation failed for classes " ); + builder.append( classNames ); + builder.append( " during" ); + builder.append( operation.getName() ); + builder.append( " time for groups " ); + builder.append( toString( groups ) ); throw new ConstraintViolationException( - "Invalid object at " + operation.getName() + " time for groups " + toString( groups ), - propagatedViolations); + builder.toString(), propagatedViolations + ); } } } private String toString(Class<?>[] groups) { - StringBuilder toString = new StringBuilder( "["); + StringBuilder toString = new StringBuilder( "[" ); for ( Class<?> group : groups ) { toString.append( group.getName() ).append( ", " ); } toString.append( "]" ); return toString.toString(); } - - - } Modified: core/trunk/annotations/src/test/resources/log4j.properties =================================================================== --- core/trunk/annotations/src/test/resources/log4j.properties 2009-09-27 12:49:54 UTC (rev 17550) +++ core/trunk/annotations/src/test/resources/log4j.properties 2009-09-28 11:42:48 UTC (rev 17551) @@ -48,4 +48,5 @@ #log4j.logger.org.hibernate.cfg.SettingsFactory=info #log4j.logger.org.hibernate.cfg.AnnotationBinder=info #log4j.logger.org.hibernate.cfg.AnnotationConfiguration=info -#log4j.logger.org.hibernate.cfg.Ejb3Column=info \ No newline at end of file +#log4j.logger.org.hibernate.cfg.Ejb3Column=info +#log4j.logger.org.hibernate.cfg.beanvalidation.BeanValidationEventListener=trace \ No newline at end of file