Author: epbernard Date: 2010-06-28 14:46:57 -0400 (Mon, 28 Jun 2010) New Revision: 19843 Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateHelper.java Log: HSEARCH-553 Mutualize class extraction logic from a Work object Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-06-28 18:46:13 UTC (rev 19842) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2010-06-28 18:46:57 UTC (rev 19843) @@ -253,9 +253,7 @@ } private <T> void addWorkToBuilderQueue(List<LuceneWork> luceneQueue, Work<T> work) { - Class<T> entityClass = work.getEntityClass() != null ? - work.getEntityClass() : - HibernateHelper.getClass( work.getEntity() ); + Class<T> entityClass = HibernateHelper.getClassFromWork( work ); DocumentBuilderIndexedEntity<T> entityBuilder = searchFactoryImplementor.getDocumentBuilderIndexedEntity( entityClass ); if ( entityBuilder != null ) { entityBuilder.addWorkToQueue( Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateHelper.java =================================================================== --- search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateHelper.java 2010-06-28 18:46:13 UTC (rev 19842) +++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/HibernateHelper.java 2010-06-28 18:46:57 UTC (rev 19843) @@ -1,6 +1,7 @@ package org.hibernate.search.util; import org.hibernate.Hibernate; +import org.hibernate.search.backend.Work; /** * @author Emmanuel Bernard @@ -25,4 +26,10 @@ public static boolean isInitialized(Object entity) { return Hibernate.isInitialized( entity ); } + + public static <T> Class<T> getClassFromWork(Work<T> work) { + return work.getEntityClass() != null ? + work.getEntityClass() : + getClass( work.getEntity() ); + } }